Skip to content

Commit 8da49e5

Browse files
lucix-awslucix-aws
authored
switch to code-generated waiters for remaining services (#2994)
1 parent c7c6865 commit 8da49e5

File tree

299 files changed

+5890
-9573
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+5890
-9573
lines changed

‎.changelog/b80aa7d9d8234281961d2bca09327dc8.json

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{
2+
"id": "b80aa7d9-d823-4281-961d-2bca09327dc8",
3+
"type": "dependency",
4+
"collapse": true,
5+
"description": "Switch to code-generated waiter matchers, removing the dependency on go-jmespath.",
6+
"modules": [
7+
"example/service/dynamodb/createTable",
8+
"example/service/dynamodb/scanItems",
9+
"feature/dynamodb/expression",
10+
"internal/protocoltest/smithyrpcv2cbor",
11+
"service/acm",
12+
"service/acmpca",
13+
"service/amp",
14+
"service/appstream",
15+
"service/cloudcontrol",
16+
"service/cloudformation",
17+
"service/cloudfront",
18+
"service/codedeploy",
19+
"service/codegurureviewer",
20+
"service/databasemigrationservice",
21+
"service/deadline",
22+
"service/docdb",
23+
"service/dsql",
24+
"service/dynamodb",
25+
"service/ecr",
26+
"service/ecs",
27+
"service/eks",
28+
"service/elasticache",
29+
"service/elasticbeanstalk",
30+
"service/elasticloadbalancing",
31+
"service/elasticloadbalancingv2",
32+
"service/elastictranscoder",
33+
"service/emr",
34+
"service/groundstation",
35+
"service/internal/integrationtest",
36+
"service/iotsitewise",
37+
"service/kinesis",
38+
"service/kinesis/internal/testing",
39+
"service/lambda",
40+
"service/lexmodelsv2",
41+
"service/machinelearning",
42+
"service/macie2",
43+
"service/mediaconnect",
44+
"service/medialive",
45+
"service/mediapackagev2",
46+
"service/neptune",
47+
"service/neptunegraph",
48+
"service/omics",
49+
"service/opsworks",
50+
"service/opsworkscm",
51+
"service/proton",
52+
"service/rds",
53+
"service/redshift",
54+
"service/rekognition",
55+
"service/route53",
56+
"service/route53recoverycontrolconfig",
57+
"service/sagemaker",
58+
"service/schemas",
59+
"service/ses",
60+
"service/signer",
61+
"service/ssm",
62+
"service/ssmincidents",
63+
"service/transfer"
64+
]
65+
}

‎.changelog/b99c0624b1c149068476d0dafe2955f5.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"id": "b99c0624-b1c1-4906-8476-d0dafe2955f5",
3+
"type": "dependency",
4+
"description": "Remove root dependency on go-jmespath, which is no longer used.",
5+
"modules": [
6+
"."
7+
]
8+
}

‎SMITHY_GO_CODEGEN_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d708d1d4ae7dc9bc80ae20d1e09623fba519e9d7
1+
0681fa98ae3a2bd90161042c2c229a6cd4e9a80b

‎codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsWaiters.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,24 @@
2222
import software.amazon.smithy.codegen.core.Symbol;
2323
import software.amazon.smithy.go.codegen.GoCodegenContext;
2424
import software.amazon.smithy.go.codegen.SmithyGoDependency;
25-
import software.amazon.smithy.go.codegen.integration.Waiters;
26-
import software.amazon.smithy.model.Model;
27-
import software.amazon.smithy.model.shapes.ShapeId;
25+
import software.amazon.smithy.go.codegen.integration.Waiters2;
2826

2927
import static software.amazon.smithy.go.codegen.GoWriter.goTemplate;
3028
import static software.amazon.smithy.go.codegen.SymbolUtils.buildPackageSymbol;
3129

3230
/**
3331
* Extends the base smithy Waiters integration to track in the User-Agent string.
3432
*/
35-
public class AwsWaiters extends Waiters {
33+
public class AwsWaiters extends Waiters2 {
3634
@Override
3735
public Set<Symbol> getAdditionalClientOptions() {
3836
return Set.of(buildPackageSymbol("addIsWaiterUserAgent"));
3937
}
4038

41-
@Override
42-
public boolean enabledForService(Model model, ShapeId service) {
43-
return !AwsWaiters2.PHASED_ROLLOUT_SERVICES.contains(service);
44-
}
45-
4639
@Override
4740
public void writeAdditionalFiles(GoCodegenContext ctx) {
4841
super.writeAdditionalFiles(ctx);
4942

50-
// happens regardless of enabledForService() == true - so AwsWaiters2 can use it
5143
ctx.writerDelegator().useFileWriter("api_client.go", ctx.settings().getModuleName(), goTemplate("""
5244
func addIsWaiterUserAgent(o *Options) {
5345
o.APIOptions = append(o.APIOptions, func(stack $stack:P) error {

‎codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsWaiters2.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
software.amazon.smithy.aws.go.codegen.customization.AwsWaiters
2-
software.amazon.smithy.aws.go.codegen.customization.AwsWaiters2
32
software.amazon.smithy.aws.go.codegen.customization.AwsPaginators
43
software.amazon.smithy.aws.go.codegen.customization.auth.BackfillSigV4ATrait
54
software.amazon.smithy.aws.go.codegen.AddProtocols

‎example/service/dynamodb/createTable/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ require (
2121
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
2222
github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
2323
github.com/aws/smithy-go v1.22.2 // indirect
24-
github.com/jmespath/go-jmespath v0.4.0 // indirect
2524
)
2625

2726
replace github.com/aws/aws-sdk-go-v2 => ../../../../

‎example/service/dynamodb/createTable/go.sum

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,2 @@
11
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
22
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
3-
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
4-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
6-
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
7-
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
8-
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
9-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
11-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
12-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
13-
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
14-
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎example/service/dynamodb/scanItems/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ require (
2323
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
2424
github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
2525
github.com/aws/smithy-go v1.22.2 // indirect
26-
github.com/jmespath/go-jmespath v0.4.0 // indirect
2726
)
2827

2928
replace github.com/aws/aws-sdk-go-v2 => ../../../../

‎example/service/dynamodb/scanItems/go.sum

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,2 @@
11
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
22
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
3-
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
4-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
6-
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
7-
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
8-
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
9-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
11-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
12-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
13-
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
14-
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎feature/dynamodb/expression/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
1616
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.11 // indirect
1717
github.com/aws/smithy-go v1.22.2 // indirect
18-
github.com/jmespath/go-jmespath v0.4.0 // indirect
1918
)
2019

2120
replace github.com/aws/aws-sdk-go-v2 => ../../../

‎feature/dynamodb/expression/go.sum

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,2 @@
11
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
22
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
3-
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
4-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
6-
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
7-
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
8-
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
9-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
11-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
12-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
13-
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
14-
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
module github.com/aws/aws-sdk-go-v2
22

3-
require (
4-
github.com/aws/smithy-go v1.22.2
5-
github.com/jmespath/go-jmespath v0.4.0
6-
)
3+
require github.com/aws/smithy-go v1.22.2
74

85
go 1.21

‎go.sum

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,2 @@
11
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
22
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
3-
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
4-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
6-
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
7-
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
8-
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
9-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
11-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
12-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
13-
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
14-
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎internal/protocoltest/smithyrpcv2cbor/deserializers.go

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)