chore(codegen): update smithy-typescript commit (#5510)

* chore(codegen): revert 03d6230 This reverts commit 03d6230. * chore(codegen): update smithy-typescript commit * feat(experimentalIdentityAndAuth): update STS customizations * chore(codegen): generate clients
aws · Dec 13, 2023 · 7759481 · 7759481
1 parent 03d6230
commit 7759481
Show file tree

Hide file tree

Showing 24 changed files with 4,980 additions and 94 deletions.
diff --git a/clients/client-bedrock-agent-runtime/src/commands/InvokeAgentCommand.ts b/clients/client-bedrock-agent-runtime/src/commands/InvokeAgentCommand.ts
@@ -369,6 +369,12 @@ export class InvokeAgentCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "AmazonBedrockAgentRunTimeService",
         operation: "InvokeAgent",
+        /**
+         * @internal
+         */
+        eventStream: {
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-bedrock-runtime/src/commands/InvokeModelWithResponseStreamCommand.ts b/clients/client-bedrock-runtime/src/commands/InvokeModelWithResponseStreamCommand.ts
@@ -190,6 +190,12 @@ export class InvokeModelWithResponseStreamCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "AmazonBedrockFrontendService",
         operation: "InvokeModelWithResponseStream",
+        /**
+         * @internal
+         */
+        eventStream: {
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-cloudwatch-logs/src/commands/StartLiveTailCommand.ts b/clients/client-cloudwatch-logs/src/commands/StartLiveTailCommand.ts
@@ -212,6 +212,12 @@ export class StartLiveTailCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "Logs_20140328",
         operation: "StartLiveTail",
+        /**
+         * @internal
+         */
+        eventStream: {
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-codecatalyst/package.json b/clients/client-codecatalyst/package.json
@@ -32,7 +32,7 @@
     "@aws-sdk/util-user-agent-browser": "*",
     "@aws-sdk/util-user-agent-node": "*",
     "@smithy/config-resolver": "^2.0.21",
-    "@smithy/core": "^1.0.5",
+    "@smithy/core": "^1.1.0",
     "@smithy/fetch-http-handler": "^2.3.1",
     "@smithy/hash-node": "^2.0.17",
     "@smithy/invalid-dependency": "^2.0.15",

diff --git a/clients/client-kinesis/src/commands/SubscribeToShardCommand.ts b/clients/client-kinesis/src/commands/SubscribeToShardCommand.ts
@@ -221,6 +221,12 @@ export class SubscribeToShardCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "Kinesis_20131202",
         operation: "SubscribeToShard",
+        /**
+         * @internal
+         */
+        eventStream: {
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-lambda/src/commands/InvokeWithResponseStreamCommand.ts b/clients/client-lambda/src/commands/InvokeWithResponseStreamCommand.ts
@@ -250,6 +250,12 @@ export class InvokeWithResponseStreamCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "AWSGirApiService",
         operation: "InvokeWithResponseStream",
+        /**
+         * @internal
+         */
+        eventStream: {
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-lex-runtime-v2/src/commands/StartConversationCommand.ts b/clients/client-lex-runtime-v2/src/commands/StartConversationCommand.ts
@@ -523,6 +523,13 @@ export class StartConversationCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "AWSDeepSenseRunTimeServiceApi2_0",
         operation: "StartConversation",
+        /**
+         * @internal
+         */
+        eventStream: {
+          input: true,
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-rekognitionstreaming/src/commands/StartFaceLivenessSessionCommand.ts b/clients/client-rekognitionstreaming/src/commands/StartFaceLivenessSessionCommand.ts
@@ -280,6 +280,13 @@ export class StartFaceLivenessSessionCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "RekognitionStreamingService",
         operation: "StartFaceLivenessSession",
+        /**
+         * @internal
+         */
+        eventStream: {
+          input: true,
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-s3/src/commands/SelectObjectContentCommand.ts b/clients/client-s3/src/commands/SelectObjectContentCommand.ts
@@ -311,6 +311,12 @@ export class SelectObjectContentCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "AmazonS3",
         operation: "SelectObjectContent",
+        /**
+         * @internal
+         */
+        eventStream: {
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-sagemaker-runtime/src/commands/InvokeEndpointWithResponseStreamCommand.ts b/clients/client-sagemaker-runtime/src/commands/InvokeEndpointWithResponseStreamCommand.ts
@@ -209,6 +209,12 @@ export class InvokeEndpointWithResponseStreamCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "AmazonSageMakerRuntime",
         operation: "InvokeEndpointWithResponseStream",
+        /**
+         * @internal
+         */
+        eventStream: {
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-sts/src/defaultStsRoleAssumers.ts b/clients/client-sts/src/defaultStsRoleAssumers.ts
@@ -122,7 +122,10 @@ export const decorateDefaultCredentialProvider =
   (provider: DefaultCredentialProvider): DefaultCredentialProvider =>
   (input: STSClientResolvedConfig) =>
     provider({
-      roleAssumer: getDefaultRoleAssumer(input, input.stsClientCtor),
-      roleAssumerWithWebIdentity: getDefaultRoleAssumerWithWebIdentity(input, input.stsClientCtor),
+      roleAssumer: getDefaultRoleAssumer(input, input.stsClientCtor as new (options: STSClientConfig) => STSClient),
+      roleAssumerWithWebIdentity: getDefaultRoleAssumerWithWebIdentity(
+        input,
+        input.stsClientCtor as new (options: STSClientConfig) => STSClient
+      ),
       ...input,
     });
diff --git a/.../client-transcribe-streaming/src/commands/StartCallAnalyticsStreamTranscriptionCommand.ts b/.../client-transcribe-streaming/src/commands/StartCallAnalyticsStreamTranscriptionCommand.ts
@@ -288,6 +288,13 @@ export class StartCallAnalyticsStreamTranscriptionCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "Transcribe",
         operation: "StartCallAnalyticsStreamTranscription",
+        /**
+         * @internal
+         */
+        eventStream: {
+          input: true,
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-transcribe-streaming/src/commands/StartMedicalStreamTranscriptionCommand.ts b/clients/client-transcribe-streaming/src/commands/StartMedicalStreamTranscriptionCommand.ts
@@ -269,6 +269,13 @@ export class StartMedicalStreamTranscriptionCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "Transcribe",
         operation: "StartMedicalStreamTranscription",
+        /**
+         * @internal
+         */
+        eventStream: {
+          input: true,
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/clients/client-transcribe-streaming/src/commands/StartStreamTranscriptionCommand.ts b/clients/client-transcribe-streaming/src/commands/StartStreamTranscriptionCommand.ts
@@ -293,6 +293,13 @@ export class StartStreamTranscriptionCommand extends $Command<
       [SMITHY_CONTEXT_KEY]: {
         service: "Transcribe",
         operation: "StartStreamTranscription",
+        /**
+         * @internal
+         */
+        eventStream: {
+          input: true,
+          output: true,
+        },
       },
     };
     const { requestHandler } = configuration;

diff --git a/codegen/generic-client-test-codegen/build.gradle.kts b/codegen/generic-client-test-codegen/build.gradle.kts
@@ -37,7 +37,6 @@ plugins {
 dependencies {
     implementation("software.amazon.smithy:smithy-aws-protocol-tests:$smithyVersion")
     implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
-    implementation("software.amazon.smithy:smithy-rules-engine:$smithyVersion")
     implementation(project(":smithy-aws-typescript-codegen"))
 }
 

diff --git a/codegen/generic-client-test-codegen/model/weather.smithy b/codegen/generic-client-test-codegen/model/weather.smithy
@@ -3,7 +3,6 @@ $version: "2.0"
 namespace example.weather
 
 use aws.auth#sigv4
-use aws.api#service
 
 @authDefinition
 @trait
@@ -13,7 +12,6 @@ structure customAuth {}
 @protocolDefinition
 structure fakeProtocol {}
 
-@service(sdkId: "weather")
 @fakeProtocol
 @httpApiKeyAuth(name: "X-Api-Key", in: "header")
 @httpBearerAuth
@@ -88,30 +86,3 @@ operation SameAsService {
     service: String
   }
 }
-
-apply Weather @smithy.rules#endpointRuleSet({
-  "version": "1.3",
-  "parameters": {
-    "Region": {
-      "required": true,
-      "type": "String",
-      "documentation": "docs"
-    }
-  },
-  "rules": [
-    {
-      "conditions": [],
-      "documentation": "base rule",
-      "endpoint": {
-        "url": "https://{Region}.amazonaws.com",
-        "properties": {},
-        "headers": {}
-      },
-      "type": "endpoint"
-    }
-  ]
-})
-
-apply Weather @smithy.rules#clientContextParams(
-  Region: {type: "string", documentation: "docs"}
-)
diff --git a/.../amazon/smithy/aws/typescript/codegen/auth/http/integration/AddSTSAuthCustomizations.java b/.../amazon/smithy/aws/typescript/codegen/auth/http/integration/AddSTSAuthCustomizations.java
@@ -27,6 +27,7 @@
 import software.amazon.smithy.typescript.codegen.CodegenUtils;
 import software.amazon.smithy.typescript.codegen.LanguageTarget;
 import software.amazon.smithy.typescript.codegen.TypeScriptCodegenContext;
+import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
 import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
 import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
 import software.amazon.smithy.typescript.codegen.auth.AuthUtils;
@@ -78,27 +79,6 @@ public List<String> runAfter() {
             AwsSdkCustomizeSigV4Auth.class.getCanonicalName());
     }
 
-    // @Override
-    // public List<RuntimeClientPlugin> getClientPlugins() {
-    //     return ListUtils.of(
-    //         RuntimeClientPlugin.builder()
-    //             .inputConfig(Symbol.builder()
-    //                     .namespace(AuthUtils.HTTP_AUTH_SCHEME_PROVIDER_MODULE, "/")
-    //                     .name("StsAuthInputConfig")
-    //                     .build())
-    //             .resolvedConfig(Symbol.builder()
-    //                     .namespace(AuthUtils.HTTP_AUTH_SCHEME_PROVIDER_MODULE, "/")
-    //                     .name("StsAuthResolvedConfig")
-    //                     .build())
-    //             .resolveFunction(Symbol.builder()
-    //                     .namespace(AuthUtils.HTTP_AUTH_SCHEME_PROVIDER_MODULE, "/")
-    //                     .name("resolveStsAuthConfig")
-    //                     .build())
-    //             .servicePredicate((m, s) -> isSTSService(s.toShapeId()))
-    //             .build()
-    //     );
-    // }
-
     @Override
     public Model preprocessModel(Model model, TypeScriptSettings settings) {
         return backfillOptionalAuthOperations(model, settings);
@@ -208,12 +188,13 @@ public void customize(TypeScriptCodegenContext codegenContext) {
             w.addRelativeImport(serviceSymbol.getName() + "Config", null,
                 Paths.get(".", serviceSymbol.getNamespace()));
             w.write("export interface StsAuthInputConfig {}\n");
-            w.openBlock("export interface StsAuthResolvedConfig {", "}\n", () -> {
-                w.writeDocs("""
+            w.openBlock("export interface StsAuthResolvedConfig {", "}\n", () -> w
+                .writeDocs("""
                     Reference to STSClient class constructor.
                     @internal""")
-                    .write("stsClientCtor: new (config: STSClientConfig) => STSClient");
-            });
+                .addDependency(TypeScriptDependency.SMITHY_TYPES)
+                .addImport("Client", null, TypeScriptDependency.SMITHY_TYPES)
+                .write("stsClientCtor: new (clientConfig: any) => Client<any, any, any>;"));
             w.openBlock("""
                 export const resolveStsAuthConfig = <T>(
                   input: T & StsAuthInputConfig

diff --git a/...ources/software/amazon/smithy/aws/typescript/codegen/sts-client-defaultStsRoleAssumers.ts b/...ources/software/amazon/smithy/aws/typescript/codegen/sts-client-defaultStsRoleAssumers.ts
@@ -119,7 +119,7 @@ export const decorateDefaultCredentialProvider =
   (provider: DefaultCredentialProvider): DefaultCredentialProvider =>
   (input: STSClientResolvedConfig) =>
     provider({
-      roleAssumer: getDefaultRoleAssumer(input, input.stsClientCtor),
-      roleAssumerWithWebIdentity: getDefaultRoleAssumerWithWebIdentity(input, input.stsClientCtor),
+      roleAssumer: getDefaultRoleAssumer(input, input.stsClientCtor as new (options: STSClientConfig) => STSClient),
+      roleAssumerWithWebIdentity: getDefaultRoleAssumerWithWebIdentity(input, input.stsClientCtor as new (options: STSClientConfig) => STSClient),
       ...input,
     });