fix(s3): Fix some S3 dumps erroring with "not implemented" responses

clevyr · Mar 1, 2024 · 544bccd · 544bccd
1 parent 3ad4dc0
commit 544bccd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -6,6 +6,7 @@ require (
  github.com/AlecAivazis/survey/v2 v2.3.7
  github.com/alessio/shellescape v1.4.2
  github.com/aws/aws-sdk-go-v2/config v1.27.4
+ github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.6
  github.com/aws/aws-sdk-go-v2/service/s3 v1.51.1
  github.com/fatih/color v1.16.0
  github.com/gabe565/go-spinners v1.0.1
@@ -62,6 +63,7 @@ require (
  github.com/hashicorp/hcl v1.0.0 // indirect
  github.com/imdario/mergo v0.3.16 // indirect
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
+ github.com/jmespath/go-jmespath v0.4.0 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect

diff --git a/go.sum b/go.sum
@@ -18,6 +18,8 @@ github.com/aws/aws-sdk-go-v2/credentials v1.17.4 h1:h5Vztbd8qLppiPwX+y0Q6WiwMZgp
 github.com/aws/aws-sdk-go-v2/credentials v1.17.4/go.mod h1:+30tpwrkOgvkJL1rUZuRLoxcJwtI/OkeBLYnHxJtVe0=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2 h1:AK0J8iYBFeUk2Ax7O8YpLtFsfhdOByh2QIkHmigpRYk=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2/go.mod h1:iRlGzMix0SExQEviAyptRWRGdYNo3+ufW/lCzvKVTUc=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.6 h1:prcsGA3onmpc7ea1W/m+SMj4uOn5vZ63uJp805UhJJs=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.6/go.mod h1:7eQrvATnVFDY0WfMYhfKkSQ1YtZlClT71fAAlsA1s34=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 h1:bNo4LagzUKbjdxE0tIcR9pMzLR2U/Tgie1Hq1HQ3iH8=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2/go.mod h1:wRQv0nN6v9wDXuWThpovGQjqF1HFdcgWjporw14lS8k=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 h1:EtOU5jsPdIQNP+6Q2C5e3d65NKT1PeCiQk+9OdzO12Q=
@@ -107,6 +109,10 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jedib0t/go-pretty/v6 v6.5.4 h1:gOGo0613MoqUcf0xCj+h/V3sHDaZasfv152G6/5l91s=
 github.com/jedib0t/go-pretty/v6 v6.5.4/go.mod h1:5LQIxa52oJ/DlDSLv0HEkWOFMDGoWkJb9ss5KqPpJBg=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

diff --git a/internal/s3/s3.go b/internal/s3/s3.go
@@ -7,6 +7,7 @@ import (
  "strings"
 
  "github.com/aws/aws-sdk-go-v2/config"
+ "github.com/aws/aws-sdk-go-v2/feature/s3/manager"
  "github.com/aws/aws-sdk-go-v2/service/s3"
  "k8s.io/utils/ptr"
 )
@@ -33,7 +34,7 @@ func CreateUpload(ctx context.Context, r io.ReadCloser, key string) error {
  _ = r.Close()
  }(r)
 
- sdkConfig, err := config.LoadDefaultConfig(ctx)
+ awsCfg, err := config.LoadDefaultConfig(ctx)
  if err != nil {
  return err
  }
@@ -44,8 +45,9 @@ func CreateUpload(ctx context.Context, r io.ReadCloser, key string) error {
  }
  u.Path = strings.TrimLeft(u.Path, "/")
 
- s3Client := s3.NewFromConfig(sdkConfig)
- _, err = s3Client.PutObject(ctx, &s3.PutObjectInput{
+ uploader := manager.NewUploader(s3.NewFromConfig(awsCfg))
+
+ _, err = uploader.Upload(ctx, &s3.PutObjectInput{
  Bucket: ptr.To(u.Host),
  Key: ptr.To(u.Path),
  Body: r,