feat: rollout generated waiters for ec2 (#2717)

.changelog/3862dfedda7e4cf9b8593de8ac95a77e.json

@@ -0,0 +1,8 @@
+{
+    "id": "3862dfed-da7e-4cf9-b859-3de8ac95a77e",
+    "type": "feature",
+    "description": "Switch to new waiter matching implementation, which conveys a slight performance boost and removes the need for the go-jmespath runtime dependency.",
+    "modules": [
+        "service/ec2"
+    ]
+}

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

@@ -20,12 +20,11 @@
 
 import software.amazon.smithy.aws.go.codegen.AwsGoDependency;
 import software.amazon.smithy.codegen.core.Symbol;
-import software.amazon.smithy.codegen.core.SymbolProvider;
-import software.amazon.smithy.go.codegen.GoDelegator;
-import software.amazon.smithy.go.codegen.GoSettings;
+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 static software.amazon.smithy.go.codegen.GoWriter.goTemplate;
 import static software.amazon.smithy.go.codegen.SymbolUtils.buildPackageSymbol;
@@ -40,10 +39,16 @@ public Set<Symbol> getAdditionalClientOptions() {
     }
 
     @Override
-    public void writeAdditionalFiles(GoSettings settings, Model model, SymbolProvider symbolProvider, GoDelegator goDelegator) {
-        super.writeAdditionalFiles(settings, model, symbolProvider, goDelegator);
+    public boolean enabledForService(Model model, ShapeId service) {
+        return !AwsWaiters2.PHASED_ROLLOUT_SERVICES.contains(service);
+    }
+
+    @Override
+    public void writeAdditionalFiles(GoCodegenContext ctx) {
+        super.writeAdditionalFiles(ctx);
 
-        goDelegator.useFileWriter("api_client.go", settings.getModuleName(), goTemplate("""
+        // 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 {
                         ua, err := getOrAddRequestUserAgent(stack)

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

@@ -0,0 +1,27 @@
+package software.amazon.smithy.aws.go.codegen.customization;
+
+import software.amazon.smithy.codegen.core.Symbol;
+import software.amazon.smithy.go.codegen.integration.Waiters2;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.ShapeId;
+
+import java.util.List;
+import java.util.Set;
+
+import static software.amazon.smithy.go.codegen.SymbolUtils.buildPackageSymbol;
+
+public class AwsWaiters2 extends Waiters2 {
+    public static final List<ShapeId> PHASED_ROLLOUT_SERVICES = List.of(
+            ShapeId.from("com.amazonaws.ec2#AmazonEC2")
+    );
+
+    @Override
+    public Set<Symbol> getAdditionalClientOptions() {
+        return Set.of(buildPackageSymbol("addIsWaiterUserAgent"));
+    }
+
+    @Override
+    public boolean enabledForService(Model model, ShapeId service) {
+        return PHASED_ROLLOUT_SERVICES.contains(service);
+    }
+}

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

@@ -1,4 +1,5 @@
 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