chore: fix codegen region provider and default credential provider in…

… browser
aws · Dec 23, 2020 · 833b3c6 · 833b3c6
1 parent 99fcd53
commit 833b3c6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/...egen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfig.java b/...egen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfig.java
@@ -141,17 +141,14 @@ private Map<String, Consumer<TypeScriptWriter>> getDefaultConfig(LanguageTarget
                 return MapUtils.of(
                         "region", writer -> {
                             writer.addDependency(TypeScriptDependency.INVALID_DEPENDENCY);
-                            writer.addImport("invalidAsyncFunction", "invalidAsyncFunction",
+                            writer.addImport("invalidProvider", "invalidProvider",
                                     TypeScriptDependency.INVALID_DEPENDENCY.packageName);
-                            writer.write("region: invalidAsyncFunction(\"Region is missing\") as any,");
+                            writer.write("region: invalidProvider(\"Region is missing\"),");
                         },
                         "credentialDefaultProvider", writer -> {
-                            writer.addDependency(TypeScriptDependency.INVALID_DEPENDENCY);
-                            writer.addImport("invalidAsyncFunction", "invalidAsyncFunction",
-                                    TypeScriptDependency.INVALID_DEPENDENCY.packageName);
                             writer.write(
-                                    "credentialDefaultProvider: invalidAsyncFunction(\"Credential"
-                                    + "is missing\") as any,");
+                                    "credentialDefaultProvider: (_: unknown) => () => Promise.reject(new Error("
+                                        + "\"Credential is missing\")),");
                         },
                         "maxAttempts", writer -> {
                             writer.addDependency(TypeScriptDependency.MIDDLEWARE_RETRY);

diff --git a/...odegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java b/...odegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java
@@ -180,7 +180,7 @@ private static boolean operationUsesAwsAuth(Model model, ServiceShape service, O
     }
 
     private static boolean hasOptionalAuthOperation(Model model, ServiceShape service) {
-        TopDownIndex topDownIndex = model.getKnowledge(TopDownIndex.class);
+        TopDownIndex topDownIndex = TopDownIndex.of(model);
         Set<OperationShape> operations = topDownIndex.getContainedOperations(service);
         for (OperationShape operation : operations) {
             if (operation.getTrait(OptionalAuthTrait.class).isPresent()) {

diff --git a/.../src/test/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfigTest.java b/.../src/test/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfigTest.java
@@ -37,7 +37,7 @@ public void addsAwsRuntimeConfigSettings() {
 
         // Check that both the config files were updated.
         assertThat(manifest.getFileString("runtimeConfig.ts").get(), containsString("credentialDefaultProvider"));
-        assertThat(manifest.getFileString("runtimeConfig.browser.ts").get(), containsString("invalidAsyncFunction"));
+        assertThat(manifest.getFileString("runtimeConfig.browser.ts").get(), containsString("invalidProvider"));
 
         // Check that the dependency interface was updated.
         assertThat(manifest.getFileString("NotSameClient.ts").get(), containsString("credentialDefaultProvider?"));