Skip to content

Commit 54ae475

Browse files
authored
Updated package versions to resolve CVE (#23)
1 parent d6fb4e0 commit 54ae475

4 files changed

Lines changed: 160 additions & 389 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v2
1818
with:
19-
go-version: 1.16
19+
go-version: 1.22
2020
- name: Run GoReleaser
2121
uses: goreleaser/goreleaser-action@v2
2222
with:

dth/client.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func (c *S3Client) listObjectFn(ctx context.Context, continuationToken, prefix,
272272
input = &s3.ListObjectsV2Input{
273273
Bucket: &c.bucket,
274274
Prefix: prefix,
275-
MaxKeys: maxKeys,
275+
MaxKeys: aws.Int32(maxKeys),
276276
Delimiter: delimiter,
277277
EncodingType: "url",
278278
RequestPayer: types.RequestPayerRequester,
@@ -281,7 +281,7 @@ func (c *S3Client) listObjectFn(ctx context.Context, continuationToken, prefix,
281281
input = &s3.ListObjectsV2Input{
282282
Bucket: &c.bucket,
283283
Prefix: prefix,
284-
MaxKeys: maxKeys,
284+
MaxKeys: aws.Int32(maxKeys),
285285
Delimiter: delimiter,
286286
EncodingType: "url",
287287
}
@@ -298,7 +298,7 @@ func (c *S3Client) listObjectFn(ctx context.Context, continuationToken, prefix,
298298
return nil, err
299299
}
300300

301-
if output.IsTruncated {
301+
if output.IsTruncated != nil && *output.IsTruncated {
302302
*continuationToken = *output.NextContinuationToken
303303
} else {
304304
*continuationToken = "End"
@@ -398,7 +398,7 @@ func (c *S3Client) ListObjects(ctx context.Context, continuationToken, prefix *s
398398
}
399399
result = append(result, &Object{
400400
Key: escapedPrefix,
401-
Size: obj.Size,
401+
Size: *obj.Size,
402402
})
403403
}
404404

@@ -634,7 +634,7 @@ func (c *S3Client) UploadPart(ctx context.Context, key *string, body []byte, upl
634634
Bucket: &c.bucket,
635635
Key: key,
636636
Body: reader,
637-
PartNumber: int32(partNumber),
637+
PartNumber: aws.Int32(int32(partNumber)),
638638
UploadId: uploadID,
639639
ContentMD5: &contentMD5,
640640
}
@@ -662,7 +662,7 @@ func (c *S3Client) CompleteMultipartUpload(ctx context.Context, key, uploadID *s
662662

663663
for i, part := range parts {
664664
cp := types.CompletedPart{
665-
PartNumber: int32(part.partNumber),
665+
PartNumber: aws.Int32(int32(part.partNumber)),
666666
ETag: part.etag,
667667
}
668668
completedPart[i] = cp
@@ -698,7 +698,7 @@ func (c *S3Client) ListParts(ctx context.Context, key, uploadID *string) (parts
698698
Bucket: &c.bucket,
699699
Key: key,
700700
UploadId: uploadID,
701-
MaxParts: 1000,
701+
MaxParts: aws.Int32(1000),
702702
}
703703

704704
parts = make(map[int]*Part, 10000)
@@ -713,12 +713,12 @@ func (c *S3Client) ListParts(ctx context.Context, key, uploadID *string) (parts
713713
for _, part := range output.Parts {
714714
// log.Printf("Found Part %d - etag %s", part.PartNumber, *part.ETag)
715715
etag := strings.Trim(*part.ETag, "\"")
716-
parts[int(part.PartNumber)] = &Part{
717-
partNumber: int(part.PartNumber),
716+
parts[int(*part.PartNumber)] = &Part{
717+
partNumber: int(*part.PartNumber),
718718
etag: &etag,
719719
}
720720
}
721-
if !output.IsTruncated {
721+
if output.IsTruncated == nil || !*output.IsTruncated {
722722
break
723723
}
724724
input.PartNumberMarker = output.NextPartNumberMarker

go.mod

Lines changed: 47 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,52 @@
11
module golang.a2z.com/dthcli
22

3-
go 1.16
3+
go 1.22
44

55
require (
6-
github.com/aws/aws-sdk-go-v2 v1.21.0
7-
github.com/aws/aws-sdk-go-v2/config v1.6.1
8-
github.com/aws/aws-sdk-go-v2/credentials v1.3.3
9-
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.1.1
10-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.4.1
11-
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.3.1
12-
github.com/aws/aws-sdk-go-v2/service/s3 v1.13.0
13-
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.3.1
14-
github.com/aws/aws-sdk-go-v2/service/sfn v1.19.5
15-
github.com/aws/aws-sdk-go-v2/service/sqs v1.4.1
16-
github.com/aws/smithy-go v1.14.2
17-
github.com/spf13/cobra v1.1.3
18-
github.com/spf13/viper v1.7.1
6+
github.com/aws/aws-sdk-go-v2 v1.36.3
7+
github.com/aws/aws-sdk-go-v2/config v1.29.10
8+
github.com/aws/aws-sdk-go-v2/credentials v1.17.63
9+
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.12.12
10+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.67
11+
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.42.0
12+
github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2
13+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.35.2
14+
github.com/aws/aws-sdk-go-v2/service/sfn v1.35.2
15+
github.com/aws/aws-sdk-go-v2/service/sqs v1.38.1
16+
github.com/aws/smithy-go v1.22.3
17+
github.com/spf13/cobra v1.9.1
18+
github.com/spf13/viper v1.20.0
19+
)
20+
21+
require (
22+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
23+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
24+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
25+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
26+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
27+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
28+
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.18.5 // indirect
29+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
30+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.15 // indirect
32+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
33+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
34+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 // indirect
35+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.2 // indirect
36+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect
37+
github.com/fsnotify/fsnotify v1.8.0 // indirect
38+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
39+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
40+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
41+
github.com/sagikazarmark/locafero v0.7.0 // indirect
42+
github.com/sourcegraph/conc v0.3.0 // indirect
43+
github.com/spf13/afero v1.12.0 // indirect
44+
github.com/spf13/cast v1.7.1 // indirect
45+
github.com/spf13/pflag v1.0.6 // indirect
46+
github.com/subosito/gotenv v1.6.0 // indirect
47+
go.uber.org/atomic v1.9.0 // indirect
48+
go.uber.org/multierr v1.9.0 // indirect
49+
golang.org/x/sys v0.29.0 // indirect
50+
golang.org/x/text v0.21.0 // indirect
51+
gopkg.in/yaml.v3 v3.0.1 // indirect
1952
)

0 commit comments

Comments
 (0)