Skip to content

Commit

Permalink
don't serde the bucket (#2204)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucix-aws
lucix-aws authored Jul 25, 2023
1 parent e06caa6 commit aec3da0
Show file tree
Hide file tree
Showing 744 changed files with 1,590 additions and 2,256 deletions.
4 changes: 4 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ generate: smithy-generate update-requires gen-repo-mod-replace update-module-met
gen-config-asserts gen-internal-codegen copy-attributevalue-feature gen-mod-dropreplace-smithy-. min-go-version-. \
tidy-modules-. add-module-license-files gen-aws-ptrs format

generate-tmpreplace-smithy: smithy-generate update-requires gen-repo-mod-replace update-module-metadata smithy-annotate-stable \
gen-config-asserts gen-internal-codegen copy-attributevalue-feature gen-mod-replace-smithy-. min-go-version-. \
tidy-modules-. add-module-license-files gen-aws-ptrs format gen-mod-dropreplace-smithy-.

smithy-generate:
cd codegen && ./gradlew clean build -Plog-tests && ./gradlew clean

Expand Down
2 changes: 1 addition & 1 deletion aws/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions ...ftware/amazon/smithy/aws/go/codegen/customization/S3HttpLabelBucketFilterIntegration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import software.amazon.smithy.go.codegen.GoSettings;
import software.amazon.smithy.go.codegen.integration.GoIntegration;
import software.amazon.smithy.go.codegen.trait.NoSerializeTrait;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.traits.HttpLabelTrait;
import software.amazon.smithy.model.transform.ModelTransformer;
Expand All @@ -14,13 +15,13 @@ public Model preprocessModel(Model model, GoSettings settings) {
return model;
}

return ModelTransformer.create().removeTraitsIf(model, (shape, trait) -> {
if (trait instanceof HttpLabelTrait) {
return shape.asMemberShape()
return ModelTransformer.create().mapTraits(model, (shape, trait) -> {
if (!(trait instanceof HttpLabelTrait)) return trait;

boolean isBucket = shape.asMemberShape()
.map(s -> s.getMemberName().equals("Bucket"))
.orElse(false);
}
return false;
return isBucket ? new NoSerializeTrait() : trait;
});
}
}
14 changes: 7 additions & 7 deletions config/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/aws/aws-sdk-go-v2/config
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/credentials v1.13.26
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35
github.com/aws/aws-sdk-go-v2/service/sso v1.12.12
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12
github.com/aws/aws-sdk-go-v2/service/sts v1.19.2
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/credentials v1.13.27
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.36
github.com/aws/aws-sdk-go-v2/service/sso v1.12.13
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13
github.com/aws/aws-sdk-go-v2/service/sts v1.19.3
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
2 changes: 1 addition & 1 deletion config/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions credentials/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module github.com/aws/aws-sdk-go-v2/credentials
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4
github.com/aws/aws-sdk-go-v2/service/sso v1.12.12
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12
github.com/aws/aws-sdk-go-v2/service/sts v1.19.2
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5
github.com/aws/aws-sdk-go-v2/service/sso v1.12.13
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13
github.com/aws/aws-sdk-go-v2/service/sts v1.19.3
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
2 changes: 1 addition & 1 deletion credentials/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions example/service/dynamodb/createTable/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/example/service/dynamodb/createTable
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/config v1.18.27
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.0
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/config v1.18.28
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.1
)

replace github.com/aws/aws-sdk-go-v2 => ../../../../
Expand Down
8 changes: 4 additions & 4 deletions example/service/dynamodb/scanItems/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/example/service/dynamodb/listItems
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/config v1.18.27
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.30
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.0
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/config v1.18.28
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.31
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.1
)

replace github.com/aws/aws-sdk-go-v2 => ../../../../
Expand Down
4 changes: 2 additions & 2 deletions example/service/s3/listObjects/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/example/service/s3/listObjects
go 1.15

require (
github.com/aws/aws-sdk-go-v2/config v1.18.27
github.com/aws/aws-sdk-go-v2/service/s3 v1.36.0
github.com/aws/aws-sdk-go-v2/config v1.18.28
github.com/aws/aws-sdk-go-v2/service/s3 v1.37.0
)

replace github.com/aws/aws-sdk-go-v2 => ../../../../
Expand Down
8 changes: 4 additions & 4 deletions example/service/s3/usingPrivateLink/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/example/service/s3/usingPrivateLink
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/config v1.18.27
github.com/aws/aws-sdk-go-v2/service/s3 v1.36.0
github.com/aws/aws-sdk-go-v2/service/s3control v1.31.7
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/config v1.18.28
github.com/aws/aws-sdk-go-v2/service/s3 v1.37.0
github.com/aws/aws-sdk-go-v2/service/s3control v1.31.9
)

