Release 2026-04-07: merge develop into main

Author: aws-sdk-python-automation

.github/dependabot.yml

@@ -10,6 +10,8 @@ updates:
         update-types:
           - "minor"
           - "patch"
+    cooldown:
+      default-days: 7
   - package-ecosystem: "gradle"
     directory: "/codegen"
     schedule:
@@ -20,6 +22,8 @@ updates:
         update-types:
           - "minor"
           - "patch"
+    cooldown:
+      default-days: 7
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
@@ -30,3 +34,5 @@ updates:
         update-types:
           - "minor"
           - "patch"
+    cooldown:
+      default-days: 7

.github/workflows/check-license.yml

@@ -18,6 +18,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: apache/skywalking-eyes/header@7a3b6cc34c5980cede4407ffa06fe553a999245d
+      - uses: apache/skywalking-eyes/header@6ac35584d6f923b6cb62f1ae8682c5bc60b537e4
         with:
           mode: check 

.github/workflows/ci.yml

@@ -31,10 +31,10 @@ jobs:
           distribution: 'corretto'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884
+        uses: gradle/actions/setup-gradle@39e147cb9de83bb9910b8ef8bd7fff0ee20fcd6f
 
       - name: Install uv and set the Python version
-        uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b
+        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57
         with:
           python-version: ${{ matrix.python-version }}
           activate-environment: true

.github/workflows/zizmor.yml

@@ -0,0 +1,23 @@
+name: GitHub Actions Security Analysis with zizmor 🌈
+
+on:
+  push:
+    branches: ["develop"]
+  pull_request:
+    branches: ["develop"]
+
+permissions: {}
+
+jobs:
+  zizmor:
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Run zizmor 🌈
+        uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2

Makefile

@@ -14,10 +14,12 @@ build-java: ## Builds the Java code generation packages.
 	cd codegen && ./gradlew clean build
 
 
