Skip to content

Commit f16329e

Browse files
shuangkunjakkubu
authored andcommitted
refactor: move s3 pkg from argoproj to workflow repo. Part of argoproj#14312 (argoproj#14315)
Signed-off-by: shuangkun <tsk2013uestc@163.com>
1 parent 3233dc9 commit f16329e

File tree

4 files changed

+649
-23
lines changed

4 files changed

+649
-23
lines changed

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ require (
179179
github.com/andybalholm/brotli v1.0.4 // indirect
180180
github.com/awalterschulze/gographviz v0.0.0-20200901124122-0eecad45bd71 // indirect
181181
github.com/aws/aws-sdk-go-v2 v1.33.0 // indirect
182-
github.com/aws/aws-sdk-go-v2/config v1.29.1 // indirect
183-
github.com/aws/aws-sdk-go-v2/credentials v1.17.54 // indirect
182+
github.com/aws/aws-sdk-go-v2/config v1.29.1
183+
github.com/aws/aws-sdk-go-v2/credentials v1.17.54
184184
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24 // indirect
185185
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28 // indirect
186186
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 // indirect
@@ -189,7 +189,7 @@ require (
189189
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.27.7 // indirect
190190
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9 // indirect
191191
github.com/aws/aws-sdk-go-v2/service/sso v1.24.11 // indirect
192-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.9 // indirect
192+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.9
193193
github.com/aws/smithy-go v1.22.1 // indirect
194194
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20241209220728-69e8c24e6fc1 // indirect
195195
github.com/beorn7/perks v1.0.1 // indirect

workflow/artifacts/s3/errors.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package s3
22

33
import (
4-
argos3 "github.com/argoproj/pkg/s3"
54
log "github.com/sirupsen/logrus"
65

76
"github.com/argoproj/argo-workflows/v3/util/errors"
@@ -27,7 +26,7 @@ func isTransientS3Err(err error) bool {
2726
return false
2827
}
2928
for _, transientErrCode := range s3TransientErrorCodes {
30-
if argos3.IsS3ErrCode(err, transientErrCode) {
29+
if IsS3ErrCode(err, transientErrCode) {
3130
log.Errorf("Transient S3 error: %v", err)
3231
return true
3332
}

0 commit comments

Comments
 (0)