Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codegen/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
smithyVersion=1.54.0
smithyVersion=1.55.0
smithyGradleVersion=1.2.0
smithyPluginVersion=0.6.0
14 changes: 14 additions & 0 deletions private/aws-protocoltests-ec2/src/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,20 @@ const partitionHash: PartitionHash = {
},
],
},
"aws-eusc": {
regions: ["eusc-de-east-1"],
regionRegex: "^eusc\\-(de)\\-\\w+\\-\\d+$",
variants: [
{
hostname: "awsec2.{region}.amazonaws.eu",
tags: [],
},
{
hostname: "awsec2-fips.{region}.amazonaws.eu",
tags: ["fips"],
},
],
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
Expand Down
14 changes: 14 additions & 0 deletions private/aws-protocoltests-json-10/src/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,20 @@ const partitionHash: PartitionHash = {
},
],
},
"aws-eusc": {
regions: ["eusc-de-east-1"],
regionRegex: "^eusc\\-(de)\\-\\w+\\-\\d+$",
variants: [
{
hostname: "jsonrpc10.{region}.amazonaws.eu",
tags: [],
},
{
hostname: "jsonrpc10-fips.{region}.amazonaws.eu",
tags: ["fips"],
},
],
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
Expand Down
14 changes: 14 additions & 0 deletions private/aws-protocoltests-json-machinelearning/src/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,20 @@ const partitionHash: PartitionHash = {
},
],
},
"aws-eusc": {
regions: ["eusc-de-east-1"],
regionRegex: "^eusc\\-(de)\\-\\w+\\-\\d+$",
variants: [
{
hostname: "machinelearning.{region}.amazonaws.eu",
tags: [],
},
{
hostname: "machinelearning-fips.{region}.amazonaws.eu",
tags: ["fips"],
},
],
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
Expand Down
14 changes: 14 additions & 0 deletions private/aws-protocoltests-json/src/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,20 @@ const partitionHash: PartitionHash = {
},
],
},
"aws-eusc": {
regions: ["eusc-de-east-1"],
regionRegex: "^eusc\\-(de)\\-\\w+\\-\\d+$",
variants: [
{
hostname: "jsonprotocol.{region}.amazonaws.eu",
tags: [],
},
{
hostname: "jsonprotocol-fips.{region}.amazonaws.eu",
tags: ["fips"],
},
],
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
Expand Down
14 changes: 14 additions & 0 deletions private/aws-protocoltests-query/src/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,20 @@ const partitionHash: PartitionHash = {
},
],
},
"aws-eusc": {
regions: ["eusc-de-east-1"],
regionRegex: "^eusc\\-(de)\\-\\w+\\-\\d+$",
variants: [
{
hostname: "awsquery.{region}.amazonaws.eu",
tags: [],
},
{
hostname: "awsquery-fips.{region}.amazonaws.eu",
tags: ["fips"],
},
],
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
Expand Down
14 changes: 14 additions & 0 deletions private/aws-protocoltests-restjson-apigateway/src/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,20 @@ const partitionHash: PartitionHash = {
},
],
},
"aws-eusc": {
regions: ["eusc-de-east-1"],
regionRegex: "^eusc\\-(de)\\-\\w+\\-\\d+$",
variants: [
{
hostname: "apigateway.{region}.amazonaws.eu",
tags: [],
},
{
hostname: "apigateway-fips.{region}.amazonaws.eu",
tags: ["fips"],
},
],
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
Expand Down
42 changes: 40 additions & 2 deletions private/aws-protocoltests-restjson-glacier/src/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,30 @@ const regionHash: RegionHash = {
},
],
},
"us-iso-east-1": {
variants: [
{
hostname: "glacier-fips.us-iso-east-1.c2s.ic.gov",
tags: ["fips"],
},
],
},
"us-iso-west-1": {
variants: [
{
hostname: "glacier-fips.us-iso-west-1.c2s.ic.gov",
tags: ["fips"],
},
],
},
"us-isob-east-1": {
variants: [
{
hostname: "glacier-fips.us-isob-east-1.sc2s.sgov.gov",
tags: ["fips"],
},
],
},
"us-west-1": {
variants: [
{
Expand Down Expand Up @@ -144,8 +168,22 @@ const partitionHash: PartitionHash = {
},
],
},
"aws-eusc": {
regions: ["eusc-de-east-1"],
regionRegex: "^eusc\\-(de)\\-\\w+\\-\\d+$",
variants: [
{
hostname: "glacier.{region}.amazonaws.eu",
tags: [],
},
{
hostname: "glacier-fips.{region}.amazonaws.eu",
tags: ["fips"],
},
],
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
regions: ["fips-us-iso-east-1", "fips-us-iso-west-1", "us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
variants: [
{
Expand All @@ -159,7 +197,7 @@ const partitionHash: PartitionHash = {
],
},
"aws-iso-b": {
regions: ["us-isob-east-1"],
regions: ["fips-us-isob-east-1", "us-isob-east-1"],
regionRegex: "^us\\-isob\\-\\w+\\-\\d+$",
variants: [
{
Expand Down
14 changes: 14 additions & 0 deletions private/aws-protocoltests-restjson/src/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,20 @@ const partitionHash: PartitionHash = {
},
],
},
"aws-eusc": {
regions: ["eusc-de-east-1"],
regionRegex: "^eusc\\-(de)\\-\\w+\\-\\d+$",
variants: [
{
hostname: "restjson.{region}.amazonaws.eu",
tags: [],
},
{
hostname: "restjson-fips.{region}.amazonaws.eu",
tags: ["fips"],
},
],
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { getSerdePlugin } from "@smithy/middleware-serde";
import { Command as $Command } from "@smithy/smithy-client";
import { MetadataBearer as __MetadataBearer } from "@smithy/types";

import { NestedXmlMapWithXmlNameInputOutput } from "../models/models_0";
import { NestedXmlMapWithXmlNameRequest, NestedXmlMapWithXmlNameResponse } from "../models/models_0";
import { de_NestedXmlMapWithXmlNameCommand, se_NestedXmlMapWithXmlNameCommand } from "../protocols/Aws_restXml";
import { RestXmlProtocolClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../RestXmlProtocolClient";

Expand All @@ -17,13 +17,13 @@ export { $Command };
*
* The input for {@link NestedXmlMapWithXmlNameCommand}.
*/
export interface NestedXmlMapWithXmlNameCommandInput extends NestedXmlMapWithXmlNameInputOutput {}
export interface NestedXmlMapWithXmlNameCommandInput extends NestedXmlMapWithXmlNameRequest {}
/**
* @public
*
* The output of {@link NestedXmlMapWithXmlNameCommand}.
*/
export interface NestedXmlMapWithXmlNameCommandOutput extends NestedXmlMapWithXmlNameInputOutput, __MetadataBearer {}
export interface NestedXmlMapWithXmlNameCommandOutput extends NestedXmlMapWithXmlNameResponse, __MetadataBearer {}

/**
* Nested Xml Maps with key/values with @xmlName
Expand All @@ -33,7 +33,7 @@ export interface NestedXmlMapWithXmlNameCommandOutput extends NestedXmlMapWithXm
* import { RestXmlProtocolClient, NestedXmlMapWithXmlNameCommand } from "@aws-sdk/aws-protocoltests-restxml"; // ES Modules import
* // const { RestXmlProtocolClient, NestedXmlMapWithXmlNameCommand } = require("@aws-sdk/aws-protocoltests-restxml"); // CommonJS import
* const client = new RestXmlProtocolClient(config);
* const input = { // NestedXmlMapWithXmlNameInputOutput
* const input = { // NestedXmlMapWithXmlNameRequest
* nestedXmlMapWithXmlNameMap: { // NestedXmlMapWithXmlNameMap
* "<keys>": { // NestedXmlMapWithXmlNameInnerMap
* "<keys>": "STRING_VALUE",
Expand All @@ -42,7 +42,7 @@ export interface NestedXmlMapWithXmlNameCommandOutput extends NestedXmlMapWithXm
* };
* const command = new NestedXmlMapWithXmlNameCommand(input);
* const response = await client.send(command);
* // { // NestedXmlMapWithXmlNameInputOutput
* // { // NestedXmlMapWithXmlNameResponse
* // nestedXmlMapWithXmlNameMap: { // NestedXmlMapWithXmlNameMap
* // "<keys>": { // NestedXmlMapWithXmlNameInnerMap
* // "<keys>": "STRING_VALUE",
Expand Down Expand Up @@ -84,8 +84,8 @@ export class NestedXmlMapWithXmlNameCommand extends $Command
/** @internal type navigation helper, not in runtime. */
protected declare static __types: {
api: {
input: NestedXmlMapWithXmlNameInputOutput;
output: NestedXmlMapWithXmlNameInputOutput;
input: NestedXmlMapWithXmlNameRequest;
output: NestedXmlMapWithXmlNameResponse;
};
sdk: {
input: NestedXmlMapWithXmlNameCommandInput;
Expand Down
14 changes: 14 additions & 0 deletions private/aws-protocoltests-restxml/src/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,20 @@ const partitionHash: PartitionHash = {
},
],
},
"aws-eusc": {
regions: ["eusc-de-east-1"],
regionRegex: "^eusc\\-(de)\\-\\w+\\-\\d+$",
variants: [
{
hostname: "restxml.{region}.amazonaws.eu",
tags: [],
},
{
hostname: "restxml-fips.{region}.amazonaws.eu",
tags: ["fips"],
},
],
},
"aws-iso": {
regions: ["us-iso-east-1", "us-iso-west-1"],
regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
Expand Down
9 changes: 8 additions & 1 deletion private/aws-protocoltests-restxml/src/models/models_0.ts
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,14 @@ export interface NestedXmlMapsResponse {
/**
* @public
*/
export interface NestedXmlMapWithXmlNameInputOutput {
export interface NestedXmlMapWithXmlNameRequest {
nestedXmlMapWithXmlNameMap?: Record<string, Record<string, string>> | undefined;
}

/**
* @public
*/
export interface NestedXmlMapWithXmlNameResponse {
nestedXmlMapWithXmlNameMap?: Record<string, Record<string, string>> | undefined;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ export const se_NestedXmlMapWithXmlNameCommand = async (
b.bp("/NestedXmlMapWithXmlName");
let body: any;
body = _ve;
const bn = new __XmlNode(_NXMWXNIO);
const bn = new __XmlNode(_NXMWXNR);
bn.lc(input, "nestedXmlMapWithXmlNameMap", "nestedXmlMapWithXmlNameMap", () =>
se_NestedXmlMapWithXmlNameMap(input[_nXMWXNM]!, context)
);
Expand Down Expand Up @@ -4518,7 +4518,7 @@ const _M = "Message";
const _N = "Null";
const _NP = "NestedPayload";
const _NXMR = "NestedXmlMapsRequest";
const _NXMWXNIO = "NestedXmlMapWithXmlNameInputOutput";
const _NXMWXNR = "NestedXmlMapWithXmlNameRequest";
const _Ne = "Nested";
const _PWCEI = "PutWithContentEncodingInput";
const _PWXN = "PayloadWithXmlNamespace";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3708,7 +3708,7 @@ it.skip("NestedXmlMapWithXmlNameSerializes:Request", async () => {

expect(r.body).toBeDefined();
const utf8Encoder = client.config.utf8Encoder;
const bodyString = ` <NestedXmlMapWithXmlNameInputOutput>
const bodyString = ` <NestedXmlMapWithXmlNameRequest>
<nestedXmlMapWithXmlNameMap>
<entry>
<OuterKey>foo</OuterKey>
Expand Down Expand Up @@ -3737,7 +3737,7 @@ it.skip("NestedXmlMapWithXmlNameSerializes:Request", async () => {
</value>
</entry>
</nestedXmlMapWithXmlNameMap>
</NestedXmlMapWithXmlNameInputOutput>
</NestedXmlMapWithXmlNameRequest>
`;
const unequalParts: any = compareEquivalentXmlBodies(bodyString, r.body.toString());
expect(unequalParts).toBeUndefined();
Expand All @@ -3756,7 +3756,7 @@ it("NestedXmlMapWithXmlNameDeserializes:Response", async () => {
{
"content-type": "application/xml",
},
` <NestedXmlMapWithXmlNameInputOutput>
` <NestedXmlMapWithXmlNameResponse>
<nestedXmlMapWithXmlNameMap>
<entry>
<OuterKey>foo</OuterKey>
Expand Down Expand Up @@ -3785,7 +3785,7 @@ it("NestedXmlMapWithXmlNameDeserializes:Response", async () => {
</value>
</entry>
</nestedXmlMapWithXmlNameMap>
</NestedXmlMapWithXmlNameInputOutput>
</NestedXmlMapWithXmlNameResponse>
`
),
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ it.skip("RpcV2CborClientPopulatesDefaultValuesInInput:Request", async () => {
expect(r.headers["smithy-protocol"]).toBe("rpc-v2-cbor");

expect(r.body).toBeDefined();
const bodyString = `v2hkZWZhdWx0c79tZGVmYXVsdFN0cmluZ2JoaW5kZWZhdWx0Qm9vbGVhbvVrZGVmYXVsdExpc3Sf/3BkZWZhdWx0VGltZXN0YW1wwQBrZGVmYXVsdEJsb2JDYWJja2RlZmF1bHRCeXRlAWxkZWZhdWx0U2hvcnQBbmRlZmF1bHRJbnRlZ2VyCmtkZWZhdWx0TG9uZxhkbGRlZmF1bHRGbG9hdPo/gAAAbWRlZmF1bHREb3VibGX6P4AAAGpkZWZhdWx0TWFwv/9rZGVmYXVsdEVudW1jRk9PbmRlZmF1bHRJbnRFbnVtAWtlbXB0eVN0cmluZ2BsZmFsc2VCb29sZWFu9GllbXB0eUJsb2JAaHplcm9CeXRlAGl6ZXJvU2hvcnQAa3plcm9JbnRlZ2VyAGh6ZXJvTG9uZwBpemVyb0Zsb2F0+gAAAABqemVyb0RvdWJsZfoAAAAA//8`;
const bodyString = `v2hkZWZhdWx0c79tZGVmYXVsdFN0cmluZ2JoaW5kZWZhdWx0Qm9vbGVhbvVrZGVmYXVsdExpc3Sf/3BkZWZhdWx0VGltZXN0YW1wwQBrZGVmYXVsdEJsb2JDYWJja2RlZmF1bHRCeXRlAWxkZWZhdWx0U2hvcnQBbmRlZmF1bHRJbnRlZ2VyCmtkZWZhdWx0TG9uZxhkbGRlZmF1bHRGbG9hdPo/gAAAbWRlZmF1bHREb3VibGX6P4AAAGpkZWZhdWx0TWFwv/9rZGVmYXVsdEVudW1jRk9PbmRlZmF1bHRJbnRFbnVtAWtlbXB0eVN0cmluZ2BsZmFsc2VCb29sZWFu9GllbXB0eUJsb2JAaHplcm9CeXRlAGl6ZXJvU2hvcnQAa3plcm9JbnRlZ2VyAGh6ZXJvTG9uZwBpemVyb0Zsb2F0+gAAAABqemVyb0RvdWJsZfoAAAAA//8=`;
const unequalParts: any = compareEquivalentCborBodies(bodyString, r.body);
expect(unequalParts).toBeUndefined();
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate-clients/config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Update this commit when taking up new changes from smithy-typescript.
module.exports = {
// Use full commit hash as we explicitly fetch it.
SMITHY_TS_COMMIT: "a821f249cd7e1c3e5926e97140494b7ef7fdda22",
SMITHY_TS_COMMIT: "b6ea624fe35457359cad061b908e980b455c9720",
};

if (module.exports.SMITHY_TS_COMMIT.length < 40) {
Expand Down