replace github.com/aws/aws-sdk-go-v2 => ../../../../
Expand Down
2 changes: 1 addition & 1 deletion feature/cloudfront/sign/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ module github.com/aws/aws-sdk-go-v2/feature/cloudfront/sign

go 1.15

require github.com/aws/aws-sdk-go-v2 v1.18.1
require github.com/aws/aws-sdk-go-v2 v1.19.0

replace github.com/aws/aws-sdk-go-v2 => ../../../
2 changes: 1 addition & 1 deletion feature/cloudfront/sign/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions feature/dynamodb/attributevalue/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.0
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.14
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.1
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.15
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
2 changes: 1 addition & 1 deletion feature/dynamodb/attributevalue/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions feature/dynamodb/expression/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.30
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.0
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.31
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.1
github.com/google/go-cmp v0.5.8
)

Expand Down
2 changes: 1 addition & 1 deletion feature/dynamodb/expression/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions feature/dynamodbstreams/attributevalue/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/feature/dynamodbstreams/attributevalue
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.0
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.14
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.1
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.15
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
2 changes: 1 addition & 1 deletion feature/dynamodbstreams/attributevalue/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion feature/ec2/imds/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/feature/ec2/imds
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
2 changes: 1 addition & 1 deletion feature/ec2/imds/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions feature/ec2/imds/internal/configtesting/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/configtesting
go 1.15

require (
github.com/aws/aws-sdk-go-v2/config v1.18.27
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4
github.com/aws/aws-sdk-go-v2/config v1.18.28
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5
)

replace github.com/aws/aws-sdk-go-v2 => ../../../../../
Expand Down
2 changes: 1 addition & 1 deletion feature/rds/auth/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ module github.com/aws/aws-sdk-go-v2/feature/rds/auth

go 1.15

require github.com/aws/aws-sdk-go-v2 v1.18.1
require github.com/aws/aws-sdk-go-v2 v1.19.0

replace github.com/aws/aws-sdk-go-v2 => ../../../
2 changes: 1 addition & 1 deletion feature/rds/auth/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions feature/s3/manager/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/feature/s3/manager
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/config v1.18.27
github.com/aws/aws-sdk-go-v2/service/s3 v1.36.0
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/config v1.18.28
github.com/aws/aws-sdk-go-v2/service/s3 v1.37.0
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
2 changes: 1 addition & 1 deletion feature/s3/manager/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/configsources/configtesting/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/internal/configsources/configtesting
go 1.15

require (
github.com/aws/aws-sdk-go-v2/config v1.18.27
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34
github.com/aws/aws-sdk-go-v2/config v1.18.28
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35
)

replace github.com/aws/aws-sdk-go-v2 => ../../../
Expand Down
2 changes: 1 addition & 1 deletion internal/configsources/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ module github.com/aws/aws-sdk-go-v2/internal/configsources

go 1.15

require github.com/aws/aws-sdk-go-v2 v1.18.1
require github.com/aws/aws-sdk-go-v2 v1.19.0

replace github.com/aws/aws-sdk-go-v2 => ../../
2 changes: 1 addition & 1 deletion internal/configsources/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/endpoints/v2/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/internal/endpoints/v2
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
2 changes: 1 addition & 1 deletion internal/endpoints/v2/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/ini/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ module github.com/aws/aws-sdk-go-v2/internal/ini

go 1.15

require github.com/aws/aws-sdk-go-v2 v1.18.1
require github.com/aws/aws-sdk-go-v2 v1.19.0

replace github.com/aws/aws-sdk-go-v2 => ../../
2 changes: 1 addition & 1 deletion internal/ini/go_module_metadata.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/protocoltest/awsrestjson/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
6 changes: 3 additions & 3 deletions internal/protocoltest/ec2query/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
6 changes: 3 additions & 3 deletions internal/protocoltest/jsonrpc/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/jsonrpc
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
6 changes: 3 additions & 3 deletions internal/protocoltest/jsonrpc10/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/jsonrpc10
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
6 changes: 3 additions & 3 deletions internal/protocoltest/query/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/query
go 1.15

require (
github.com/aws/aws-sdk-go-v2 v1.18.1
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28
github.com/aws/aws-sdk-go-v2 v1.19.0
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29
github.com/aws/smithy-go v1.13.5
github.com/google/go-cmp v0.5.8
)
Expand Down
Loading

0 comments on commit aec3da0

Please sign in to comment.