misc: merge main into server-sdk-main

.brazil-1.x.json

@@ -30,8 +30,8 @@
       "defaultVersionLayout": "{MAJOR}.x"
     },
     "rename": {
-        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "AwsSmithyAwsKotlinCodegen",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "AwsSmithyKotlinCodegen"
+        "aws.smithy.kotlin:aws-codegen": "AwsSmithyAwsKotlinCodegen",
+        "aws.smithy.kotlin:codegen": "AwsSmithyKotlinCodegen"
     },
     "ignore": [
       "aws.smithy.kotlin:http-test",
@@ -40,7 +40,7 @@
       "aws.smithy.kotlin:testing",
       "aws.smithy.kotlin:bom",
       "aws.smithy.kotlin:version-catalog",
-      "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils"
+      "aws.smithy.kotlin:codegen-testutils"
     ],
     "resolvesConflictDependencies": {
       "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [

.brazil.json

@@ -5,13 +5,15 @@
 
     "com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",
     "com.squareup.okhttp3:okhttp:5.*": "OkHttp3-5.x",
+    "com.squareup.okhttp3:okhttp-jvm:5.*": "OkHttp3-5.x",
     "com.squareup.okio:okio-jvm:3.*": "OkioJvm-3.x",
     "io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
     "io.opentelemetry:opentelemetry-extension-kotlin:1.*": "Maven-io-opentelemetry_opentelemetry-extension-kotlin-1.x",
     "org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
-    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
-    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
+    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.12.*": "AwsCrtKotlin-0.12.x",
     "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x",
+    "org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.*": "KotlinxDatetimeJvm-0.x",
+    "org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.*": "Maven-org-jetbrains-kotlinx_kotlinx-io-core-jvm-0.x",
 
     "software.amazon.smithy:smithy-aws-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-traits-1.x",
     "software.amazon.smithy:smithy-aws-iam-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-iam-traits-1.x",
@@ -23,19 +25,19 @@
     "software.amazon.smithy:smithy-waiters:1.*": "Maven-software-amazon-smithy_smithy-waiters-1.x",
     "software.amazon.smithy:smithy-rules-engine:1.*": "Maven-software-amazon-smithy_smithy-rules-engine-1.x",
     "software.amazon.smithy:smithy-smoke-test-traits:1.*": "Maven-software-amazon-smithy_smithy-smoke-test-traits-1.x",
-    "org.jsoup:jsoup:1.19.*": "Maven-jsoup-1.19.x"
+    "org.jsoup:jsoup:1.*": "Maven-jsoup-1.x"
   },
   "packageHandlingRules": {
     "versioning": {
       "defaultVersionLayout": "{MAJOR}.0.x",
       "overrides": {
-        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "{MAJOR}.x",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "{MAJOR}.x"
+        "aws.smithy.kotlin:aws-codegen": "{MAJOR}.x",
+        "aws.smithy.kotlin:codegen": "{MAJOR}.x"
       }
     },
     "rename": {
-        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "AwsSmithyAwsKotlinCodegen",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "AwsSmithyKotlinCodegen"
+        "aws.smithy.kotlin:aws-codegen": "AwsSmithyAwsKotlinCodegen",
+        "aws.smithy.kotlin:codegen": "AwsSmithyKotlinCodegen"
     },
     "ignore": [
       "aws.smithy.kotlin:http-test",
@@ -44,7 +46,7 @@
       "aws.smithy.kotlin:testing",
       "aws.smithy.kotlin:bom",
       "aws.smithy.kotlin:version-catalog",
-      "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils"
+      "aws.smithy.kotlin:codegen-testutils"
     ],
     "resolvesConflictDependencies": {
       "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [

.editorconfig

@@ -6,6 +6,10 @@ ktlint_standard_no-wildcard-imports = disabled
 ktlint_standard_filename = disabled
 ktlint_standard_backing-property-naming = disabled
 
+# TODO decide if we want to enable these new rules
+ktlint_standard_mixed-condition-operators = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
+
 # enable trailing commas per JetBrains recommendation
 # (https://kotlinlang.org/docs/coding-conventions.html#trailing-commas)
 ij_kotlin_allow_trailing_comma_on_call_site = true

.github/actions/setup-build/action.yml

@@ -0,0 +1,49 @@
+name: Setup Build
+description: >
+  Checkout repositories and build dependencies
+
+runs:
+  using: composite
+  steps:
+    - name: Extract aws-kotlin-repo-tools version
+      working-directory: ./smithy-kotlin
+      shell: bash
+      run: |
+        export AWS_KOTLIN_REPO_TOOLS_VERSION=$(grep '^aws-kotlin-repo-tools-version' ./gradle/libs.versions.toml | sed -E 's/.*= "(.*)"/\1/')
+        echo "Using aws-kotlin-repo-tools version $AWS_KOTLIN_REPO_TOOLS_VERSION"
+        echo "aws_kotlin_repo_tools_version=$AWS_KOTLIN_REPO_TOOLS_VERSION" >> $GITHUB_ENV
+
+    - name: Checkout aws-kotlin-repo-tools
+      uses: actions/checkout@v4
+      with:
+        path: 'aws-kotlin-repo-tools'
+        repository: 'aws/aws-kotlin-repo-tools'
+        ref: ${{ env.aws_kotlin_repo_tools_version }}
+        sparse-checkout: |
+          .github
+
+    - name: Checkout aws-crt-kotlin
+      uses: ./aws-kotlin-repo-tools/.github/actions/checkout-head
+      with:
+        # checkout aws-crt-kotlin as a sibling which will automatically make it an included build
+        path: 'aws-crt-kotlin'
+        repository: 'aws/aws-crt-kotlin'
+        submodules: 'true'
+
+    # Cache the Kotlin/Native toolchain based on the input Kotlin version from version catalog
+    # see https://kotlinlang.org/docs/native-improving-compilation-time.html
+    - name: Cache Kotlin Native toolchain
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.konan
+        key: ${{ runner.os }}-konan-${{ hashFiles('gradle/libs.versions.toml') }}
+        restore-keys: |
+          ${{ runner.os }}-konan-
+
+    - name: Configure JDK
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'corretto'
+        java-version: 17
+        cache: 'gradle'

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: gradle
+    directory: /
+    schedule:
+      interval: daily # means every _weekday_ (Monday through Friday)
+    open-pull-requests-limit: 100

.github/scripts/run-container-test.py

@@ -0,0 +1,152 @@
+#!/usr/bin/env python3
+#
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+Run precompiled Kotlin/Native test binaries in a Docker container for a specific Linux distribution and architecture.
+
+This requires Docker multiarch support, see https://docs.docker.com/build/building/multi-platform/ and https://github.com/multiarch/qemu-user-static
+In GitHub we use a provided action for this: https://github.com/docker/setup-qemu-action
+
+Locally you would need to run one of:
+
+`docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes`
+
+OR
+
+`docker run --privileged --rm tonistiigi/binfmt --install all`
+"""
+
+import argparse
+import os
+import subprocess
+import shlex
+import shutil
+
+VERBOSE = False
+
+DISTRO_TO_IMAGE_NAME = {
+    "ubuntu-22.04": "public.ecr.aws/lts/ubuntu:22.04_stable",
+    "al2023": "public.ecr.aws/amazonlinux/amazonlinux:2023",
+    "al2": "public.ecr.aws/amazonlinux/amazonlinux:2"
+}
+
+DOCKER_PLATFORM_BY_ARCH = {
+    "x64": "linux/amd64",
+    "arm64": "linux/arm64"
+}
+
+
+def vprint(message):
+    global VERBOSE
+    if VERBOSE:
+        print(message)
+
+
+def running_in_github_action():
+    """
+    Test if currently running in a GitHub action or running locally
+    :return: True if running in GH, False otherwise
+    """
+    return "GITHUB_WORKFLOW" in os.environ
+
+
+def shell(command, cwd=None, check=True, capture_output=False):
+    """
+    Run a command
+    :param command: command to run
+    :param cwd: the current working directory to change to before executing the command
+    :param check: flag indicating if the status code should be checked. When true an exception will be
+    thrown if the command exits with a non-zero exit status.
+    :returns: the subprocess CompletedProcess output
+    """
+    vprint(f"running `{command}`")
+    return subprocess.run(command, shell=True, check=check, cwd=cwd, capture_output=capture_output)
+
+
+def oci_executable():
+    """
+    Attempt to find the OCI container executor used to build and run docker containers
+    """
+    oci_exe = os.environ.get('OCI_EXE')
+    if oci_exe is not None:
+        return oci_exe
+
+    executors = ['finch', 'podman', 'docker']
+
+    for exe in executors:
+        if shutil.which(exe) is not None:
+            return exe
+
+    print("cannot find container executor")
+    exit(1)
+
+
+def run_docker_test(opts): 
+    """
+    Run a docker test for a precompiled Kotlin/Native binary
+
+    :param opts: the parsed command line options
+    """
+    platform = DOCKER_PLATFORM_BY_ARCH[opts.arch]
+    oci_exe = oci_executable()
+
+    test_bin_dir = os.path.abspath(opts.test_bin_dir)
+    image_name = DISTRO_TO_IMAGE_NAME[opts.distro]
+    path_to_exe = f'./linux{opts.arch.capitalize()}/debugTest/test.kexe'
+
+    cmd = [
+        oci_exe,
+        'run',
+        '--rm',
+        f'-v{test_bin_dir}:/test',
+    ]
+    if not opts.no_system_certs:
+        cmd.append(f'-v/etc/ssl:/etc/ssl')
+
+    cmd.extend(
+        [
+            '-w/test',
+            '-e DEBIAN_FRONTEND=noninteractive',
+            '--platform',
+            platform,
+            image_name,
+            path_to_exe,
+        ]
+    )
+
+    cmd = shlex.join(cmd)
+    print(cmd)
+    shell(cmd)
+
+
+def create_cli():
+    parser = argparse.ArgumentParser(
+        prog="run-container-test",
+        description="Run cross platform test binaries in a container",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter
+    )
+
+    parser.add_argument("-v", "--verbose", help="enable verbose output", action="store_true")
+
+    parser.add_argument("--distro", required=True, choices=DISTRO_TO_IMAGE_NAME.keys(), help="the distribution name to run the task on")
+    parser.add_argument("--arch", required=True, choices=DOCKER_PLATFORM_BY_ARCH.keys(), help="the architecture to use")
+    parser.add_argument("--test-bin-dir", required=True, help="the path to the test binary directory root")
+    parser.add_argument("--no-system-certs", action='store_true', help="disable mounting system certificates into the container")
+
+    return parser
+
+
+def main():
+    cli = create_cli()
+    opts = cli.parse_args()
+    if opts.verbose:
+        global VERBOSE
+        VERBOSE = True
+
+    run_docker_test(opts)
+
+
+if __name__ == '__main__':
+    main()

.github/workflows/api-compat-verification.yml

@@ -7,11 +7,14 @@ on:
       - main
       - '*-main'
 
+permissions:
+  contents: read
+
 jobs:
   api-compat-verification:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Check for API compatibility
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-api-break') }}
         run: |