fix: config resolver ordering

Author: kuhe

clients/client-s3-control/src/S3ControlClient.ts

@@ -758,8 +758,8 @@ export type S3ControlClientConfigType = Partial<__SmithyConfiguration<__HttpHand
   RetryInputConfig &
   RegionInputConfig &
   HostHeaderInputConfig &
-  S3ControlInputConfig &
   EndpointInputConfig<EndpointParameters> &
+  S3ControlInputConfig &
   HttpAuthSchemeInputConfig &
   ClientInputEndpointParameters;
 /**
@@ -779,8 +779,8 @@ export type S3ControlClientResolvedConfigType = __SmithyResolvedConfiguration<__
   RetryResolvedConfig &
   RegionResolvedConfig &
   HostHeaderResolvedConfig &
-  S3ControlResolvedConfig &
   EndpointResolvedConfig<EndpointParameters> &
+  S3ControlResolvedConfig &
   HttpAuthSchemeResolvedConfig &
   ClientResolvedEndpointParameters;
 /**
@@ -814,8 +814,8 @@ export class S3ControlClient extends __Client<
     const _config_3 = resolveRetryConfig(_config_2);
     const _config_4 = resolveRegionConfig(_config_3);
     const _config_5 = resolveHostHeaderConfig(_config_4);
-    const _config_6 = resolveS3ControlConfig(_config_5);
-    const _config_7 = resolveEndpointConfig(_config_6);
+    const _config_6 = resolveEndpointConfig(_config_5);
+    const _config_7 = resolveS3ControlConfig(_config_6);
     const _config_8 = resolveHttpAuthSchemeConfig(_config_7);
     const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []);
     this.config = _config_9;

clients/client-s3-control/src/models/models_1.ts

@@ -19,7 +19,6 @@ import {
   StorageLensTag,
   Tag,
 } from "./models_0";
-
 import { S3ControlServiceException as __BaseException } from "./S3ControlServiceException";
 
 /**

clients/client-sqs/src/SQSClient.ts

@@ -335,8 +335,8 @@ export type SQSClientConfigType = Partial<__SmithyConfiguration<__HttpHandlerOpt
   RetryInputConfig &
   RegionInputConfig &
   HostHeaderInputConfig &
-  QueueUrlInputConfig &
   EndpointInputConfig<EndpointParameters> &
+  QueueUrlInputConfig &
   HttpAuthSchemeInputConfig &
   ClientInputEndpointParameters;
 /**
@@ -356,8 +356,8 @@ export type SQSClientResolvedConfigType = __SmithyResolvedConfiguration<__HttpHa
   RetryResolvedConfig &
   RegionResolvedConfig &
   HostHeaderResolvedConfig &
-  QueueUrlResolvedConfig &
   EndpointResolvedConfig<EndpointParameters> &
+  QueueUrlResolvedConfig &
   HttpAuthSchemeResolvedConfig &
   ClientResolvedEndpointParameters;
 /**
@@ -462,8 +462,8 @@ export class SQSClient extends __Client<
     const _config_3 = resolveRetryConfig(_config_2);
     const _config_4 = resolveRegionConfig(_config_3);
     const _config_5 = resolveHostHeaderConfig(_config_4);
-    const _config_6 = resolveQueueUrlConfig(_config_5);
-    const _config_7 = resolveEndpointConfig(_config_6);
+    const _config_6 = resolveEndpointConfig(_config_5);
+    const _config_7 = resolveQueueUrlConfig(_config_6);
     const _config_8 = resolveHttpAuthSchemeConfig(_config_7);
     const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []);
     this.config = _config_9;

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

@@ -37,6 +37,7 @@
 import software.amazon.smithy.typescript.codegen.LanguageTarget;
 import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
 import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
+import software.amazon.smithy.typescript.codegen.endpointsV2.AddDefaultEndpointRuleSet;
 import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;
 import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
 import software.amazon.smithy.utils.ListUtils;
@@ -52,7 +53,8 @@ public class AddS3ControlDependency implements TypeScriptIntegration {
     @Override
     public List<String> runAfter() {
         return List.of(
-            AddBuiltinPlugins.class.getCanonicalName()
+            AddBuiltinPlugins.class.getCanonicalName(),
+            AddDefaultEndpointRuleSet.class.getCanonicalName()
         );
     }
 

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

@@ -30,6 +30,7 @@
 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.endpointsV2.AddDefaultEndpointRuleSet;
 import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;
 import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
 import software.amazon.smithy.utils.ListUtils;
@@ -45,7 +46,8 @@ public class AddSqsDependency implements TypeScriptIntegration {
     @Override
     public List<String> runAfter() {
         return List.of(
-            AddBuiltinPlugins.class.getCanonicalName()
+            AddBuiltinPlugins.class.getCanonicalName(),
+            AddDefaultEndpointRuleSet.class.getCanonicalName()
         );
     }