merge main

Author: xinsong-cui

.changes/5a190de6-e9e5-4908-9bf9-62c34cf254f9.json

@@ -0,0 +1,14 @@
+name: Merge main
+on:
+  schedule:
+    - cron: "0 7 * * 1-5"  # At 07:00 UTC (00:00 PST, 03:00 EST), Monday through Friday
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge main
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
+        with:
+          exempt-branches: # Add any if required

.changes/5fa3154d-1f42-4b98-9ad1-ef8ef1ad5fbc.json

@@ -16,6 +16,10 @@ on:
   schedule:
     - cron: "0 7 * * 1-5"  # At 07:00 UTC (00:00 PST, 03:00 EST), Monday through Friday
 
+permissions:
+  id-token: write
+  contents: read
+
 concurrency:
   group: release-manual-${{ github.ref }}
   cancel-in-progress: true
@@ -27,6 +31,16 @@ jobs:
   update-release:
     runs-on: ubuntu-latest
     steps:
+      - name: Set start timestamp
+        id: start
+        run: printf 'timestamp=%(%s)T\n' >> "$GITHUB_OUTPUT"
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
+          aws-region: us-west-2
+      - name: Setup kat
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
       - uses: actions/checkout@v4
         with:
           ref: 'main'
@@ -91,6 +105,10 @@ jobs:
         shell: bash
         run: |
           echo "merging main @ $main_sha into release @ $release_sha";
+          
+          # Getting rid of the Gradle URL config changes caused by "Configure Gradle"
+          git stash -- gradle/wrapper/gradle-wrapper.properties
+          
           git switch release;
           input_message=${{ inputs.commit_message }}
           message=${input_message:-"Merging main into release"}
@@ -103,3 +121,23 @@ jobs:
             echo "pushing changes to release branch";
             git push origin release;
           fi
+      - name: Calculate duration
+        id: end
+        run: |
+          printf -v now '%(%s)T'
+          duration=$(( now - ${{ steps.start.outputs.timestamp }} ))
+          echo "duration=$duration" >> "$GITHUB_OUTPUT"
+      - name: Emit metrics
+        if: always() # run this step even if previous steps failed or the job is canceled
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
+        with:
+          namespace: CI Metrics
+          dimensions: |
+            Product=aws-sdk-kotlin
+            Trigger=${{ github.event_name == 'schedule' && 'schedule' || 'manual' }}
+          metrics: |
+            ReleaseMergeAttempted:1:Count
+            ReleaseMergeSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
+            ReleaseMergeCanceled:${{ job.status == 'cancelled' && '1' || '0' }}:Count
+            ReleaseMergeFailed:${{ job.status == 'failure' && '1' || '0' }}:Count
+            ReleaseMergeDuration:${{ steps.end.outputs.duration }}:Seconds

.github/workflows/merge-main.yml

@@ -18,6 +18,7 @@ import aws.smithy.kotlin.runtime.http.response.HttpResponse
  * If so it sends users to a section in the AWS SDK for Kotlin documentation on how to fix it.
  */
 @InternalSdkApi
+@Deprecated("This interceptor is no longer used. It will be removed in the next minor version, v1.5.x.")
 public class UnsupportedSigningAlgorithmInterceptor : HttpInterceptor {
     override suspend fun modifyBeforeCompletion(context: ResponseInterceptorContext<Any, Any, HttpRequest?, HttpResponse?>): Result<Any> {
         context.response.exceptionOrNull()?.let {

.github/workflows/update-release-branch.yml

@@ -63,7 +63,6 @@ object AwsRuntimeTypes {
     object Http : RuntimeTypePackage(AwsKotlinDependency.AWS_HTTP) {
         object Interceptors : RuntimeTypePackage(AwsKotlinDependency.AWS_HTTP, "interceptors") {
             val AddUserAgentMetadataInterceptor = symbol("AddUserAgentMetadataInterceptor")
-            val UnsupportedSigningAlgorithmInterceptor = symbol("UnsupportedSigningAlgorithmInterceptor")
             val IgnoreCompositeFlexibleChecksumResponseInterceptor = symbol("IgnoreCompositeFlexibleChecksumResponseInterceptor")
 
             object BusinessMetrics : RuntimeTypePackage(AwsKotlinDependency.AWS_HTTP, "interceptors.businessmetrics") {

CHANGELOG.md

@@ -6,6 +6,7 @@ package aws.sdk.kotlin.codegen.endpoints
 
 object AwsBuiltins {
     const val ACCOUNT_ID = "AWS::Auth::AccountId"
+    const val ACCOUNT_ID_ENDPOINT_MODE = "AWS::Auth::AccountIdEndpointMode"
     const val USE_FIPS = "AWS::UseFIPS"
     const val USE_DUAL_STACK = "AWS::UseDualStack"
     const val S3_ACCELERATE = "AWS::S3::Accelerate"

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/UnsupportedSigningAlgorithmInterceptor.kt

@@ -106,6 +106,14 @@ fun renderBindAwsBuiltins(ctx: ProtocolGenerator.GenerationContext, writer: Kotl
                         AwsRuntimeTypes.Config.Endpoints.resolveAccountId,
                         AccountIdEndpointBuiltinCustomization.AccountIdEndpointModeProp.propertyName,
                     )
+
+                AwsBuiltins.ACCOUNT_ID_ENDPOINT_MODE -> {
+                    writer.write(
+                        "#L = config.#L.toString().lowercase()", // Spec specifies these enum values must be lowercase
+                        it.defaultName(),
+                        AccountIdEndpointBuiltinCustomization.AccountIdEndpointModeProp.propertyName,
+                    )
+                }
             }
         }
     }