fix(clients): use signing name from auth sigv4 trait (#1835)

* chore(endpoints): signingService prefers auth trait name * fix(clients): use signing name from auth sigv4 trait
aws · Dec 23, 2020 · e539302 · e539302
1 parent e7dce39
commit e539302
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/clients/client-apigatewaymanagementapi/endpoints.ts b/clients/client-apigatewaymanagementapi/endpoints.ts
@@ -79,5 +79,5 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (region: string, op
         };
       }
   }
-  return Promise.resolve({ signingService: "apigateway", ...regionInfo });
+  return Promise.resolve({ signingService: "execute-api", ...regionInfo });
 };
diff --git a/clients/client-codeguruprofiler/endpoints.ts b/clients/client-codeguruprofiler/endpoints.ts
@@ -79,5 +79,5 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (region: string, op
         };
       }
   }
-  return Promise.resolve({ signingService: "codeguru-profiler", ...regionInfo });
+  return Promise.resolve({ signingService: "codeguruprofiler", ...regionInfo });
 };
diff --git a/clients/client-connectparticipant/endpoints.ts b/clients/client-connectparticipant/endpoints.ts
@@ -79,5 +79,5 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (region: string, op
         };
       }
   }
-  return Promise.resolve({ signingService: "connect", ...regionInfo });
+  return Promise.resolve({ signingService: "execute-api", ...regionInfo });
 };
diff --git a/clients/client-iot/endpoints.ts b/clients/client-iot/endpoints.ts
@@ -237,5 +237,5 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (region: string, op
         };
       }
   }
-  return Promise.resolve({ signingService: "iot", ...regionInfo });
+  return Promise.resolve({ signingService: "execute-api", ...regionInfo });
 };
diff --git a/...odegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/EndpointGenerator.java b/...odegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/EndpointGenerator.java
@@ -21,6 +21,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import software.amazon.smithy.aws.traits.ServiceTrait;
+import software.amazon.smithy.aws.traits.auth.SigV4Trait;
 import software.amazon.smithy.codegen.core.CodegenException;
 import software.amazon.smithy.model.node.Node;
 import software.amazon.smithy.model.node.ObjectNode;
@@ -45,6 +46,7 @@ final class EndpointGenerator implements Runnable {
     private final ObjectNode endpointData;
     private final ServiceTrait serviceTrait;
     private final String endpointPrefix;
+    private final String baseSigningSerivce;
     private final Map<String, Partition> partitions = new TreeMap<>();
     private final Map<String, ObjectNode> endpoints = new TreeMap<>();
     private final Map<String, Partition> regionPartitionsMap = new TreeMap<>();
@@ -54,6 +56,8 @@ final class EndpointGenerator implements Runnable {
         serviceTrait = service.getTrait(ServiceTrait.class)
                 .orElseThrow(() -> new CodegenException("No service trait found on " + service.getId()));
         endpointPrefix = serviceTrait.getEndpointPrefix();
+        baseSigningSerivce = service.getTrait(SigV4Trait.class).map(SigV4Trait::getName)
+                .orElse(serviceTrait.getArnNamespace());
         endpointData = Node.parse(IoUtils.readUtf8Resource(getClass(), "endpoints.json")).expectObjectNode();
         validateVersion();
         loadPartitions();
@@ -154,8 +158,7 @@ private void writeEndpointProviderFunction() {
                     writePartitionEndpointResolver(partitions.get("aws")); });
                 writer.dedent();
             });
-            writer.write("return Promise.resolve({ signingService: $S, ...regionInfo });",
-                    serviceTrait.getArnNamespace());
+            writer.write("return Promise.resolve({ signingService: $S, ...regionInfo });", baseSigningSerivce);
         });
     }
 

diff --git a/protocol_tests/aws-json/endpoints.ts b/protocol_tests/aws-json/endpoints.ts
@@ -79,5 +79,5 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (region: string, op
         };
       }
   }
-  return Promise.resolve({ signingService: "jsonprotocol", ...regionInfo });
+  return Promise.resolve({ signingService: "foo", ...regionInfo });
 };