Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@dzbarsky
dzbarsky committed Mar 18, 2024
1 parent 9a0eb8a commit 90897b9
Show file tree
Hide file tree
Showing 7 changed files with 121 additions and 86 deletions.
38 changes: 19 additions & 19 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@ module aws-in-a-box
go 1.21

require (
github.com/aws/aws-sdk-go-v2 v1.21.0
github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.1
github.com/aws/aws-sdk-go-v2/service/kms v1.24.1
github.com/aws/aws-sdk-go-v2/service/s3 v1.38.1
github.com/aws/smithy-go v1.14.2
github.com/fxamacker/cbor/v2 v2.4.0
github.com/aws/aws-sdk-go-v2 v1.25.3
github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.2
github.com/aws/aws-sdk-go-v2/service/kms v1.29.2
github.com/aws/aws-sdk-go-v2/service/s3 v1.52.1
github.com/aws/aws-sdk-go-v2/service/sqs v1.31.2
github.com/aws/smithy-go v1.20.1
github.com/fxamacker/cbor/v2 v2.6.0
github.com/gofrs/uuid/v5 v5.0.0
github.com/google/go-cmp v0.5.9
golang.org/x/net v0.14.0
github.com/google/go-cmp v0.6.0
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
golang.org/x/net v0.22.0
)

