From d5decf3797ae63d48497c53d784eab5c1951a9be Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 16 Sep 2025 17:20:52 -0400 Subject: [PATCH 01/16] feat: minor version strategy rules --- .github/workflows/minor-version-bump.yml | 12 +++++++++ build.gradle.kts | 7 +++++ gradle/libs.versions.toml | 3 ++- .../minor-version-strategy/build.gradle.kts | 18 +++++++++++++ .../MinorVersionStrategyRuleSetProvider.kt | 27 +++++++++++++++++++ ...int.cli.ruleset.core.api.RuleSetProviderV3 | 1 + settings.gradle.kts | 2 ++ .../checksums/ChecksumBusinessMetricsTest.kt | 7 +++++ 8 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/minor-version-bump.yml create mode 100644 ktlint-rules/minor-version-strategy/build.gradle.kts create mode 100644 ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt create mode 100644 ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 diff --git a/.github/workflows/minor-version-bump.yml b/.github/workflows/minor-version-bump.yml new file mode 100644 index 00000000000..b9b9f622cda --- /dev/null +++ b/.github/workflows/minor-version-bump.yml @@ -0,0 +1,12 @@ +name: Minor version bump check +on: + pull_request: + +jobs: + minor-version-bump-check: + if: github.head_ref == '^v\d+\.\d+.*$' # Only runs on branches starting with vX.X (e.g., v1.2, v1.2.3, v1.2-main) + permissions: {} + runs-on: ubuntu-latest + steps: + - name: Minor version bump check + uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@minor-version-strategy # TODO: Change branch to main when done testing \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b586dc2c034..e87035b573c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ import aws.sdk.kotlin.gradle.dsl.configureLinting +import aws.sdk.kotlin.gradle.dsl.configureMinorVersionStrategyRules import aws.sdk.kotlin.gradle.dsl.configureNexus import aws.sdk.kotlin.gradle.util.typedProp @@ -106,3 +107,9 @@ val lintPaths = listOf( ) configureLinting(lintPaths) +configureMinorVersionStrategyRules(lintPaths) + +// Set SDK version from gradle.properties as a system property for 'configureMinorVersionStrategyRules' to use +tasks.withType { + systemProperty("sdkVersion", findProperty("sdkVersion") ?: throw Exception("sdkVersion not set")) +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7dc204bb4a1..4f45fcdddfe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version dokka-version = "2.0.0" -aws-kotlin-repo-tools-version = "0.4.49" +aws-kotlin-repo-tools-version = "0.0.0" # libs coroutines-version = "1.10.2" @@ -30,6 +30,7 @@ jsoup-version = "1.20.1" [libraries] aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" } +aws-kotlin-repo-tools-ktlint-rules = { module = "aws.sdk.kotlin.gradle:ktlint-rules", version.ref = "aws-kotlin-repo-tools-version" } kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version" } diff --git a/ktlint-rules/minor-version-strategy/build.gradle.kts b/ktlint-rules/minor-version-strategy/build.gradle.kts new file mode 100644 index 00000000000..d0b3f377709 --- /dev/null +++ b/ktlint-rules/minor-version-strategy/build.gradle.kts @@ -0,0 +1,18 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +plugins { + kotlin("jvm") +} + +kotlin { + sourceSets { + main { + dependencies { + implementation(libs.aws.kotlin.repo.tools.ktlint.rules) + } + } + } +} diff --git a/ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt b/ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt new file mode 100644 index 00000000000..5a96153a446 --- /dev/null +++ b/ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt @@ -0,0 +1,27 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package aws.sdk.kotlin.ktlintrules.minorversionstrategy + +import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 +import com.pinterest.ktlint.rule.engine.core.api.RuleProvider +import com.pinterest.ktlint.rule.engine.core.api.RuleSetId +import software.aws.ktlint.rules.apisScheduledForRemovalRule + +/** + * Ruleset provider for AWS SDK Kotlin minor-version-bump-specific Ktlint rules. + */ +class MinorVersionStrategyRuleSetProvider : RuleSetProviderV3(RuleSetId("minor-version-strategy-rules")) { + private val sdkVersion = System.getProperty("sdkVersion").split(".") + private val majorVersion = sdkVersion[0].toInt() + private val minorVersion = sdkVersion[1].toInt() + + override fun getRuleProviders(): Set = setOf( + RuleProvider { + // Look for APIs that are scheduled for removal in upcoming minor version + apisScheduledForRemovalRule(majorVersion, minorVersion + 1) + }, + ) +} diff --git a/ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 b/ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 new file mode 100644 index 00000000000..66cfe1e949e --- /dev/null +++ b/ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 @@ -0,0 +1 @@ +aws.sdk.kotlin.ktlintrules.minorversionstrategy.MinorVersionStrategyRuleSetProvider \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 826adedd84d..2502daa682e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -58,6 +58,8 @@ include(":hll") include(":hll:hll-codegen") include(":hll:hll-mapping-core") include(":services") +include("ktlint-rules:minor-version-strategy") + include(":tests") include(":tests:codegen") include(":tests:codegen:event-stream") diff --git a/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt b/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt index 8c743763011..f325055e86f 100644 --- a/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt +++ b/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt @@ -13,6 +13,13 @@ import aws.smithy.kotlin.runtime.client.config.RequestHttpChecksumConfig import aws.smithy.kotlin.runtime.client.config.ResponseHttpChecksumConfig import kotlin.test.Test +// TODO: REMOVE THIS WHEN DONE TESTING +public annotation class DeprecatedUntilVersion( + val major: Int, + val minor: Int, +) + +@DeprecatedUntilVersion(1, 6) class ChecksumBusinessMetricsTest { @Test fun defaultConfigBusinessMetrics() = runChecksumTest( From f441b3adf646d74df99e131cefbd056727e43b68 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 16 Sep 2025 17:32:11 -0400 Subject: [PATCH 02/16] self review --- .github/workflows/minor-version-bump.yml | 2 +- gradle/libs.versions.toml | 2 +- .../com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/minor-version-bump.yml b/.github/workflows/minor-version-bump.yml index b9b9f622cda..1b9372b7f81 100644 --- a/.github/workflows/minor-version-bump.yml +++ b/.github/workflows/minor-version-bump.yml @@ -9,4 +9,4 @@ jobs: runs-on: ubuntu-latest steps: - name: Minor version bump check - uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@minor-version-strategy # TODO: Change branch to main when done testing \ No newline at end of file + uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@minor-version-strategy # TODO: Change branch to main when done testing diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4f45fcdddfe..19f3538a410 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version dokka-version = "2.0.0" -aws-kotlin-repo-tools-version = "0.0.0" +aws-kotlin-repo-tools-version = "0.4.49" # libs coroutines-version = "1.10.2" diff --git a/ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 b/ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 index 66cfe1e949e..5640c072097 100644 --- a/ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 +++ b/ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 @@ -1 +1 @@ -aws.sdk.kotlin.ktlintrules.minorversionstrategy.MinorVersionStrategyRuleSetProvider \ No newline at end of file +aws.sdk.kotlin.ktlintrules.minorversionstrategy.MinorVersionStrategyRuleSetProvider From 5779e3ab6960f68deece0a60ae7f2fbc26dd1f97 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 16 Sep 2025 17:41:57 -0400 Subject: [PATCH 03/16] ready for review --- .github/workflows/minor-version-bump.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/minor-version-bump.yml b/.github/workflows/minor-version-bump.yml index 1b9372b7f81..336cb5128ad 100644 --- a/.github/workflows/minor-version-bump.yml +++ b/.github/workflows/minor-version-bump.yml @@ -9,4 +9,4 @@ jobs: runs-on: ubuntu-latest steps: - name: Minor version bump check - uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@minor-version-strategy # TODO: Change branch to main when done testing + uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@main From ff65f6f4a5a31fbd30d2468030ec44beccf0c524 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 16 Sep 2025 17:46:03 -0400 Subject: [PATCH 04/16] clean up --- .../tests/codegen/checksums/ChecksumBusinessMetricsTest.kt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt b/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt index f325055e86f..8c743763011 100644 --- a/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt +++ b/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt @@ -13,13 +13,6 @@ import aws.smithy.kotlin.runtime.client.config.RequestHttpChecksumConfig import aws.smithy.kotlin.runtime.client.config.ResponseHttpChecksumConfig import kotlin.test.Test -// TODO: REMOVE THIS WHEN DONE TESTING -public annotation class DeprecatedUntilVersion( - val major: Int, - val minor: Int, -) - -@DeprecatedUntilVersion(1, 6) class ChecksumBusinessMetricsTest { @Test fun defaultConfigBusinessMetrics() = runChecksumTest( From 333e207606ae3534fee3aed2bff59d4afe772174 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 17 Sep 2025 11:11:06 -0400 Subject: [PATCH 05/16] track upstream feedback --- build.gradle.kts | 2 +- .../MinorVersionStrategyRuleSetProvider.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e87035b573c..43772b10b00 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -109,7 +109,7 @@ val lintPaths = listOf( configureLinting(lintPaths) configureMinorVersionStrategyRules(lintPaths) -// Set SDK version from gradle.properties as a system property for 'configureMinorVersionStrategyRules' to use +// Set SDK version from gradle.properties as a system property for 'deprecatedApiRule' to use tasks.withType { systemProperty("sdkVersion", findProperty("sdkVersion") ?: throw Exception("sdkVersion not set")) } diff --git a/ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt b/ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt index 5a96153a446..554bea60d0b 100644 --- a/ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt +++ b/ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt @@ -8,7 +8,7 @@ package aws.sdk.kotlin.ktlintrules.minorversionstrategy import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 import com.pinterest.ktlint.rule.engine.core.api.RuleProvider import com.pinterest.ktlint.rule.engine.core.api.RuleSetId -import software.aws.ktlint.rules.apisScheduledForRemovalRule +import software.aws.ktlint.rules.deprecatedApiRule /** * Ruleset provider for AWS SDK Kotlin minor-version-bump-specific Ktlint rules. @@ -21,7 +21,7 @@ class MinorVersionStrategyRuleSetProvider : RuleSetProviderV3(RuleSetId("minor-v override fun getRuleProviders(): Set = setOf( RuleProvider { // Look for APIs that are scheduled for removal in upcoming minor version - apisScheduledForRemovalRule(majorVersion, minorVersion + 1) + deprecatedApiRule(majorVersion, minorVersion + 1) }, ) } From 5e788700568531ca026806af11d5c118d68567a5 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 17 Sep 2025 14:24:36 -0400 Subject: [PATCH 06/16] feedback --- build.gradle.kts | 15 +++++++---- gradle/libs.versions.toml | 3 +-- .../minor-version-strategy/build.gradle.kts | 18 ------------- .../MinorVersionStrategyRuleSetProvider.kt | 27 ------------------- ...int.cli.ruleset.core.api.RuleSetProviderV3 | 1 - settings.gradle.kts | 1 - .../checksums/ChecksumBusinessMetricsTest.kt | 7 +++++ 7 files changed, 18 insertions(+), 54 deletions(-) delete mode 100644 ktlint-rules/minor-version-strategy/build.gradle.kts delete mode 100644 ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt delete mode 100644 ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 diff --git a/build.gradle.kts b/build.gradle.kts index 43772b10b00..0529ae0f1d0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -107,9 +107,14 @@ val lintPaths = listOf( ) configureLinting(lintPaths) -configureMinorVersionStrategyRules(lintPaths) -// Set SDK version from gradle.properties as a system property for 'deprecatedApiRule' to use -tasks.withType { - systemProperty("sdkVersion", findProperty("sdkVersion") ?: throw Exception("sdkVersion not set")) -} +/* +Set SDK version from gradle.properties as a system property for minor versiom strategy ktlint rules +See: https://github.com/aws/aws-kotlin-repo-tools/pull/132 + */ +tasks.withType() + .matching { it.name == "verifyMinorVersionBump" } + .configureEach { + systemProperty("sdkVersion", findProperty("sdkVersion") ?: throw Exception("sdkVersion not set")) + } +configureMinorVersionStrategyRules(lintPaths) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 19f3538a410..a37872e0a6d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version dokka-version = "2.0.0" -aws-kotlin-repo-tools-version = "0.4.49" +aws-kotlin-repo-tools-version = "8.8.8" # libs coroutines-version = "1.10.2" @@ -30,7 +30,6 @@ jsoup-version = "1.20.1" [libraries] aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" } -aws-kotlin-repo-tools-ktlint-rules = { module = "aws.sdk.kotlin.gradle:ktlint-rules", version.ref = "aws-kotlin-repo-tools-version" } kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version" } diff --git a/ktlint-rules/minor-version-strategy/build.gradle.kts b/ktlint-rules/minor-version-strategy/build.gradle.kts deleted file mode 100644 index d0b3f377709..00000000000 --- a/ktlint-rules/minor-version-strategy/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - -plugins { - kotlin("jvm") -} - -kotlin { - sourceSets { - main { - dependencies { - implementation(libs.aws.kotlin.repo.tools.ktlint.rules) - } - } - } -} diff --git a/ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt b/ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt deleted file mode 100644 index 554bea60d0b..00000000000 --- a/ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - -package aws.sdk.kotlin.ktlintrules.minorversionstrategy - -import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 -import com.pinterest.ktlint.rule.engine.core.api.RuleProvider -import com.pinterest.ktlint.rule.engine.core.api.RuleSetId -import software.aws.ktlint.rules.deprecatedApiRule - -/** - * Ruleset provider for AWS SDK Kotlin minor-version-bump-specific Ktlint rules. - */ -class MinorVersionStrategyRuleSetProvider : RuleSetProviderV3(RuleSetId("minor-version-strategy-rules")) { - private val sdkVersion = System.getProperty("sdkVersion").split(".") - private val majorVersion = sdkVersion[0].toInt() - private val minorVersion = sdkVersion[1].toInt() - - override fun getRuleProviders(): Set = setOf( - RuleProvider { - // Look for APIs that are scheduled for removal in upcoming minor version - deprecatedApiRule(majorVersion, minorVersion + 1) - }, - ) -} diff --git a/ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 b/ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 deleted file mode 100644 index 5640c072097..00000000000 --- a/ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3 +++ /dev/null @@ -1 +0,0 @@ -aws.sdk.kotlin.ktlintrules.minorversionstrategy.MinorVersionStrategyRuleSetProvider diff --git a/settings.gradle.kts b/settings.gradle.kts index 2502daa682e..7e94f2eb4ee 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -58,7 +58,6 @@ include(":hll") include(":hll:hll-codegen") include(":hll:hll-mapping-core") include(":services") -include("ktlint-rules:minor-version-strategy") include(":tests") include(":tests:codegen") diff --git a/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt b/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt index 8c743763011..f325055e86f 100644 --- a/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt +++ b/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt @@ -13,6 +13,13 @@ import aws.smithy.kotlin.runtime.client.config.RequestHttpChecksumConfig import aws.smithy.kotlin.runtime.client.config.ResponseHttpChecksumConfig import kotlin.test.Test +// TODO: REMOVE THIS WHEN DONE TESTING +public annotation class DeprecatedUntilVersion( + val major: Int, + val minor: Int, +) + +@DeprecatedUntilVersion(1, 6) class ChecksumBusinessMetricsTest { @Test fun defaultConfigBusinessMetrics() = runChecksumTest( From a9367d669f800f0b5e1c9b4a1b4f2190b84af2fc Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 17 Sep 2025 14:26:12 -0400 Subject: [PATCH 07/16] self review --- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 1 - .../tests/codegen/checksums/ChecksumBusinessMetricsTest.kt | 7 ------- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a37872e0a6d..7dc204bb4a1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version dokka-version = "2.0.0" -aws-kotlin-repo-tools-version = "8.8.8" +aws-kotlin-repo-tools-version = "0.4.49" # libs coroutines-version = "1.10.2" diff --git a/settings.gradle.kts b/settings.gradle.kts index 7e94f2eb4ee..826adedd84d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -58,7 +58,6 @@ include(":hll") include(":hll:hll-codegen") include(":hll:hll-mapping-core") include(":services") - include(":tests") include(":tests:codegen") include(":tests:codegen:event-stream") diff --git a/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt b/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt index f325055e86f..8c743763011 100644 --- a/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt +++ b/tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt @@ -13,13 +13,6 @@ import aws.smithy.kotlin.runtime.client.config.RequestHttpChecksumConfig import aws.smithy.kotlin.runtime.client.config.ResponseHttpChecksumConfig import kotlin.test.Test -// TODO: REMOVE THIS WHEN DONE TESTING -public annotation class DeprecatedUntilVersion( - val major: Int, - val minor: Int, -) - -@DeprecatedUntilVersion(1, 6) class ChecksumBusinessMetricsTest { @Test fun defaultConfigBusinessMetrics() = runChecksumTest( From d4b42f846294f42e1423ed257d327f54cf0b09d0 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 18 Sep 2025 16:30:23 -0400 Subject: [PATCH 08/16] feedback --- build.gradle.kts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0529ae0f1d0..87a08af1de2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -107,14 +107,4 @@ val lintPaths = listOf( ) configureLinting(lintPaths) - -/* -Set SDK version from gradle.properties as a system property for minor versiom strategy ktlint rules -See: https://github.com/aws/aws-kotlin-repo-tools/pull/132 - */ -tasks.withType() - .matching { it.name == "verifyMinorVersionBump" } - .configureEach { - systemProperty("sdkVersion", findProperty("sdkVersion") ?: throw Exception("sdkVersion not set")) - } configureMinorVersionStrategyRules(lintPaths) From 56ff71259e9563b572a0fb66383fbd718664773a Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 18 Sep 2025 16:43:30 -0400 Subject: [PATCH 09/16] repo tools version bump --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7dc204bb4a1..f49a86006c2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version dokka-version = "2.0.0" -aws-kotlin-repo-tools-version = "0.4.49" +aws-kotlin-repo-tools-version = "0.4.52" # libs coroutines-version = "1.10.2" From 047f9da9eab5154c04eff99748d2f49614a2f259 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 18 Sep 2025 17:13:54 -0400 Subject: [PATCH 10/16] fix workflow --- .github/workflows/minor-version-bump.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/minor-version-bump.yml b/.github/workflows/minor-version-bump.yml index 336cb5128ad..1f4859876d8 100644 --- a/.github/workflows/minor-version-bump.yml +++ b/.github/workflows/minor-version-bump.yml @@ -4,9 +4,15 @@ on: jobs: minor-version-bump-check: - if: github.head_ref == '^v\d+\.\d+.*$' # Only runs on branches starting with vX.X (e.g., v1.2, v1.2.3, v1.2-main) permissions: {} runs-on: ubuntu-latest steps: + - name: Check branch name + run: | + # Only continue on branches starting with vX.X (e.g. v1.2, v1.2.3, v1.2-main) + if [[ ! "$GITHUB_HEAD_REF" =~ ^v\.[0-9]+\.[0-9]+.*$ ]]; then + exit 0 + fi + - name: Minor version bump check uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@main From 47a9ac9d8e6ec2e23143bd937b077c3f18ffa702 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 18 Sep 2025 17:21:10 -0400 Subject: [PATCH 11/16] add back repo tools maven repo --- settings.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/settings.gradle.kts b/settings.gradle.kts index 6dc165db0f0..c8be4492931 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,6 +30,13 @@ dependencyResolutionManagement { repositories { mavenLocal() mavenCentral() + maven { + name = "kotlinRepoTools" + url = java.net.URI("https://d2gys1nrxnjnyg.cloudfront.net/releases") + content { + includeGroupByRegex("""aws\.sdk\.kotlin.*""") + } + } } } From 74bed3d1a4bc6c97a83f524ad0d0b326d2114650 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 19 Sep 2025 11:31:42 -0400 Subject: [PATCH 12/16] test simplification --- .github/workflows/minor-version-bump.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/minor-version-bump.yml b/.github/workflows/minor-version-bump.yml index 1f4859876d8..5546244cb9f 100644 --- a/.github/workflows/minor-version-bump.yml +++ b/.github/workflows/minor-version-bump.yml @@ -7,12 +7,5 @@ jobs: permissions: {} runs-on: ubuntu-latest steps: - - name: Check branch name - run: | - # Only continue on branches starting with vX.X (e.g. v1.2, v1.2.3, v1.2-main) - if [[ ! "$GITHUB_HEAD_REF" =~ ^v\.[0-9]+\.[0-9]+.*$ ]]; then - exit 0 - fi - - name: Minor version bump check - uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@main + uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@minor-version-bump-fix From 7e0daf4e86829ffbee180648bd16266cd9af8e8f Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 19 Sep 2025 12:32:32 -0400 Subject: [PATCH 13/16] use prod action --- .github/workflows/minor-version-bump.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/minor-version-bump.yml b/.github/workflows/minor-version-bump.yml index 5546244cb9f..ef10fe70d9c 100644 --- a/.github/workflows/minor-version-bump.yml +++ b/.github/workflows/minor-version-bump.yml @@ -8,4 +8,4 @@ jobs: runs-on: ubuntu-latest steps: - name: Minor version bump check - uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@minor-version-bump-fix + uses: awslabs/aws-kotlin-repo-tools/.github/actions/minor-version-bump@main From cfee948fa9dfd9e9b1e1fe84220044604a81e964 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Fri, 19 Sep 2025 12:50:50 -0400 Subject: [PATCH 14/16] new lint rules --- .../runtime/config/auth/ResolveAuthSchemePreference.kt | 5 +++++ .../config/checksums/ResolveFlexibleChecksumsConfig.kt | 5 +++++ .../kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt | 5 +++++ .../credentials/ProfileCredentialsProviderTestJVM.kt | 5 +++++ ...noreCompositeFlexibleChecksumResponseInterceptor.kt | 5 +++++ .../businessmetrics/AwsBusinessMetricsUtils.kt | 5 +++++ buildSrc/build.gradle.kts | 5 +++++ buildSrc/settings.gradle.kts | 5 ++++- .../kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt | 5 +++++ buildSrc/src/main/kotlin/dokka-convention.gradle.kts | 5 +++++ .../kotlin/codegen/ModuleDocumentationIntegration.kt | 5 +++++ .../CredentialsBusinessMetricsIntegration.kt | 5 +++++ .../EndpointBusinessMetricsIntegration.kt | 5 +++++ .../codegen/model/traits/testing/SmokeTestTraits.kt | 5 +++++ .../AwsSmokeTestsRunnerGeneratorIntegration.kt | 5 +++++ .../smoketests/SmokeTestsDenyListIntegration.kt | 5 +++++ .../testing/SmokeTestFailHttpEngineIntegration.kt | 5 +++++ .../testing/SmokeTestSuccessHttpEngineIntegration.kt | 5 +++++ .../codegen/ModuleDocumentationIntegrationTest.kt | 5 +++++ .../codegen/endpoints/BindAwsEndpointBuiltinsTest.kt | 5 +++++ .../cloudwatch-logs-graalvm/src/main/kotlin/Main.kt | 5 +++++ .../hll/dynamodbmapper/codegen/model/MapperTypes.kt | 5 +++++ .../dynamodb-mapper-ops-codegen/build.gradle.kts | 5 +++++ .../dynamodb-mapper-schema-codegen/build.gradle.kts | 5 +++++ .../codegen/annotations/AnnotationsProcessorOptions.kt | 5 +++++ .../plugins/SchemaGeneratorPluginExtension.kt | 5 +++++ .../plugins/SchemaGeneratorPluginTest.kt | 5 +++++ .../src/test/resources/BuilderNotRequired.kt | 5 +++++ .../src/test/resources/IgnoredProperty.kt | 5 +++++ .../src/test/resources/RenamedPartitionKey.kt | 5 +++++ .../src/test/resources/User.kt | 5 +++++ .../custom-item-converter/CustomItemConverter.kt | 5 +++++ .../test/resources/custom-item-converter/CustomUser.kt | 5 +++++ .../hll/dynamodbmapper/operations/PaginatedScanTest.kt | 5 +++++ .../kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt | 5 +++++ .../kotlin/hll/codegen/rendering/BuilderRenderer.kt | 5 +++++ .../sdk/kotlin/hll/codegen/rendering/RenderOptions.kt | 5 +++++ hll/hll-mapping-core/build.gradle.kts | 5 +++++ .../bedrock/BedrockEnvironmentBearerTokenTest.kt | 10 +++++++--- services/route53/e2eTest/src/Route53UriTest.kt | 5 +++++ services/s3/e2eTest/src/S3ChecksumTest.kt | 5 +++++ tests/codegen/build.gradle.kts | 5 +++++ tests/codegen/checksums/build.gradle.kts | 4 ++++ 43 files changed, 215 insertions(+), 4 deletions(-) diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt index 41071beb707..f06879eaf44 100644 --- a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt +++ b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.runtime.config.auth import aws.sdk.kotlin.runtime.InternalSdkApi diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt index 5925fb858f0..1859c5b43fe 100644 --- a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt +++ b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.runtime.config.checksums import aws.sdk.kotlin.runtime.InternalSdkApi diff --git a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt index 71467475b34..dbc213438f9 100644 --- a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt +++ b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.runtime.util import aws.sdk.kotlin.runtime.http.interceptors.businessmetrics.AwsBusinessMetric diff --git a/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt b/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt index 802f8f253db..3cc0e2f5cd4 100644 --- a/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt +++ b/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.runtime.auth.credentials import aws.sdk.kotlin.runtime.auth.credentials.internal.credentials diff --git a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt index 75c70913894..dad6d3654e8 100644 --- a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt +++ b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.runtime.http.interceptors import aws.smithy.kotlin.runtime.client.ProtocolResponseInterceptorContext diff --git a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt index 56f88433456..b9b8514e665 100644 --- a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt +++ b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.runtime.http.interceptors.businessmetrics import aws.sdk.kotlin.runtime.http.BUSINESS_METRICS_MAX_LENGTH diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index ea81e7825a9..60e7ba27f4f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + plugins { alias(libs.plugins.kotlin.jvm) `kotlin-dsl` diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index 62991c1ef50..ebc5a9d7c41 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -1,4 +1,7 @@ -rootProject.name = "buildSrc" +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ dependencyResolutionManagement { versionCatalogs { diff --git a/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt b/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt index 764e0abc44b..9facb987866 100644 --- a/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt +++ b/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.tests.codegen /** diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts index 15605bcb111..b7bca271f10 100644 --- a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + import org.jsoup.Jsoup import kotlin.io.path.ExperimentalPathApi import kotlin.io.path.PathWalkOption diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt index 433cfb0d492..a559d714c0b 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.codegen import software.amazon.smithy.aws.traits.ServiceTrait diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt index 162c12dbb09..ea240f5f5cf 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.codegen.businessmetrics import aws.sdk.kotlin.codegen.AwsRuntimeTypes diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt index 8641a8ac634..ef59d7bf05a 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.codegen.businessmetrics import aws.sdk.kotlin.codegen.AwsRuntimeTypes diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt index 6805c3bad1f..4d67c7549b3 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.codegen.model.traits.testing import software.amazon.smithy.model.node.ObjectNode diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt index 1e694ae4bbc..da154161601 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.codegen.smoketests import aws.sdk.kotlin.codegen.AwsRuntimeTypes diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt index 06222e6c603..500cb2ea183 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.codegen.smoketests import software.amazon.smithy.kotlin.codegen.KotlinSettings diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt index ad6bd0ee95e..fb718146311 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.codegen.smoketests.testing import aws.sdk.kotlin.codegen.model.traits.testing.TestFailedResponseTrait diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt index 03077a4cd5a..a31744be236 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.codegen.smoketests.testing import aws.sdk.kotlin.codegen.model.traits.testing.TestFailedResponseTrait diff --git a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt index cd288b5782d..bbd3ce3d751 100644 --- a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt +++ b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.codegen import software.amazon.smithy.build.MockManifest diff --git a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt index 2fa1877fe52..e1d08153704 100644 --- a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt +++ b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.codegen.endpoints import software.amazon.smithy.kotlin.codegen.core.KotlinWriter diff --git a/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt b/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt index 1b23bd43e36..5375a73eee5 100644 --- a/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt +++ b/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.example import aws.sdk.kotlin.services.cloudwatchlogs.CloudWatchLogsClient diff --git a/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt b/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt index 6b8d38c2fca..06860dbf113 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.hll.dynamodbmapper.codegen.model import aws.sdk.kotlin.hll.codegen.model.Type diff --git a/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts index 32160f166e1..6806b439851 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + /* * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts index b5a14e2a01e..202f5a60899 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + /* * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt index aa8954422a9..308e29e4ff9 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.hll.dynamodbmapper.codegen.annotations import aws.smithy.kotlin.runtime.collections.AttributeKey diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt index 590d848e463..ba317f015e9 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.hll.dynamodbmapper.plugins import aws.sdk.kotlin.hll.codegen.rendering.Visibility diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt index 42601bebbeb..ac261b9fb4f 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.hll.dynamodbmapper.plugins import org.gradle.testkit.runner.GradleRunner diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt index 2861b2c8f6d..b4901ccc67a 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package org.example import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt index ff9c091258a..28a3a5b7500 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package org.example import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt index e507c9af815..78a04a2cd49 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package org.example import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt index 65cbdea0620..1dfbc76281b 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package org.example import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt index abe58305992..0cbe80001a2 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package my.custom.item.converter import aws.sdk.kotlin.hll.dynamodbmapper.items.AttributeDescriptor diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt index 75fe3234cdb..b47aca28c04 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package org.example import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbItem diff --git a/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt index 17870798ee9..71acfb4034d 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.hll.dynamodbmapper.operations import aws.sdk.kotlin.hll.dynamodbmapper.items.* diff --git a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt index 64400b17a79..ec38a7405f3 100644 --- a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt +++ b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.hll.codegen.model import aws.sdk.kotlin.runtime.InternalSdkApi diff --git a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt index d14733105f4..e3d3e867a05 100644 --- a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt +++ b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.hll.codegen.rendering import aws.sdk.kotlin.hll.codegen.core.CodeGenerator diff --git a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt index 514988feee5..fa062084e59 100644 --- a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt +++ b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.hll.codegen.rendering import aws.smithy.kotlin.runtime.collections.AttributeKey diff --git a/hll/hll-mapping-core/build.gradle.kts b/hll/hll-mapping-core/build.gradle.kts index b7c2dc41027..7f3f61454d1 100644 --- a/hll/hll-mapping-core/build.gradle.kts +++ b/hll/hll-mapping-core/build.gradle.kts @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + import aws.sdk.kotlin.gradle.kmp.kotlin /* diff --git a/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt b/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt index 19a2a351c11..28b12cb9bf4 100644 --- a/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt +++ b/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.services.bedrock import aws.sdk.kotlin.services.bedrock.auth.finalizeBearerTokenConfig @@ -25,8 +30,8 @@ import kotlin.test.assertNotNull import kotlin.test.assertTrue class BedrockEnvironmentBearerTokenTest { - private fun mockHttpClient(handler: (HttpRequest) -> HttpResponse): HttpClientEngine { - return object : HttpClientEngineBase("test engine") { + private fun mockHttpClient(handler: (HttpRequest) -> HttpResponse): HttpClientEngine = + object : HttpClientEngineBase("test engine") { override val config: HttpClientEngineConfig = HttpClientEngineConfig.Default override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest): HttpCall { @@ -34,7 +39,6 @@ class BedrockEnvironmentBearerTokenTest { return HttpCall(request, response, Instant.now(), Instant.now()) } } - } private val mockPlatformProvider = TestPlatformProvider( env = mapOf("AWS_BEARER_TOKEN_BEDROCK" to "bedrock-token"), diff --git a/services/route53/e2eTest/src/Route53UriTest.kt b/services/route53/e2eTest/src/Route53UriTest.kt index 6ec9e6ac25d..0d9de9b4a66 100644 --- a/services/route53/e2eTest/src/Route53UriTest.kt +++ b/services/route53/e2eTest/src/Route53UriTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.services.route53 import aws.sdk.kotlin.runtime.auth.credentials.StaticCredentialsProvider diff --git a/services/s3/e2eTest/src/S3ChecksumTest.kt b/services/s3/e2eTest/src/S3ChecksumTest.kt index cf0df9ba826..e5814d2dcc8 100644 --- a/services/s3/e2eTest/src/S3ChecksumTest.kt +++ b/services/s3/e2eTest/src/S3ChecksumTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + package aws.sdk.kotlin.e2etest import aws.sdk.kotlin.e2etest.S3TestUtils.deleteBucketContents diff --git a/tests/codegen/build.gradle.kts b/tests/codegen/build.gradle.kts index ecdae5f6ccc..c193c20c26d 100644 --- a/tests/codegen/build.gradle.kts +++ b/tests/codegen/build.gradle.kts @@ -1,3 +1,8 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + import aws.sdk.kotlin.gradle.codegen.dsl.generateSmithyProjections plugins { diff --git a/tests/codegen/checksums/build.gradle.kts b/tests/codegen/checksums/build.gradle.kts index 6e7795fe4a6..829c149cd5c 100644 --- a/tests/codegen/checksums/build.gradle.kts +++ b/tests/codegen/checksums/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ import aws.sdk.kotlin.gradle.codegen.dsl.smithyKotlinPlugin import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir From 847da601c9514082fa4ec7db20bd0ca912bad40f Mon Sep 17 00:00:00 2001 From: 0marperez <60363173+0marperez@users.noreply.github.com> Date: Mon, 22 Sep 2025 13:28:22 -0400 Subject: [PATCH 15/16] Update settings.gradle.kts --- buildSrc/settings.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index ebc5a9d7c41..fa909303793 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -3,6 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ +rootProject.name = "buildSrc" + dependencyResolutionManagement { versionCatalogs { create("libs") { From e55d1c56974f4b72f90e64dfc757dff33c1b6731 Mon Sep 17 00:00:00 2001 From: 0marperez <60363173+0marperez@users.noreply.github.com> Date: Tue, 23 Sep 2025 09:48:53 -0400 Subject: [PATCH 16/16] Update libs.versions.toml --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 58d2341f662..aeb94018585 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,8 +12,8 @@ atomicfu-version = "0.29.0" binary-compatibility-validator-version = "0.18.0" # smithy-kotlin codegen and runtime are versioned separately -smithy-kotlin-runtime-version = "1.5.8" -smithy-kotlin-codegen-version = "0.35.8" +smithy-kotlin-runtime-version = "1.5.10" +smithy-kotlin-codegen-version = "0.35.10" # codegen smithy-version = "1.60.2"