diff --git a/codegen/gradle.properties b/codegen/gradle.properties index 0422f66f9238..f316154569c5 100644 --- a/codegen/gradle.properties +++ b/codegen/gradle.properties @@ -1,3 +1,3 @@ -smithyVersion=1.54.0 +smithyVersion=1.55.0 smithyGradleVersion=1.2.0 smithyPluginVersion=0.6.0 \ No newline at end of file diff --git a/private/aws-protocoltests-ec2/src/endpoints.ts b/private/aws-protocoltests-ec2/src/endpoints.ts index b77679b30ba7..b5af561284d4 100644 --- a/private/aws-protocoltests-ec2/src/endpoints.ts +++ b/private/aws-protocoltests-ec2/src/endpoints.ts @@ -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+$", diff --git a/private/aws-protocoltests-json-10/src/endpoints.ts b/private/aws-protocoltests-json-10/src/endpoints.ts index 7a16a9162023..46e2b8492809 100644 --- a/private/aws-protocoltests-json-10/src/endpoints.ts +++ b/private/aws-protocoltests-json-10/src/endpoints.ts @@ -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+$", diff --git a/private/aws-protocoltests-json-machinelearning/src/endpoints.ts b/private/aws-protocoltests-json-machinelearning/src/endpoints.ts index 96d9fbabbf43..5ff0607a6030 100644 --- a/private/aws-protocoltests-json-machinelearning/src/endpoints.ts +++ b/private/aws-protocoltests-json-machinelearning/src/endpoints.ts @@ -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+$", diff --git a/private/aws-protocoltests-json/src/endpoints.ts b/private/aws-protocoltests-json/src/endpoints.ts index 2d71653befd8..5fa64d7d6289 100644 --- a/private/aws-protocoltests-json/src/endpoints.ts +++ b/private/aws-protocoltests-json/src/endpoints.ts @@ -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+$", diff --git a/private/aws-protocoltests-query/src/endpoints.ts b/private/aws-protocoltests-query/src/endpoints.ts index 562fba345113..0706764bb3c2 100644 --- a/private/aws-protocoltests-query/src/endpoints.ts +++ b/private/aws-protocoltests-query/src/endpoints.ts @@ -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+$", diff --git a/private/aws-protocoltests-restjson-apigateway/src/endpoints.ts b/private/aws-protocoltests-restjson-apigateway/src/endpoints.ts index a7a2d092371e..c2ddc43965b8 100644 --- a/private/aws-protocoltests-restjson-apigateway/src/endpoints.ts +++ b/private/aws-protocoltests-restjson-apigateway/src/endpoints.ts @@ -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+$", diff --git a/private/aws-protocoltests-restjson-glacier/src/endpoints.ts b/private/aws-protocoltests-restjson-glacier/src/endpoints.ts index 7931965f4ae5..05ca40b060be 100644 --- a/private/aws-protocoltests-restjson-glacier/src/endpoints.ts +++ b/private/aws-protocoltests-restjson-glacier/src/endpoints.ts @@ -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: [ { @@ -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: [ { @@ -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: [ { diff --git a/private/aws-protocoltests-restjson/src/endpoints.ts b/private/aws-protocoltests-restjson/src/endpoints.ts index 2fd7b322575e..c5c208a77b23 100644 --- a/private/aws-protocoltests-restjson/src/endpoints.ts +++ b/private/aws-protocoltests-restjson/src/endpoints.ts @@ -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+$", diff --git a/private/aws-protocoltests-restxml/src/commands/NestedXmlMapWithXmlNameCommand.ts b/private/aws-protocoltests-restxml/src/commands/NestedXmlMapWithXmlNameCommand.ts index 7d1003d621a0..fa7cc24106f2 100644 --- a/private/aws-protocoltests-restxml/src/commands/NestedXmlMapWithXmlNameCommand.ts +++ b/private/aws-protocoltests-restxml/src/commands/NestedXmlMapWithXmlNameCommand.ts @@ -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"; @@ -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 @@ -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 * "": { // NestedXmlMapWithXmlNameInnerMap * "": "STRING_VALUE", @@ -42,7 +42,7 @@ export interface NestedXmlMapWithXmlNameCommandOutput extends NestedXmlMapWithXm * }; * const command = new NestedXmlMapWithXmlNameCommand(input); * const response = await client.send(command); - * // { // NestedXmlMapWithXmlNameInputOutput + * // { // NestedXmlMapWithXmlNameResponse * // nestedXmlMapWithXmlNameMap: { // NestedXmlMapWithXmlNameMap * // "": { // NestedXmlMapWithXmlNameInnerMap * // "": "STRING_VALUE", @@ -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; diff --git a/private/aws-protocoltests-restxml/src/endpoints.ts b/private/aws-protocoltests-restxml/src/endpoints.ts index 8bd1cdb98342..e58a61929577 100644 --- a/private/aws-protocoltests-restxml/src/endpoints.ts +++ b/private/aws-protocoltests-restxml/src/endpoints.ts @@ -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+$", diff --git a/private/aws-protocoltests-restxml/src/models/models_0.ts b/private/aws-protocoltests-restxml/src/models/models_0.ts index 0b6f388ac42b..7a9af185f37e 100644 --- a/private/aws-protocoltests-restxml/src/models/models_0.ts +++ b/private/aws-protocoltests-restxml/src/models/models_0.ts @@ -489,7 +489,14 @@ export interface NestedXmlMapsResponse { /** * @public */ -export interface NestedXmlMapWithXmlNameInputOutput { +export interface NestedXmlMapWithXmlNameRequest { + nestedXmlMapWithXmlNameMap?: Record> | undefined; +} + +/** + * @public + */ +export interface NestedXmlMapWithXmlNameResponse { nestedXmlMapWithXmlNameMap?: Record> | undefined; } diff --git a/private/aws-protocoltests-restxml/src/protocols/Aws_restXml.ts b/private/aws-protocoltests-restxml/src/protocols/Aws_restXml.ts index 0ab8be2c4b5a..c59c1d375682 100644 --- a/private/aws-protocoltests-restxml/src/protocols/Aws_restXml.ts +++ b/private/aws-protocoltests-restxml/src/protocols/Aws_restXml.ts @@ -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) ); @@ -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"; diff --git a/private/aws-protocoltests-restxml/test/functional/restxml.spec.ts b/private/aws-protocoltests-restxml/test/functional/restxml.spec.ts index 36563b3c4dd4..9f7c72291c66 100644 --- a/private/aws-protocoltests-restxml/test/functional/restxml.spec.ts +++ b/private/aws-protocoltests-restxml/test/functional/restxml.spec.ts @@ -3708,7 +3708,7 @@ it.skip("NestedXmlMapWithXmlNameSerializes:Request", async () => { expect(r.body).toBeDefined(); const utf8Encoder = client.config.utf8Encoder; - const bodyString = ` + const bodyString = ` foo @@ -3737,7 +3737,7 @@ it.skip("NestedXmlMapWithXmlNameSerializes:Request", async () => { - + `; const unequalParts: any = compareEquivalentXmlBodies(bodyString, r.body.toString()); expect(unequalParts).toBeUndefined(); @@ -3756,7 +3756,7 @@ it("NestedXmlMapWithXmlNameDeserializes:Response", async () => { { "content-type": "application/xml", }, - ` + ` foo @@ -3785,7 +3785,7 @@ it("NestedXmlMapWithXmlNameDeserializes:Response", async () => { - + ` ), }); diff --git a/private/aws-protocoltests-smithy-rpcv2-cbor/test/functional/rpcv2cbor.spec.ts b/private/aws-protocoltests-smithy-rpcv2-cbor/test/functional/rpcv2cbor.spec.ts index 7e02faefe4dc..1cbe7c6b89b2 100644 --- a/private/aws-protocoltests-smithy-rpcv2-cbor/test/functional/rpcv2cbor.spec.ts +++ b/private/aws-protocoltests-smithy-rpcv2-cbor/test/functional/rpcv2cbor.spec.ts @@ -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(); } diff --git a/scripts/generate-clients/config.js b/scripts/generate-clients/config.js index 523f117b24cf..ab09e42a5cf0 100644 --- a/scripts/generate-clients/config.js +++ b/scripts/generate-clients/config.js @@ -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) {