fix(artifacts): minor refactoring

Signed-off-by: Peixuan Ding <dingpeixuan911@gmail.com>

workflow/artifacts/s3/error_codes.go → workflow/artifacts/s3/errors.go

@@ -1,5 +1,7 @@
 package s3
 
+import argos3 "github.com/argoproj/pkg/s3"
+
 // s3TransientErrorCodes is a list of S3 error codes that are transient (retryable)
 // Reference: https://github.com/minio/minio-go/blob/92fe50d14294782d96402deb861d442992038109/retry.go#L90-L102
 var s3TransientErrorCodes = []string{
@@ -12,3 +14,16 @@ var s3TransientErrorCodes = []string{
 	"InternalError",
 	"SlowDown",
 }
+
+// isTransientS3Err checks if an minio.ErrorResponse error is transient (retryable)
+func isTransientS3Err(err error) bool {
+	if err == nil {
+		return false
+	}
+	for _, transientErrCode := range s3TransientErrorCodes {
+		if argos3.IsS3ErrCode(err, transientErrCode) {
+			return true
+		}
+	}
+	return false
+}

workflow/artifacts/s3/errors_test.go

@@ -0,0 +1,22 @@
+package s3
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/minio/minio-go/v7"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsTransientOSSErr(t *testing.T) {
+	for _, errCode := range s3TransientErrorCodes {
+		err := minio.ErrorResponse{Code: errCode}
+		assert.True(t, isTransientS3Err(err))
+	}
+
+	err := minio.ErrorResponse{Code: "NoSuchBucket"}
+	assert.False(t, isTransientS3Err(err))
+
+	nonOSSErr := errors.New("UnseenError")
+	assert.False(t, isTransientS3Err(nonOSSErr))
+}

workflow/artifacts/s3/s3.go

@@ -166,16 +166,3 @@ func (s3Driver *ArtifactDriver) ListObjects(artifact *wfv1.Artifact) ([]string,
 
 	return files, err
 }
-
-// isTransientS3Err checks if an minio.ErrorResponse error is transient (retryable)
-func isTransientS3Err(err error) bool {
-	if err == nil {
-		return false
-	}
-	for _, transientErrCode := range s3TransientErrorCodes {
-		if argos3.IsS3ErrCode(err, transientErrCode) {
-			return true
-		}
-	}
-	return false
-}

workflow/artifacts/s3/s3_test.go

@@ -1,7 +1,6 @@
 package s3
 
 import (
-	"errors"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -360,16 +359,3 @@ func TestSaveS3Artifact(t *testing.T) {
 		})
 	}
 }
-
-func TestIsTransientOSSErr(t *testing.T) {
-	for _, errCode := range s3TransientErrorCodes {
-		err := minio.ErrorResponse{Code: errCode}
-		assert.True(t, isTransientS3Err(err))
-	}
-
-	err := minio.ErrorResponse{Code: "NoSuchBucket"}
-	assert.False(t, isTransientS3Err(err))
-
-	nonOSSErr := errors.New("UnseenError")
-	assert.False(t, isTransientS3Err(nonOSSErr))
-}