require (
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.11 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.12 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.32 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.31 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sqs v1.24.5
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
golang.org/x/text v0.12.0 // indirect
golang.org/x/text v0.14.0 // indirect
)
77 changes: 36 additions & 41 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,39 @@
github.com/aws/aws-sdk-go-v2 v1.20.0/go.mod h1:uWOr0m0jDsiWw8nnXiqZ+YG6LdvAlGYDLLf2NmHZoy4=
github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc=
github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.11 h1:/MS8AzqYNAhhRNalOmxUvYs8VEbNGifTnzhPFdcRQkQ=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.11/go.mod h1:va22++AdXht4ccO3kH2SHkHHYvZ2G9Utz+CXKmm2CaU=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37/go.mod h1:Pdn4j43v49Kk6+82spO3Tu5gSeQXRsxo56ePPQAvFiA=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31/go.mod h1:fTJDMe8LOFYtqiFFFeHA+SVMAwqLhoq0kcInYoLa9Js=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.0 h1:U5yySdwt2HPo/pnQec04DImLzWORbeWML1fJiLkKruI=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.0/go.mod h1:EhC/83j8/hL/UB1WmExo3gkElaja/KlmZM/gl1rTfjM=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.12 h1:uAiiHnWihGP2rVp64fHwzLDrswGjEjsPszwRYMiYQPU=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.12/go.mod h1:fUTHpOXqRQpXvEpDPSa3zxCc2fnpW6YnBoba+eQr+Bg=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.32 h1:kvN1jPHr9UffqqG3bSgZ8tx4+1zKVHz/Ktw/BwW6hX8=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.32/go.mod h1:QmMEM7es84EUkbYWcpnkx8i5EW2uERPfrTFeOch128Y=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.31 h1:auGDJ0aLZahF5SPvkJ6WcUuX7iQ7kyl2MamV7Tm8QBk=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.31/go.mod h1:3+lloe3sZuBQw1aBc5MyndvodzQlyqCZ7x1QPDHaWP4=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.0 h1:Wgjft9X4W5pMeuqgPCHIQtbZ87wsgom7S5F8obreg+c=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.0/go.mod h1:FWNzS4+zcWAP05IF7TDYTY1ysZAzIvogxWaDT9p8fsA=
github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.1 h1:A4hZc0NupdYhIF/BeUgOnPd+UJZ3D8KRCtuKURahVI8=
github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.1/go.mod h1:5HdPChCwFxQD30F6a2fCp5IdzLn1bhqFzKqbAHXTHp0=
github.com/aws/aws-sdk-go-v2/service/kms v1.24.1 h1:zDmx9yZjSYDaeakQVN16qfsLxhBeAxgclioB0+rOCDM=
github.com/aws/aws-sdk-go-v2/service/kms v1.24.1/go.mod h1:yrlimpsAJc9fXj3jHC7Ig2Zb4iMAoSJ/VVzChf22dZk=
github.com/aws/aws-sdk-go-v2/service/s3 v1.38.1 h1:mTgFVlfQT8gikc5+/HwD8UL9jnUro5MGv8n/VEYF12I=
github.com/aws/aws-sdk-go-v2/service/s3 v1.38.1/go.mod h1:6SOWLiobcZZshbmECRTADIRYliPL0etqFSigauQEeT0=
github.com/aws/aws-sdk-go-v2/service/sqs v1.24.5 h1:RyDpTOMEJO6ycxw1vU/6s0KLFaH3M0z/z9gXHSndPTk=
github.com/aws/aws-sdk-go-v2/service/sqs v1.24.5/go.mod h1:RZBu4jmYz3Nikzpu/VuVvRnTEJ5a+kf36WT2fcl5Q+Q=
github.com/aws/smithy-go v1.14.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ=
github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
github.com/aws/aws-sdk-go-v2 v1.25.3 h1:xYiLpZTQs1mzvz5PaI6uR0Wh57ippuEthxS4iK5v0n0=
github.com/aws/aws-sdk-go-v2 v1.25.3/go.mod h1:35hUlJVYd+M++iLI3ALmVwMOyRYMmRqUXpTtRGW+K9I=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 h1:gTK2uhtAPtFcdRRJilZPx8uJLL2J85xK11nKtWL0wfU=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1/go.mod h1:sxpLb+nZk7tIfCWChfd+h4QwHNUR57d8hA1cleTkjJo=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 h1:ifbIbHZyGl1alsAhPIYsHOg5MuApgqOvVeI8wIugXfs=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3/go.mod h1:oQZXg3c6SNeY6OZrDY+xHcF4VGIEoNotX2B4PrDeoJI=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 h1:Qvodo9gHG9F3E8SfYOspPeBt0bjSbsevK8WhRAUHcoY=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3/go.mod h1:vCKrdLXtybdf/uQd/YfVR2r5pcbNuEYKzMQpcxmeSJw=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.3 h1:mDnFOE2sVkyphMWtTH+stv0eW3k0OTx94K63xpxHty4=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.3/go.mod h1:V8MuRVcCRt5h1S+Fwu8KbC7l/gBGo3yBAyUbJM2IJOk=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 h1:EyBZibRTVAs6ECHZOw5/wlylS9OcTzwyjeQMudmREjE=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1/go.mod h1:JKpmtYhhPs7D97NL/ltqz7yCkERFW5dOlHyVl66ZYF8=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.5 h1:mbWNpfRUTT6bnacmvOTKXZjR/HycibdWzNpfbrbLDIs=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.5/go.mod h1:FCOPWGjsshkkICJIn9hq9xr6dLKtyaWpuUojiN3W1/8=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 h1:K/NXvIftOlX+oGgWGIa3jDyYLDNsdVhsjHmsBH2GLAQ=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5/go.mod h1:cl9HGLV66EnCmMNzq4sYOti+/xo8w34CsgzVtm2GgsY=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.3 h1:4t+QEX7BsXz98W8W1lNvMAG+NX8qHz2CjLBxQKku40g=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.3/go.mod h1:oFcjjUq5Hm09N9rpxTdeMeLeQcxS7mIkBkL8qUKng+A=
github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.2 h1:71gafPkX0RyJJqq921QJ+JvVmXIByfYONsy2XIN/+zk=
github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.2/go.mod h1:7w4Wsl8JbRrZmi6YHRa0fxvLyY+VoYSVmC7OpdJP/VQ=
github.com/aws/aws-sdk-go-v2/service/kms v1.29.2 h1:3UaqodPQqPh5XowXJ9fWM4TQqwuftYYFvej+RI5uIO8=
github.com/aws/aws-sdk-go-v2/service/kms v1.29.2/go.mod h1:elLDaj+1RNl9Ovn3dB6dWLVo5WQ+VLSUMKegl7N96fY=
github.com/aws/aws-sdk-go-v2/service/s3 v1.52.1 h1:Y/TTvxMdYwNvhzolvneV1wEEN/ncQUSd1AnzFGTMPqM=
github.com/aws/aws-sdk-go-v2/service/s3 v1.52.1/go.mod h1:MGTaf3x/+z7ZGugCGvepnx2DS6+caCYYqKhzVoLNYPk=
github.com/aws/aws-sdk-go-v2/service/sqs v1.31.2 h1:A9ihuyTKpS8Z1ou/D4ETfOEFMyokA6JjRsgXWTiHvCk=
github.com/aws/aws-sdk-go-v2/service/sqs v1.31.2/go.mod h1:J3XhTE+VsY1jDsdDY+ACFAppZj/gpvygzC5JE0bTLbQ=
github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw=
github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
github.com/fxamacker/cbor/v2 v2.6.0 h1:sU6J2usfADwWlYDAFhZBQ6TnLFBHxgesMrQfQgk1tWA=
github.com/fxamacker/cbor/v2 v2.6.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
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=
Expand All @@ -50,10 +45,10 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
5 changes: 4 additions & 1 deletion main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,11 @@ func main() {
Logger: logger,
ArnGenerator: arnGenerator,
})
logger.Info("Enabled SQS")
// Register JSON handler
s.RegisterHTTPHandlers(logger, methodRegistry)
// Register form data handler
handlerChain = append(handlerChain, sqs.NewHandler(logger, s))
logger.Info("Enabled SQS")
}

