switch to code-generated waiters for remaining services (#2994)

Author: lucix-aws

.changelog/b80aa7d9d8234281961d2bca09327dc8.json

@@ -0,0 +1,65 @@
+{
+ "id": "b80aa7d9-d823-4281-961d-2bca09327dc8",
+ "type": "dependency",
+ "collapse": true,
+ "description": "Switch to code-generated waiter matchers, removing the dependency on go-jmespath.",
+ "modules": [
+ "example/service/dynamodb/createTable",
+ "example/service/dynamodb/scanItems",
+ "feature/dynamodb/expression",
+ "internal/protocoltest/smithyrpcv2cbor",
+ "service/acm",
+ "service/acmpca",
+ "service/amp",
+ "service/appstream",
+ "service/cloudcontrol",
+ "service/cloudformation",
+ "service/cloudfront",
+ "service/codedeploy",
+ "service/codegurureviewer",
+ "service/databasemigrationservice",
+ "service/deadline",
+ "service/docdb",
+ "service/dsql",
+ "service/dynamodb",
+ "service/ecr",
+ "service/ecs",
+ "service/eks",
+ "service/elasticache",
+ "service/elasticbeanstalk",
+ "service/elasticloadbalancing",
+ "service/elasticloadbalancingv2",
+ "service/elastictranscoder",
+ "service/emr",
+ "service/groundstation",
+ "service/internal/integrationtest",
+ "service/iotsitewise",
+ "service/kinesis",
+ "service/kinesis/internal/testing",
+ "service/lambda",
+ "service/lexmodelsv2",
+ "service/machinelearning",
+ "service/macie2",
+ "service/mediaconnect",
+ "service/medialive",
+ "service/mediapackagev2",
+ "service/neptune",
+ "service/neptunegraph",
+ "service/omics",
+ "service/opsworks",
+ "service/opsworkscm",
+ "service/proton",
+ "service/rds",
+ "service/redshift",
+ "service/rekognition",
+ "service/route53",
+ "service/route53recoverycontrolconfig",
+ "service/sagemaker",
+ "service/schemas",
+ "service/ses",
+ "service/signer",
+ "service/ssm",
+ "service/ssmincidents",
+ "service/transfer"
+ ]
+}

.changelog/b99c0624b1c149068476d0dafe2955f5.json

@@ -0,0 +1,8 @@
+{
+ "id": "b99c0624-b1c1-4906-8476-d0dafe2955f5",
+ "type": "dependency",
+ "description": "Remove root dependency on go-jmespath, which is no longer used.",
+ "modules": [
+ "."
+ ]
+}

SMITHY_GO_CODEGEN_VERSION

@@ -1 +1 @@
-d708d1d4ae7dc9bc80ae20d1e09623fba519e9d7
+0681fa98ae3a2bd90161042c2c229a6cd4e9a80b

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

@@ -22,32 +22,24 @@
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.go.codegen.GoCodegenContext;
 import software.amazon.smithy.go.codegen.SmithyGoDependency;
-import software.amazon.smithy.go.codegen.integration.Waiters;
-import software.amazon.smithy.model.Model;
-import software.amazon.smithy.model.shapes.ShapeId;
+import software.amazon.smithy.go.codegen.integration.Waiters2;
 
 import static software.amazon.smithy.go.codegen.GoWriter.goTemplate;
 import static software.amazon.smithy.go.codegen.SymbolUtils.buildPackageSymbol;
 
 /**
  * Extends the base smithy Waiters integration to track in the User-Agent string.
  */
-public class AwsWaiters extends Waiters {
+public class AwsWaiters extends Waiters2 {
  @Override
  public Set<Symbol> getAdditionalClientOptions() {
  return Set.of(buildPackageSymbol("addIsWaiterUserAgent"));
  }
 
- @Override
- public boolean enabledForService(Model model, ShapeId service) {
- return !AwsWaiters2.PHASED_ROLLOUT_SERVICES.contains(service);
- }
-
  @Override
  public void writeAdditionalFiles(GoCodegenContext ctx) {
  super.writeAdditionalFiles(ctx);
 
- // happens regardless of enabledForService() == true - so AwsWaiters2 can use it
  ctx.writerDelegator().useFileWriter("api_client.go", ctx.settings().getModuleName(), goTemplate("""
  func addIsWaiterUserAgent(o *Options) {
  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

@@ -1,5 +1,4 @@
 software.amazon.smithy.aws.go.codegen.customization.AwsWaiters
-software.amazon.smithy.aws.go.codegen.customization.AwsWaiters2
 software.amazon.smithy.aws.go.codegen.customization.AwsPaginators
 software.amazon.smithy.aws.go.codegen.customization.auth.BackfillSigV4ATrait
 software.amazon.smithy.aws.go.codegen.AddProtocols

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

@@ -21,7 +21,6 @@ require (
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
 github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
 github.com/aws/smithy-go v1.22.2 // indirect
-github.com/jmespath/go-jmespath v0.4.0 // indirect
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../../../

example/service/dynamodb/createTable/go.mod

@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-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/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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-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=

example/service/dynamodb/createTable/go.sum

@@ -23,7 +23,6 @@ require (
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
 github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
 github.com/aws/smithy-go v1.22.2 // indirect
-github.com/jmespath/go-jmespath v0.4.0 // indirect
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../../../

example/service/dynamodb/scanItems/go.mod

@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-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/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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-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=