Skip to content

Commit 4334053

Browse files
angelcerveraroldandustymabe
authored andcommitted
aws-sdk-go-v2: s3/manager deprecated, update to s3/transfermanager
Bump aws-sdk-go-v2 libraries, and add the new s3/transfermanager module ``` go get github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager@latest go get github.com/aws/aws-sdk-go-v2/...@latest go mod tidy go mod vendor ``` s3/manager was deprecated, so the necessary adjustments were made to mantle/platform/api/aws/{api|s3}.go See the following link for more information: aws/aws-sdk-go-v2#3306
1 parent d36cdfe commit 4334053

92 files changed

Lines changed: 6860 additions & 420 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

go.mod

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ require (
1414
github.com/IBM/ibm-cos-sdk-go v1.12.4
1515
github.com/aliyun/alibaba-cloud-sdk-go v1.63.107
1616
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
17-
github.com/aws/aws-sdk-go-v2 v1.41.0
18-
github.com/aws/aws-sdk-go-v2/config v1.32.5
19-
github.com/aws/aws-sdk-go-v2/credentials v1.19.5
20-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.16
17+
github.com/aws/aws-sdk-go-v2 v1.41.1
18+
github.com/aws/aws-sdk-go-v2/config v1.32.7
19+
github.com/aws/aws-sdk-go-v2/credentials v1.19.7
20+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.0
2121
github.com/aws/aws-sdk-go-v2/service/ec2 v1.277.0
2222
github.com/aws/aws-sdk-go-v2/service/iam v1.53.1
23-
github.com/aws/aws-sdk-go-v2/service/s3 v1.94.0
24-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5
23+
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.0
24+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.6
2525
github.com/aws/smithy-go v1.24.0
2626
github.com/coreos/butane v0.25.1
2727
github.com/coreos/go-semver v0.3.1
@@ -66,18 +66,19 @@ require (
6666
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
6767
github.com/IBM/go-sdk-core/v5 v5.21.2 // indirect
6868
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
69-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
70-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
71-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
69+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
70+
github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager v0.1.2 // indirect
71+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect
72+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 // indirect
7273
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
73-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16 // indirect
74+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17 // indirect
7475
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
75-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 // indirect
76-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
77-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 // indirect
78-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
79-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.7 // indirect
80-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
76+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8 // indirect
77+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 // indirect
78+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17 // indirect
79+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 // indirect
80+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 // indirect
81+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 // indirect
8182
github.com/clarketm/json v1.17.1 // indirect
8283
github.com/containers/image/v5 v5.34.2 // indirect
8384
github.com/containers/storage v1.57.2 // indirect

go.sum

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -49,48 +49,50 @@ github.com/aliyun/alibaba-cloud-sdk-go v1.63.107/go.mod h1:SOSDHfe1kX91v3W5QiBsW
4949
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g=
5050
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
5151
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
52-
github.com/aws/aws-sdk-go-v2 v1.41.0 h1:tNvqh1s+v0vFYdA1xq0aOJH+Y5cRyZ5upu6roPgPKd4=
53-
github.com/aws/aws-sdk-go-v2 v1.41.0/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
52+
github.com/aws/aws-sdk-go-v2 v1.41.1 h1:ABlyEARCDLN034NhxlRUSZr4l71mh+T5KAeGh6cerhU=
53+
github.com/aws/aws-sdk-go-v2 v1.41.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
5454
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU=
5555
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4/go.mod h1:IOAPF6oT9KCsceNTvvYMNHy0+kMF8akOjeDvPENWxp4=
56-
github.com/aws/aws-sdk-go-v2/config v1.32.5 h1:pz3duhAfUgnxbtVhIK39PGF/AHYyrzGEyRD9Og0QrE8=
57-
github.com/aws/aws-sdk-go-v2/config v1.32.5/go.mod h1:xmDjzSUs/d0BB7ClzYPAZMmgQdrodNjPPhd6bGASwoE=
58-
github.com/aws/aws-sdk-go-v2/credentials v1.19.5 h1:xMo63RlqP3ZZydpJDMBsH9uJ10hgHYfQFIk1cHDXrR4=
59-
github.com/aws/aws-sdk-go-v2/credentials v1.19.5/go.mod h1:hhbH6oRcou+LpXfA/0vPElh/e0M3aFeOblE1sssAAEk=
60-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 h1:80+uETIWS1BqjnN9uJ0dBUaETh+P1XwFy5vwHwK5r9k=
61-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16/go.mod h1:wOOsYuxYuB/7FlnVtzeBYRcjSRtQpAW0hCP7tIULMwo=
62-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.16 h1:NkjoiJoSpZqzsRcpM6rlk5AOCLro8JkK8UqekAm/hxM=
63-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.16/go.mod h1:l2736DvrgbOinD65Ksh8fc/WQHBBlvsd+0/ZaxtsmGY=
64-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 h1:rgGwPzb82iBYSvHMHXc8h9mRoOUBZIGFgKb9qniaZZc=
65-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16/go.mod h1:L/UxsGeKpGoIj6DxfhOWHWQ/kGKcd4I1VncE4++IyKA=
66-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 h1:1jtGzuV7c82xnqOVfx2F0xmJcOw5374L7N6juGW6x6U=
67-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16/go.mod h1:M2E5OQf+XLe+SZGmmpaI2yy+J326aFf6/+54PoxSANc=
56+
github.com/aws/aws-sdk-go-v2/config v1.32.7 h1:vxUyWGUwmkQ2g19n7JY/9YL8MfAIl7bTesIUykECXmY=
57+
github.com/aws/aws-sdk-go-v2/config v1.32.7/go.mod h1:2/Qm5vKUU/r7Y+zUk/Ptt2MDAEKAfUtKc1+3U1Mo3oY=
58+
github.com/aws/aws-sdk-go-v2/credentials v1.19.7 h1:tHK47VqqtJxOymRrNtUXN5SP/zUTvZKeLx4tH6PGQc8=
59+
github.com/aws/aws-sdk-go-v2/credentials v1.19.7/go.mod h1:qOZk8sPDrxhf+4Wf4oT2urYJrYt3RejHSzgAquYeppw=
60+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 h1:I0GyV8wiYrP8XpA70g1HBcQO1JlQxCMTW9npl5UbDHY=
61+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17/go.mod h1:tyw7BOl5bBe/oqvoIeECFJjMdzXoa/dfVz3QQ5lgHGA=
62+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.0 h1:MpkX8EjkwuvyuX9B7+Zgk5M4URb2WQ84Y6jM81n5imw=
63+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.0/go.mod h1:4V9Pv5sFfMPWQF0Q0zYN6BlV/504dFGaTeogallRqQw=
64+
github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager v0.1.2 h1:1q8/WwEqZnM/vO4q1gx2g7lHYmyN+o4P7G6EW4zKbRQ=
65+
github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager v0.1.2/go.mod h1:owKRexW+Ir5ACD2UTesmjkQ+w7mcmknLNfwOiKfVLTg=
66+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 h1:xOLELNKGp2vsiteLsvLPwxC+mYmO6OZ8PYgiuPJzF8U=
67+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17/go.mod h1:5M5CI3D12dNOtH3/mk6minaRwI2/37ifCURZISxA/IQ=
68+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 h1:WWLqlh79iO48yLkj1v3ISRNiv+3KdQoZ6JWyfcsyQik=
69+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17/go.mod h1:EhG22vHRrvF8oXSTYStZhJc1aUgKtnJe+aOiFEV90cM=
6870
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
6971
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
70-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16 h1:CjMzUs78RDDv4ROu3JnJn/Ig1r6ZD7/T2DXLLRpejic=
71-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16/go.mod h1:uVW4OLBqbJXSHJYA9svT9BluSvvwbzLQ2Crf6UPzR3c=
72+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17 h1:JqcdRG//czea7Ppjb+g/n4o8i/R50aTBHkA7vu0lK+k=
73+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17/go.mod h1:CO+WeGmIdj/MlPel2KwID9Gt7CNq4M65HUfBW97liM0=
7274
github.com/aws/aws-sdk-go-v2/service/ec2 v1.277.0 h1:RHJSkRXDGkAKrV4CTEsZsZkOmSpxXKO4aKx4rXd94K4=
7375
github.com/aws/aws-sdk-go-v2/service/ec2 v1.277.0/go.mod h1:Wg68QRgy2gEGGdmTPU/UbVpdv8sM14bUZmF64KFwAsY=
7476
github.com/aws/aws-sdk-go-v2/service/iam v1.53.1 h1:xNCUk9XN6Pa9PyzbEfzgRpvEIVlqtth402yjaWvNMu4=
7577
github.com/aws/aws-sdk-go-v2/service/iam v1.53.1/go.mod h1:GNQZL4JRSGH6L0/SNGOtffaB1vmlToYp3KtcUIB0NhI=
7678
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEdJbzUCEWkVXEXoqlXV72J5keC1GvILMOuD00E=
7779
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow=
78-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 h1:DIBqIrJ7hv+e4CmIk2z3pyKT+3B6qVMgRsawHiR3qso=
79-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7/go.mod h1:vLm00xmBke75UmpNvOcZQ/Q30ZFjbczeLFqGx5urmGo=
80-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 h1:oHjJHeUy0ImIV0bsrX0X91GkV5nJAyv1l1CC9lnO0TI=
81-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16/go.mod h1:iRSNGgOYmiYwSCXxXaKb9HfOEj40+oTKn8pTxMlYkRM=
82-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 h1:NSbvS17MlI2lurYgXnCOLvCFX38sBW4eiVER7+kkgsU=
83-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16/go.mod h1:SwT8Tmqd4sA6G1qaGdzWCJN99bUmPGHfRwwq3G5Qb+A=
84-
github.com/aws/aws-sdk-go-v2/service/s3 v1.94.0 h1:SWTxh/EcUCDVqi/0s26V6pVUq0BBG7kx0tDTmF/hCgA=
85-
github.com/aws/aws-sdk-go-v2/service/s3 v1.94.0/go.mod h1:79S2BdqCJpScXZA2y+cpZuocWsjGjJINyXnOsf5DTz8=
86-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 h1:HpI7aMmJ+mm1wkSHIA2t5EaFFv5EFYXePW30p1EIrbQ=
87-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.4/go.mod h1:C5RdGMYGlfM0gYq/tifqgn4EbyX99V15P2V3R+VHbQU=
88-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.7 h1:eYnlt6QxnFINKzwxP5/Ucs1vkG7VT3Iezmvfgc2waUw=
89-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.7/go.mod h1:+fWt2UHSb4kS7Pu8y+BMBvJF0EWx+4H0hzNwtDNRTrg=
90-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 h1:AHDr0DaHIAo8c9t1emrzAlVDFp+iMMKnPdYy6XO4MCE=
91-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12/go.mod h1:GQ73XawFFiWxyWXMHWfhiomvP3tXtdNar/fi8z18sx0=
92-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 h1:SciGFVNZ4mHdm7gpD1dgZYnCuVdX1s+lFTg4+4DOy70=
93-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5/go.mod h1:iW40X4QBmUxdP+fZNOpfmkdMZqsovezbAeO+Ubiv2pk=
80+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8 h1:Z5EiPIzXKewUQK0QTMkutjiaPVeVYXX7KIqhXu/0fXs=
81+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8/go.mod h1:FsTpJtvC4U1fyDXk7c71XoDv3HlRm8V3NiYLeYLh5YE=
82+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 h1:RuNSMoozM8oXlgLG/n6WLaFGoea7/CddrCfIiSA+xdY=
83+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17/go.mod h1:F2xxQ9TZz5gDWsclCtPQscGpP0VUOc8RqgFM3vDENmU=
84+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17 h1:bGeHBsGZx0Dvu/eJC0Lh9adJa3M1xREcndxLNZlve2U=
85+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17/go.mod h1:dcW24lbU0CzHusTE8LLHhRLI42ejmINN8Lcr22bwh/g=
86+
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.0 h1:oeu8VPlOre74lBA/PMhxa5vewaMIMmILM+RraSyB8KA=
87+
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.0/go.mod h1:5jggDlZ2CLQhwJBiZJb4vfk4f0GxWdEDruWKEJ1xOdo=
88+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 h1:VrhDvQib/i0lxvr3zqlUwLwJP4fpmpyD9wYG1vfSu+Y=
89+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.5/go.mod h1:k029+U8SY30/3/ras4G/Fnv/b88N4mAfliNn08Dem4M=
90+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 h1:v6EiMvhEYBoHABfbGB4alOYmCIrcgyPPiBE1wZAEbqk=
91+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.9/go.mod h1:yifAsgBxgJWn3ggx70A3urX2AN49Y5sJTD1UQFlfqBw=
92+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 h1:gd84Omyu9JLriJVCbGApcLzVR3XtmC4ZDPcAI6Ftvds=
93+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13/go.mod h1:sTGThjphYE4Ohw8vJiRStAcu3rbjtXRsdNB0TvZ5wwo=
94+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 h1:5fFjR/ToSOzB2OQ/XqWpZBmNvmP/pJ1jOWYlFDJTjRQ=
95+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.6/go.mod h1:qgFDZQSD/Kys7nJnVqYlWKnh0SSdMjAi0uSwON4wgYQ=
9496
github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk=
9597
github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
9698
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=

mantle/platform/api/aws/api.go

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/aws/aws-sdk-go-v2/aws"
2222
"github.com/aws/aws-sdk-go-v2/config"
2323
"github.com/aws/aws-sdk-go-v2/credentials"
24+
"github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager"
2425
"github.com/aws/aws-sdk-go-v2/service/ec2"
2526
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
2627
"github.com/aws/aws-sdk-go-v2/service/iam"
@@ -58,12 +59,13 @@ type Options struct {
5859
}
5960

6061
type API struct {
61-
config aws.Config
62-
ec2 *ec2.Client
63-
iam *iam.Client
64-
s3 *s3.Client
65-
sts *sts.Client
66-
opts *Options
62+
config aws.Config
63+
ec2 *ec2.Client
64+
iam *iam.Client
65+
s3 *s3.Client
66+
sts *sts.Client
67+
opts *Options
68+
tManager *transfermanager.Client
6769
}
6870

6971
// New creates a new AWS API wrapper. It uses credentials from any of the
@@ -98,13 +100,16 @@ func New(opts *Options) (*API, error) {
98100
return nil, err
99101
}
100102

103+
s3Client := s3.NewFromConfig(awsCfg)
104+
tManager := transfermanager.New(s3Client)
101105
api := &API{
102-
config: awsCfg,
103-
ec2: ec2.NewFromConfig(awsCfg),
104-
iam: iam.NewFromConfig(awsCfg),
105-
s3: s3.NewFromConfig(awsCfg),
106-
sts: sts.NewFromConfig(awsCfg),
107-
opts: opts,
106+
config: awsCfg,
107+
ec2: ec2.NewFromConfig(awsCfg),
108+
iam: iam.NewFromConfig(awsCfg),
109+
s3: s3Client,
110+
sts: sts.NewFromConfig(awsCfg),
111+
opts: opts,
112+
tManager: tManager,
108113
}
109114

110115
return api, nil

mantle/platform/api/aws/s3.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import (
2323
"os"
2424

2525
"github.com/aws/aws-sdk-go-v2/aws"
26-
"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
26+
"github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager"
27+
s3TransferTypes "github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager/types"
2728
"github.com/aws/aws-sdk-go-v2/service/s3"
2829
s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
2930
"github.com/aws/smithy-go"
@@ -58,8 +59,6 @@ func (a *API) UploadObject(r io.Reader, bucket, path string, force bool) error {
5859

5960
// UploadObjectExt uploads an object to S3 with more control over options.
6061
func (a *API) UploadObjectExt(r io.Reader, bucket, path string, force bool, policy string, contentType string, max_age int) error {
61-
s3uploader := manager.NewUploader(a.s3)
62-
6362
if !force {
6463
_, err := a.s3.HeadObject(context.Background(), &s3.HeadObjectInput{
6564
Bucket: &bucket,
@@ -75,13 +74,13 @@ func (a *API) UploadObjectExt(r io.Reader, bucket, path string, force bool, poli
7574
}
7675
}
7776

78-
input := s3.PutObjectInput{
77+
input := transfermanager.UploadObjectInput{
7978
Body: r,
8079
Bucket: aws.String(bucket),
8180
Key: aws.String(path),
8281
}
8382
if policy != "" {
84-
input.ACL = s3types.ObjectCannedACL(policy)
83+
input.ACL = s3TransferTypes.ObjectCannedACL(policy)
8584
}
8685
if max_age >= 0 {
8786
input.CacheControl = aws.String(fmt.Sprintf("max-age=%d", max_age))
@@ -91,10 +90,9 @@ func (a *API) UploadObjectExt(r io.Reader, bucket, path string, force bool, poli
9190
}
9291

9392
plog.Infof("uploading s3://%v/%v", bucket, path)
94-
if _, err := s3uploader.Upload(context.Background(), &input); err != nil {
93+
if _, err := a.tManager.UploadObject(context.Background(), &input); err != nil {
9594
return fmt.Errorf("error uploading s3://%v/%v: %v", bucket, path, err)
9695
}
97-
9896
return nil
9997
}
10098

@@ -215,14 +213,16 @@ func (a *API) DownloadFile(srcBucket, srcPath string) (*os.File, error) {
215213
if err != nil {
216214
return nil, err
217215
}
218-
downloader := manager.NewDownloader(a.s3)
219-
_, err = downloader.Download(context.Background(), f, &s3.GetObjectInput{
220-
Bucket: aws.String(srcBucket),
221-
Key: aws.String(srcPath),
222-
})
223-
if err != nil {
216+
217+
download := transfermanager.DownloadObjectInput{
218+
Bucket: aws.String(srcBucket),
219+
Key: aws.String(srcPath),
220+
WriterAt: f,
221+
}
222+
if _, err := a.tManager.DownloadObject(context.Background(), &download); err != nil {
224223
f.Close()
225224
return nil, err
226225
}
226+
227227
return f, nil
228228
}

vendor/github.com/aws/aws-sdk-go-v2/aws/go_module_metadata.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go-v2/config/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go-v2/config/go_module_metadata.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go-v2/credentials/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go-v2/credentials/go_module_metadata.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go-v2/feature/ec2/imds/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)