-test-protocols: ## Generates and runs the restJson1 protocol tests.
-	cd codegen && ./gradlew :protocol-test:build
-	uv pip install codegen/protocol-test/build/smithyprojections/protocol-test/rest-json-1/python-client-codegen
-	uv run pytest codegen/protocol-test/build/smithyprojections/protocol-test/rest-json-1/python-client-codegen
+test-protocols: ## Generates and runs protocol tests for all supported protocols.
+	cd codegen && ./gradlew :protocol-test:clean :protocol-test:build
+	@set -e; for projection_dir in codegen/protocol-test/build/smithyprojections/protocol-test/*/python-client-codegen; do \
+		uv pip install "$$projection_dir"; \
+		uv run pytest "$$projection_dir"; \
+	done
 
 
 lint-py: ## Runs linters and formatters on the python packages.

codegen/aws/core/build.gradle.kts

@@ -12,4 +12,5 @@ extra["moduleName"] = "software.amazon.smithy.python.aws.codegen"
 dependencies {
     implementation(project(":core"))
     implementation(libs.smithy.aws.traits)
+    implementation(libs.smithy.protocol.test.traits)
 }

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

@@ -16,6 +16,6 @@
 public class AwsProtocolsIntegration implements PythonIntegration {
     @Override
     public List<ProtocolGenerator> getProtocolGenerators() {
-        return List.of();
+        return List.of(new AwsQueryProtocolGenerator());
     }
 }

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.4.0",
+            "~=0.5.0",
             PythonDependency.Type.DEPENDENCY,
             false);
 }

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

@@ -0,0 +1,69 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package software.amazon.smithy.python.aws.codegen;
+
+import java.util.Set;
+import software.amazon.smithy.aws.traits.protocols.AwsQueryTrait;
+import software.amazon.smithy.model.shapes.ShapeId;
+import software.amazon.smithy.python.codegen.ApplicationProtocol;
+import software.amazon.smithy.python.codegen.GenerationContext;
+import software.amazon.smithy.python.codegen.HttpProtocolTestGenerator;
+import software.amazon.smithy.python.codegen.SymbolProperties;
+import software.amazon.smithy.python.codegen.generators.ProtocolGenerator;
+import software.amazon.smithy.python.codegen.writer.PythonWriter;
+import software.amazon.smithy.utils.SmithyInternalApi;
+
+@SmithyInternalApi
+public final class AwsQueryProtocolGenerator implements ProtocolGenerator {
+    private static final Set<String> TESTS_TO_SKIP = Set.of(
+            // TODO: support the request compression trait
+            // https://smithy.io/2.0/spec/behavior-traits.html#smithy-api-requestcompression-trait
+            "SDKAppliedContentEncoding_awsQuery",
+            "SDKAppendsGzipAndIgnoresHttpProvidedEncoding_awsQuery",
+
+            // TODO: support idempotency token autofill
+            "QueryProtocolIdempotencyTokenAutoFill",
+
+            // This test asserts nan == nan, which is never true.
+            // We should update the generator to make specific assertions for these.
+            "AwsQuerySupportsNaNFloatOutputs",
+
+            // TODO: support of the endpoint trait
+            "AwsQueryEndpointTraitWithHostLabel",
+            "AwsQueryEndpointTrait");
+
+    @Override
+    public ShapeId getProtocol() {
+        return AwsQueryTrait.ID;
+    }
+
+    @Override
+    public ApplicationProtocol getApplicationProtocol(GenerationContext context) {
+        return ApplicationProtocol.createDefaultHttpApplicationProtocol();
+    }
+
+    @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);
+    }
+
+    @Override
+    public void generateProtocolTests(GenerationContext context) {
+        context.writerDelegator()
+                .useFileWriter("./tests/test_awsquery_protocol.py", "tests.test_awsquery_protocol", writer -> {
+                    new HttpProtocolTestGenerator(
+                            context,
+                            getProtocol(),
+                            writer,
+                            (shape, testCase) -> TESTS_TO_SKIP.contains(testCase.getId())).run();
+                });
+    }
+}

codegen/core/src/main/java/software/amazon/smithy/python/codegen/HttpProtocolTestGenerator.java

@@ -16,6 +16,7 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import software.amazon.smithy.aws.traits.auth.SigV4Trait;
 import software.amazon.smithy.codegen.core.CodegenException;
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.model.Model;
@@ -188,12 +189,14 @@ private void generateRequestTest(OperationShape operation, HttpRequestTestCase t
                                     endpoint_uri="https://$L/$L",
                                     transport = $T(),
                                     retry_strategy=SimpleRetryStrategy(max_attempts=1),
+                                    ${C|}
                                 )
                                 """,
                                 CodegenUtils.getConfigSymbol(context.settings()),
                                 host,
                                 path,
-                                REQUEST_TEST_ASYNC_HTTP_CLIENT_SYMBOL);
+                                REQUEST_TEST_ASYNC_HTTP_CLIENT_SYMBOL,
+                                (Runnable) this::writeSigV4TestConfig);
                     }));
 
                     // Generate the input using the expected shape and params
@@ -418,6 +421,16 @@ private void compareMediaBlob(HttpMessageTestCase testCase, PythonWriter writer)
                     """);
             return;
         }
+        if (contentType.equals("application/x-www-form-urlencoded")) {
+            writer.addStdlibImport("urllib.parse", "parse_qsl");
+            writer.write("""
+                    actual_params = sorted(parse_qsl(actual_body_content.decode(), keep_blank_values=True))
+                    expected_params = sorted(parse_qsl(expected_body_content.decode(), keep_blank_values=True))
+                    assert actual_params == expected_params
+
+                    """);
+            return;
+        }
         writer.write("assert actual_body_content == expected_body_content\n");
     }
 
@@ -437,13 +450,15 @@ private void generateResponseTest(OperationShape operation, HttpResponseTestCase
                                         headers=$J,
                                         body=b$S,
                                     ),
+                                    ${C|}
                                 )
                                 """,
                                 CodegenUtils.getConfigSymbol(context.settings()),
                                 RESPONSE_TEST_ASYNC_HTTP_CLIENT_SYMBOL,
                                 testCase.getCode(),
                                 CodegenUtils.toTuples(testCase.getHeaders()),
-                                testCase.getBody().filter(body -> !body.isEmpty()).orElse(""));
+                                testCase.getBody().filter(body -> !body.isEmpty()).orElse(""),
+                                (Runnable) this::writeSigV4TestConfig);
                     }));
                     // Create an empty input object to pass
                     var inputShape = model.expectShape(operation.getInputShape(), StructureShape.class);
@@ -490,13 +505,15 @@ private void generateErrorResponseTest(
                                         headers=$J,
                                         body=b$S,
                                     ),
+                                    ${C|}
                                 )
                                 """,
                                 CodegenUtils.getConfigSymbol(context.settings()),
                                 RESPONSE_TEST_ASYNC_HTTP_CLIENT_SYMBOL,
                                 testCase.getCode(),
                                 CodegenUtils.toTuples(testCase.getHeaders()),
-                                testCase.getBody().orElse(""));
+                                testCase.getBody().orElse(""),
+                                (Runnable) this::writeSigV4TestConfig);
                     }));
                     // Create an empty input object to pass
                     var inputShape = model.expectShape(operation.getInputShape(), StructureShape.class);
@@ -607,6 +624,19 @@ private void writeClientBlock(
         });
     }
 
+    private void writeSigV4TestConfig() {
+        if (!service.hasTrait(SigV4Trait.class)) {
+            return;
+        }
+        writer.addImport("smithy_aws_core.identity", "StaticCredentialsResolver");
+        writer.write("""
+                region="us-east-1",
+                aws_access_key_id="test-access-key-id",
+                aws_secret_access_key="test-secret-access-key",
+                aws_credentials_identity_resolver=StaticCredentialsResolver(),
+                """);
+    }
+
     private void writeUtilStubs(Symbol serviceSymbol) {
         LOGGER.fine(String.format("Writing utility stubs for %s : %s", serviceSymbol.getName(), protocol.getName()));
         writer.addDependency(SmithyPythonDependency.SMITHY_CORE);