Release 2026-06-22: merge develop into main

Author: aws-sdk-python-automation

.github/workflows/check-license.yml

@@ -14,10 +14,10 @@ jobs:
     name: Check License Header
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
         with:
           persist-credentials: false
 
-      - uses: apache/skywalking-eyes/header@e910f72bae86171d727742c25f8a4555b7b83893
+      - uses: apache/skywalking-eyes/header@ab3d1fe50d23f9c82eff489297167e2dde8ba6cb
         with:
           mode: check 

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
         with:
           persist-credentials: false
 
@@ -32,10 +32,10 @@ jobs:
           distribution: 'corretto'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e
+        uses: gradle/actions/setup-gradle@5e2ebd065dc2488b7a6ad670704656cbbe1e8f60
 
       - name: Install uv and set the Python version
-        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39
         with:
           python-version: ${{ matrix.python-version }}
           activate-environment: true

.github/workflows/update-gradle-wrapper.yml

@@ -19,7 +19,7 @@ jobs:
         pull-requests: write
 
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
         with:
           persist-credentials: false
 

.github/workflows/zizmor.yml

@@ -15,9 +15,9 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3
+        uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6

codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsAuthIntegration.java

@@ -7,7 +7,6 @@
 import static software.amazon.smithy.python.aws.codegen.AwsConfiguration.REGION;
 
 import java.util.List;
-import java.util.Set;
 import software.amazon.smithy.aws.traits.auth.SigV4Trait;
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.model.shapes.ServiceShape;
@@ -16,6 +15,7 @@
 import software.amazon.smithy.python.codegen.CodegenUtils;
 import software.amazon.smithy.python.codegen.ConfigProperty;
 import software.amazon.smithy.python.codegen.GenerationContext;
+import software.amazon.smithy.python.codegen.RuntimeTypes;
 import software.amazon.smithy.python.codegen.SmithyPythonDependency;
 import software.amazon.smithy.python.codegen.integrations.AuthScheme;
 import software.amazon.smithy.python.codegen.integrations.PythonIntegration;
@@ -98,20 +98,21 @@ public void customize(GenerationContext context) {
         // must be accounted for.
         context.writerDelegator().useFileWriter(resolver.getDefinitionFile(), resolver.getNamespace(), writer -> {
             writer.addDependency(SmithyPythonDependency.SMITHY_HTTP);
-            writer.addImport("smithy_core.interfaces.auth", "AuthOption", "AuthOptionProtocol");
-            writer.addImports("smithy_core.auth", Set.of("AuthOption", "AuthParams"));
-            writer.addImport("smithy_core.shapes", "ShapeID");
             writer.pushState();
 
             writer.write("""
-                    def $1L(auth_params: AuthParams[Any, Any]) -> AuthOptionProtocol | None:
-                        return AuthOption(
-                            scheme_id=ShapeID($2S),
+                    def $1L(auth_params: $2T[Any, Any]) -> $3T | None:
+                        return $4T(
+                            scheme_id=$5T($6S),
                             identity_properties={},  # type: ignore
                             signer_properties={}  # type: ignore
                         )
                     """,
                     SIGV4_OPTION_GENERATOR_NAME,
+                    RuntimeTypes.AUTH_PARAMS,
+                    RuntimeTypes.AUTH_OPTION_INTERFACE,
+                    RuntimeTypes.AUTH_OPTION,
+                    RuntimeTypes.SHAPE_ID,
                     SigV4Trait.ID.toString());
             writer.popState();
         });

codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsPythonDependency.java

@@ -22,7 +22,7 @@ private AwsPythonDependency() {}
      */
     public static final PythonDependency SMITHY_AWS_CORE = new PythonDependency(
             "smithy_aws_core",
-            "~=0.6.0",
+            "~=0.7.0",
             PythonDependency.Type.DEPENDENCY,
             false);
 }

codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsQueryProtocolGenerator.java

@@ -47,12 +47,11 @@ public ApplicationProtocol getApplicationProtocol(GenerationContext context) {
     @Override
     public void initializeProtocol(GenerationContext context, PythonWriter writer) {
         writer.addDependency(AwsPythonDependency.SMITHY_AWS_CORE.withOptionalDependencies("xml"));
-        writer.addImport("smithy_aws_core.aio.protocols", "AwsQueryClientProtocol");
         var service = context.settings().service(context.model());
         var serviceSymbol = context.symbolProvider().toSymbol(service);
         var serviceSchema = serviceSymbol.expectProperty(SymbolProperties.SCHEMA);
         var version = service.getVersion();
-        writer.write("AwsQueryClientProtocol($T, $S)", serviceSchema, version);
+        writer.write("$1T($2T, $3S)", AwsRuntimeTypes.AWS_QUERY_CLIENT_PROTOCOL, serviceSchema, version);
     }
 
     @Override

codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsRuntimeTypes.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package software.amazon.smithy.python.aws.codegen;
+
+import software.amazon.smithy.codegen.core.Symbol;
+import software.amazon.smithy.utils.SmithyUnstableApi;
+
+/**
+ * Pre-defined Symbol constants for AWS-specific framework types used across generators.
+ *
+ * <p>Using these symbols with the {@code $T} formatter ensures that all framework type
+ * references participate in the writer's collision detection system.
+ */
+@SmithyUnstableApi
+public final class AwsRuntimeTypes {
+
+    // smithy_aws_core.aio.protocols
+    public static final Symbol AWS_QUERY_CLIENT_PROTOCOL = createSymbol(
+            "aio.protocols",
+            "AwsQueryClientProtocol");
+
+    // smithy_aws_core.endpoints.standard_regional
+    public static final Symbol STANDARD_REGIONAL_ENDPOINTS_RESOLVER = createSymbol(
+            "endpoints.standard_regional",
+            "StandardRegionalEndpointsResolver");
+
+    private AwsRuntimeTypes() {}
+
+    private static Symbol createSymbol(String module, String name) {
+        var namespace = module.isEmpty() ? "smithy_aws_core" : "smithy_aws_core." + module;
+        return Symbol.builder()
+                .name(name)
+                .namespace(namespace, ".")
+                .addDependency(AwsPythonDependency.SMITHY_AWS_CORE)
+                .build();
+    }
+}

codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsStandardRegionalEndpointsIntegration.java

@@ -59,11 +59,9 @@ public void write(PythonWriter writer, String previousText, InitDefaultEndpointR
                     .map(ServiceTrait::getEndpointPrefix)
                     .orElse(context.settings().service().getName());
 
-            writer.addImport("smithy_aws_core.endpoints.standard_regional",
-                    "StandardRegionalEndpointsResolver",
-                    "_RegionalResolver");
             writer.write(
-                    "self.endpoint_resolver = endpoint_resolver or _RegionalResolver(endpoint_prefix=$S)",
+                    "self.endpoint_resolver = endpoint_resolver or $1T(endpoint_prefix=$2S)",
+                    AwsRuntimeTypes.STANDARD_REGIONAL_ENDPOINTS_RESOLVER,
                     endpointPrefix);
 
         }

codegen/build.gradle.kts

@@ -15,5 +15,5 @@
 
 allprojects {
     group = "software.amazon.smithy.python"
-    version = "0.3.0"
+    version = "0.3.1"
 }