Skip to content

Commit e539302

Browse files
authored
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
1 parent e7dce39 commit e539302

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

clients/client-apigatewaymanagementapi/endpoints.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (region: string, op
7979
};
8080
}
8181
}
82-
return Promise.resolve({ signingService: "apigateway", ...regionInfo });
82+
return Promise.resolve({ signingService: "execute-api", ...regionInfo });
8383
};

clients/client-codeguruprofiler/endpoints.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (region: string, op
7979
};
8080
}
8181
}
82-
return Promise.resolve({ signingService: "codeguru-profiler", ...regionInfo });
82+
return Promise.resolve({ signingService: "codeguruprofiler", ...regionInfo });
8383
};

clients/client-connectparticipant/endpoints.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (region: string, op
7979
};
8080
}
8181
}
82-
return Promise.resolve({ signingService: "connect", ...regionInfo });
82+
return Promise.resolve({ signingService: "execute-api", ...regionInfo });
8383
};

clients/client-iot/endpoints.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,5 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (region: string, op
237237
};
238238
}
239239
}
240-
return Promise.resolve({ signingService: "iot", ...regionInfo });
240+
return Promise.resolve({ signingService: "execute-api", ...regionInfo });
241241
};

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Set;
2222
import java.util.TreeMap;
2323
import software.amazon.smithy.aws.traits.ServiceTrait;
24+
import software.amazon.smithy.aws.traits.auth.SigV4Trait;
2425
import software.amazon.smithy.codegen.core.CodegenException;
2526
import software.amazon.smithy.model.node.Node;
2627
import software.amazon.smithy.model.node.ObjectNode;
@@ -45,6 +46,7 @@ final class EndpointGenerator implements Runnable {
4546
private final ObjectNode endpointData;
4647
private final ServiceTrait serviceTrait;
4748
private final String endpointPrefix;
49+
private final String baseSigningSerivce;
4850
private final Map<String, Partition> partitions = new TreeMap<>();
4951
private final Map<String, ObjectNode> endpoints = new TreeMap<>();
5052
private final Map<String, Partition> regionPartitionsMap = new TreeMap<>();
@@ -54,6 +56,8 @@ final class EndpointGenerator implements Runnable {
5456
serviceTrait = service.getTrait(ServiceTrait.class)
5557
.orElseThrow(() -> new CodegenException("No service trait found on " + service.getId()));
5658
endpointPrefix = serviceTrait.getEndpointPrefix();
59+
baseSigningSerivce = service.getTrait(SigV4Trait.class).map(SigV4Trait::getName)
60+
.orElse(serviceTrait.getArnNamespace());
5761
endpointData = Node.parse(IoUtils.readUtf8Resource(getClass(), "endpoints.json")).expectObjectNode();
5862
validateVersion();
5963
loadPartitions();
@@ -154,8 +158,7 @@ private void writeEndpointProviderFunction() {
154158
writePartitionEndpointResolver(partitions.get("aws")); });
155159
writer.dedent();
156160
});
157-
writer.write("return Promise.resolve({ signingService: $S, ...regionInfo });",
158-
serviceTrait.getArnNamespace());
161+
writer.write("return Promise.resolve({ signingService: $S, ...regionInfo });", baseSigningSerivce);
159162
});
160163
}
161164

protocol_tests/aws-json/endpoints.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ export const defaultRegionInfoProvider: RegionInfoProvider = (region: string, op
7979
};
8080
}
8181
}
82-
return Promise.resolve({ signingService: "jsonprotocol", ...regionInfo });
82+
return Promise.resolve({ signingService: "foo", ...regionInfo });
8383
};

0 commit comments

Comments
 (0)