if *enableS3 {
Expand Down
4 changes: 2 additions & 2 deletions services/kinesis/itest/consumer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ func makeClientServerPair() (*kinesis.Client, *http.Server) {
go srv.Serve(listener)

client := kinesis.New(kinesis.Options{
EndpointResolver: kinesis.EndpointResolverFromURL("http://" + listener.Addr().String()),
Retryer: aws.NopRetryer{},
BaseEndpoint: aws.String("http://" + listener.Addr().String()),
Retryer: aws.NopRetryer{},
})

return client, srv
Expand Down
36 changes: 20 additions & 16 deletions services/s3/itest/s3_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ func makeClientServerPair() (*s3.Client, *http.Server) {
go srv.Serve(listener)

client := s3.New(s3.Options{
EndpointResolver: s3.EndpointResolverFromURL("http://" + listener.Addr().String()),
Region: "us-east-1",
BaseEndpoint: aws.String("http://" + listener.Addr().String()),
// Disable the subdomain addressing since it won't work (test-bucket.127.0.0.1)
UsePathStyle: true,
Retryer: aws.NopRetryer{},
Expand Down Expand Up @@ -75,7 +76,7 @@ func TestMultipartUpload(t *testing.T) {
var parts []types.CompletedPart
for i, s := range []string{"hello", " world"} {
output, err := client.UploadPart(ctx, &s3.UploadPartInput{
PartNumber: int32(i),
PartNumber: aws.Int32(int32(i)),
Bucket: &bucket,
Key: &key,
UploadId: id,
Expand All @@ -92,7 +93,7 @@ func TestMultipartUpload(t *testing.T) {
}
parts = append(parts, types.CompletedPart{
ETag: output.ETag,
PartNumber: int32(i),
PartNumber: aws.Int32(int32(i)),
})
}

Expand Down Expand Up @@ -139,38 +140,38 @@ func TestMultipartUpload(t *testing.T) {
Bucket: &bucket,
Key: &key,
UploadId: id,
MaxParts: 1,
MaxParts: aws.Int32(1),
})
if err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(partsOutput.Parts, []types.Part{{
ETag: parts[0].ETag,
Size: 5,
PartNumber: 0,
Size: aws.Int64(5),
PartNumber: aws.Int32(0),
}}) {
t.Fatal("wrong parts", partsOutput.Parts)
}
if !partsOutput.IsTruncated {
if !*partsOutput.IsTruncated {
t.Fatal("not truncated")
}
partsOutput, err = client.ListParts(ctx, &s3.ListPartsInput{
Bucket: &bucket,
Key: &key,
UploadId: id,
MaxParts: 1,
MaxParts: aws.Int32(1),
PartNumberMarker: partsOutput.NextPartNumberMarker,
})
if err != nil {
t.Fatal(err)
}
if partsOutput.IsTruncated {
if *partsOutput.IsTruncated {
t.Fatal("truncated")
}
if !reflect.DeepEqual(partsOutput.Parts, []types.Part{{
ETag: parts[1].ETag,
Size: 6,
PartNumber: 1,
Size: aws.Int64(6),
PartNumber: aws.Int32(1),
}}) {
t.Fatal("wrong parts", partsOutput.Parts)
}
Expand Down Expand Up @@ -219,7 +220,7 @@ func TestRangeQuery(t *testing.T) {
var parts []types.CompletedPart
for i, s := range []string{"hello", " world ", "hi", " things are fun"} {
output, err := client.UploadPart(ctx, &s3.UploadPartInput{
PartNumber: int32(i),
PartNumber: aws.Int32(int32(i)),
Bucket: &bucket,
Key: &key,
UploadId: id,
Expand All @@ -230,7 +231,7 @@ func TestRangeQuery(t *testing.T) {
}
parts = append(parts, types.CompletedPart{
ETag: output.ETag,
PartNumber: int32(i),
PartNumber: aws.Int32(int32(i)),
})
}

Expand Down Expand Up @@ -476,7 +477,7 @@ func TestDeleteObjects(t *testing.T) {
Objects: []types.ObjectIdentifier{
{Key: aws.String("key1")},
},
Quiet: true,
Quiet: aws.Bool(true),
},
})
if err != nil {
Expand Down Expand Up @@ -564,7 +565,7 @@ func TestListObjectsV2(t *testing.T) {
startAfter := "14"
resp, err = client.ListObjectsV2(ctx, &s3.ListObjectsV2Input{
Bucket: &bucket,
MaxKeys: 2,
MaxKeys: aws.Int32(2),
StartAfter: &startAfter,
})
if err != nil {
Expand All @@ -590,9 +591,12 @@ func TestListObjectsV2(t *testing.T) {
resp, err = client.ListObjectsV2(ctx, &s3.ListObjectsV2Input{
Bucket: &bucket,
// We expect 11 keys, include an extra to verify behavior
MaxKeys: 12,
MaxKeys: aws.Int32(12),
Prefix: &prefix,
})
if err != nil {
t.Fatal(err)
}
if len(resp.Contents) != 11 {
t.Fatal("not 11 contents", resp.Contents)
}
Expand Down
22 changes: 22 additions & 0 deletions services/sqs/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ package sqs
import (
"log/slog"
"net/http"

ahttp "aws-in-a-box/http"
)

const service = "AmazonSQS"

func registerHTTPHandlers(logger *slog.Logger, registry map[string]http.HandlerFunc, s *SQS) {
register(logger, registry, "CreateQueue", s.CreateQueue)
register(logger, registry, "ChangeMessageVisibility", s.ChangeMessageVisibility)
Expand All @@ -22,3 +26,21 @@ func registerHTTPHandlers(logger *slog.Logger, registry map[string]http.HandlerF
register(logger, registry, "TagQueue", s.TagQueue)
register(logger, registry, "UntagQueue", s.UntagQueue)
}

func (s *SQS) RegisterHTTPHandlers(logger *slog.Logger, methodRegistry ahttp.Registry) {
ahttp.Register(logger, methodRegistry, service, "CreateQueue", s.CreateQueue)
ahttp.Register(logger, methodRegistry, service, "ChangeMessageVisibility", s.ChangeMessageVisibility)
ahttp.Register(logger, methodRegistry, service, "ChangeMessageVisibilityBatch", s.ChangeMessageVisibilityBatch)
ahttp.Register(logger, methodRegistry, service, "DeleteMessage", s.DeleteMessage)
ahttp.Register(logger, methodRegistry, service, "DeleteMessageBatch", s.DeleteMessageBatch)
ahttp.Register(logger, methodRegistry, service, "DeleteQueue", s.DeleteQueue)
ahttp.Register(logger, methodRegistry, service, "GetQueueAttributes", s.GetQueueAttributes)
ahttp.Register(logger, methodRegistry, service, "GetQueueUrl", s.GetQueueUrl)
ahttp.Register(logger, methodRegistry, service, "ListQueues", s.ListQueues)
ahttp.Register(logger, methodRegistry, service, "ListQueueTags", s.ListQueueTags)
ahttp.Register(logger, methodRegistry, service, "ReceiveMessage", s.ReceiveMessage)
ahttp.Register(logger, methodRegistry, service, "SendMessage", s.SendMessage)
ahttp.Register(logger, methodRegistry, service, "SetQueueAttributes", s.SetQueueAttributes)
ahttp.Register(logger, methodRegistry, service, "TagQueue", s.TagQueue)
ahttp.Register(logger, methodRegistry, service, "UntagQueue", s.UntagQueue)
}
Loading

0 comments on commit 90897b9

Please sign in to comment.