add flag to enable MD5 checksum for S3 upload

akloss-cibo · akloss-cibo · commit a422af05ba15 · 2025-01-22T21:26:16.000-06:00
This checksum is required if a bucket has Object Lock enabled by default. addresses argoproj/argo-workflows#11182 Signed-off-by: Alec Kloss <akloss@cibotechnologies.com>
diff --git a/s3/s3.go b/s3/s3.go
@@ -91,6 +91,7 @@ type S3ClientOpts struct {
 	RoleSessionName string
 	UseSDKCreds     bool
 	EncryptOpts     EncryptOpts
+	SendContentMd5  bool
 }
 
 type s3client struct {
@@ -219,7 +220,7 @@ func (s *s3client) PutFile(bucket, key, path string) error {
 		return err
 	}
 
-	_, err = s.minioClient.FPutObject(s.ctx, bucket, key, path, minio.PutObjectOptions{ServerSideEncryption: encOpts})
+	_, err = s.minioClient.FPutObject(s.ctx, bucket, key, path, minio.PutObjectOptions{SendContentMd5: s.SendContentMd5, ServerSideEncryption: encOpts})
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ type S3ClientOpts struct {`
`91`	`91`	`RoleSessionName string`
`92`	`92`	`UseSDKCreds bool`
`93`	`93`	`EncryptOpts EncryptOpts`
	`94`	`+ SendContentMd5 bool`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`type s3client struct {`
`@@ -219,7 +220,7 @@ func (s *s3client) PutFile(bucket, key, path string) error {`
`219`	`220`	`return err`
`220`	`221`	`}`
`221`	`222`
`222`		`- _, err = s.minioClient.FPutObject(s.ctx, bucket, key, path, minio.PutObjectOptions{ServerSideEncryption: encOpts})`
	`223`	`+ _, err = s.minioClient.FPutObject(s.ctx, bucket, key, path, minio.PutObjectOptions{SendContentMd5: s.SendContentMd5, ServerSideEncryption: encOpts})`
`223`	`224`	`if err != nil {`
`224`	`225`	`return err`
`225`	`226`	`}`