fixup! feat: support @httpApiKeyAuth trait

Author: glb

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/AddHttpApiKeyAuthPlugin.java

@@ -72,12 +72,7 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                             .namespace("./" + CodegenUtils.SOURCE_FOLDER + "/middleware/HttpApiKeyAuth", "/")
                             .name("resolveHttpApiKeyAuthConfig")
                             .build())
-                    .servicePredicate((m, s) -> ServiceIndex.of(m).getEffectiveAuthSchemes(s)
-                                                        .values().stream()
-                                                        .filter(c -> c instanceof HttpApiKeyAuthTrait)
-                                                        .findFirst()
-                                                        .isPresent()
-                                                        && !areAllOptionalAuthOperations(m, s))
+                    .servicePredicate((m, s) -> hasEffectiveHttpApiKeyAuthTrait(m, s))
                     .build(),
 
             // Add the middleware to operations that use HTTP API key authorization.
@@ -87,19 +82,17 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                             .name("getHttpApiKeyAuthPlugin")
                             .build())
                     .additionalPluginFunctionParamsSupplier((m, s, o) -> new HashMap<String, Object>() {{
-                            // It's safe to do getTrait().get() because the operation predicate ensures that the trait
+                            // It's safe to do expectTrait() because the operation predicate ensures that the trait
                             // exists `in` and `name` are required attributes of the trait, `scheme` is optional.
-                            put("in", s.getTrait(HttpApiKeyAuthTrait.class).get().getIn().toString());
-                            put("name", s.getTrait(HttpApiKeyAuthTrait.class).get().getName());
-                            s.getTrait(HttpApiKeyAuthTrait.class).get().getScheme().ifPresent(scheme ->
+                            put("in", s.expectTrait(HttpApiKeyAuthTrait.class).getIn().toString());
+                            put("name", s.expectTrait(HttpApiKeyAuthTrait.class).getName());
+                            s.expectTrait(HttpApiKeyAuthTrait.class).getScheme().ifPresent(scheme ->
                                     put("scheme", scheme));
                     }})
-                    .operationPredicate((m, s, o) -> ServiceIndex.of(m).getEffectiveAuthSchemes(s)
-                                                            .values().stream()
-                                                            .filter(c -> c instanceof HttpApiKeyAuthTrait)
-                                                            .findFirst()
-                                                            .isPresent()
-                                                            && !o.hasTrait(OptionalAuthTrait.class))
+                    .operationPredicate((m, s, o) -> ServiceIndex.of(m).getEffectiveAuthSchemes(s, o)
+                            .keySet()
+                            .contains(HttpApiKeyAuthTrait.ID)
+                            && !o.hasTrait(OptionalAuthTrait.class))
                     .build()
         );
     }
@@ -115,7 +108,7 @@ public void writeAdditionalFiles(
 
         // If the service doesn't use HTTP API keys, we don't need to do anything and the generated
         // code doesn't need any additional files.
-        if (!service.hasTrait(HttpApiKeyAuthTrait.class) || areAllOptionalAuthOperations(model, service)) {
+        if (!hasEffectiveHttpApiKeyAuthTrait(model, service)) {
             return;
         }
 
@@ -125,23 +118,33 @@ public void writeAdditionalFiles(
 
         // Write the middleware source.
         writerFactory.accept(
-            Paths.get(CodegenUtils.SOURCE_FOLDER, "middleware", "HttpApiKeyAuth", "index.ts").toString(),
-            writer -> {
-                String source = IoUtils.readUtf8Resource(getClass(), "http-api-key-auth.ts");
-                writer.write("$L$L", noTouchNoticePrefix, "http-api-key-auth.ts");
-                writer.write("$L", source);
-            });
+                Paths.get(CodegenUtils.SOURCE_FOLDER, "middleware", "HttpApiKeyAuth", "index.ts").toString(),
+                writer -> {
+                        String source = IoUtils.readUtf8Resource(getClass(), "http-api-key-auth.ts");
+                        writer.write("$L$L", noTouchNoticePrefix, "http-api-key-auth.ts");
+                        writer.write("$L", source);
+                });
 
         // Write the middleware tests.
         writerFactory.accept(
-            Paths.get(CodegenUtils.SOURCE_FOLDER, "middleware", "HttpApiKeyAuth", "index.spec.ts").toString(),
-            writer -> {
-                String source = IoUtils.readUtf8Resource(getClass(), "http-api-key-auth.spec.ts");
-                writer.write("$L$L", noTouchNoticePrefix, "http-api-key-auth.spec.ts");
-                writer.write("$L", source);
-            });
+                Paths.get(CodegenUtils.SOURCE_FOLDER, "middleware", "HttpApiKeyAuth", "index.spec.ts").toString(),
+                writer -> {
+                        String source = IoUtils.readUtf8Resource(getClass(), "http-api-key-auth.spec.ts");
+                        writer.write("$L$L", noTouchNoticePrefix, "http-api-key-auth.spec.ts");
+                        writer.write("$L", source);
+                });
     }
 
+    // The service has the effective trait if it's in the "effective auth schemes" response
+    // AND if not all of the operations have the optional auth trait.
+    private static boolean hasEffectiveHttpApiKeyAuthTrait(Model model, ServiceShape service) {
+        return ServiceIndex.of(model).getEffectiveAuthSchemes(service)
+                .keySet()
+                .contains(HttpApiKeyAuthTrait.ID)
+                && !areAllOptionalAuthOperations(model, service);
+    }
+
+
     // This is derived from https://github.com/aws/aws-sdk-js-v3/blob/main/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsAuthPlugin.java.
     private static boolean areAllOptionalAuthOperations(Model model, ServiceShape service) {
         TopDownIndex topDownIndex = TopDownIndex.of(model);

smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/integration/AddHttpApiKeyAuthPluginTest.java

@@ -122,8 +122,7 @@ private void testDoesNotInject(String filename) {
                 not(containsString("this.middlewareStack.use(getHttpApiKeyAuthPlugin(configuration")));
 
         // Make sure that the middleware file was not written.
-        assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/middleware/HttpApiKeyAuth/index.ts")
-                .isPresent(),
+        assertThat(manifest.hasFile(CodegenUtils.SOURCE_FOLDER + "/middleware/HttpApiKeyAuth/index.ts"),
                 is(false));
     }
 }

smithy-typescript-codegen/src/test/resources/software/amazon/smithy/typescript/codegen/integration/http-api-key-auth-trait-all-optional.smithy

@@ -36,4 +36,5 @@ structure GetBarInput {}
 structure GetBarOutput {}
 
 @error("client")
-structure GetBarError {}
+structure GetBarError {}
+

smithy-typescript-codegen/src/test/resources/software/amazon/smithy/typescript/codegen/integration/http-api-key-auth-trait-no-scheme.smithy

@@ -35,4 +35,5 @@ structure GetBarInput {}
 structure GetBarOutput {}
 
 @error("client")
-structure GetBarError {}
+structure GetBarError {}
+

smithy-typescript-codegen/src/test/resources/software/amazon/smithy/typescript/codegen/integration/http-api-key-auth-trait-on-operation.smithy

@@ -35,4 +35,5 @@ structure GetBarInput {}
 structure GetBarOutput {}
 
 @error("client")
-structure GetBarError {}
+structure GetBarError {}
+

smithy-typescript-codegen/src/test/resources/software/amazon/smithy/typescript/codegen/integration/http-api-key-auth-trait.smithy

@@ -36,4 +36,5 @@ structure GetBarInput {}
 structure GetBarOutput {}
 
 @error("client")
-structure GetBarError {}
+structure GetBarError {}
+