Skip to content

Commit 108bb99

Browse files
authored
fix(codegen): fix setting of default signing name (#6487)
1 parent c43103f commit 108bb99

File tree

1 file changed

+4
-11
lines changed
  • codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen

1 file changed

+4
-11
lines changed

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsAuthPlugin.java

+4-11
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,8 @@ public void addConfigInterfaceFields(
100100
) {
101101
ServiceShape service = settings.getService(model);
102102
if (!isSigV4Service(service) && isAwsService(service)) {
103-
ServiceTrait serviceTrait = service.getTrait(ServiceTrait.class).get();
104103
settings.setDefaultSigningName(
105-
serviceTrait.getArnNamespace()
104+
service.expectTrait(ServiceTrait.class).getArnNamespace()
106105
);
107106
return;
108107
}
@@ -123,15 +122,9 @@ public void addConfigInterfaceFields(
123122
writer.write("credentialDefaultProvider?: (input: any) => __Provider<__Credentials>;\n");
124123
}
125124

126-
try {
127-
ServiceTrait serviceTrait = service.getTrait(ServiceTrait.class).get();
128-
settings.setDefaultSigningName(
129-
service.getTrait(SigV4Trait.class).map(SigV4Trait::getName)
130-
.orElse(serviceTrait.getArnNamespace())
131-
);
132-
} catch (Exception e) {
133-
LOGGER.warning("Unable to set service default signing name. A SigV4 or Service trait is needed.");
134-
}
125+
settings.setDefaultSigningName(
126+
service.expectTrait(SigV4Trait.class).getName()
127+
);
135128
}
136129

137130
// Only one of AwsAuth or SigV4Auth should be used

0 commit comments

Comments
 (0)