Skip to content

Commit 0722355

Browse files
committed
Merge branch 'main' of github.com:awslabs/aws-sdk-kotlin into v1.4
2 parents e297a98 + c936d3c commit 0722355

File tree

409 files changed

+170294
-26598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+170294
-26598
lines changed

.brazil.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
{
22
"dependencies": {
3+
"org.jetbrains.kotlin:kotlin-gradle-plugin:2.*": "KotlinGradlePlugin-2.x",
34
"org.jetbrains.kotlin:kotlin-stdlib-common:2.*.*": "KotlinStdlibCommon-2.x",
45
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.*.*": "KotlinStdlibJdk8-2.x",
56
"org.jetbrains.kotlin:kotlin-stdlib:2.*.*": "KotlinStdlib-2.x",
67
"org.jetbrains.kotlinx:atomicfu:0.*.*": "Atomicfu-0.x",
78
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
8-
"org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x"
9+
"org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x",
10+
"com.google.devtools.ksp:symbol-processing-api:2.*": "Maven-com-google-devtools-ksp_symbol-processing-api-2.x",
11+
"com.google.devtools.ksp:symbol-processing-gradle-plugin:2.*": "Maven-com-google-devtools-ksp_symbol-processing-gradle-plugin-2.x"
912
},
1013
"packageHandlingRules": {
1114
"versioning": {
1215
"defaultVersionLayout": "{MAJOR}.0.x"
1316
},
1417
"ignore": [
1518
"aws.sdk.kotlin:bom",
16-
"aws.sdk.kotlin.crt:aws-crt-kotlin-android",
1719
"aws.sdk.kotlin:testing",
1820
"aws.sdk.kotlin:version-catalog"
1921
],
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Kat Transform
2+
3+
on:
4+
pull_request:
5+
types: [ opened, synchronize, reopened, labeled, unlabeled ]
6+
branches: [ main ]
7+
8+
# Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
9+
concurrency:
10+
group: kat-pr-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
permissions:
14+
id-token: write
15+
contents: read
16+
17+
env:
18+
RUN: ${{ github.run_id }}-${{ github.run_number }}
19+
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dkotlin.incremental=false"
20+
21+
jobs:
22+
verify-transform:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Checkout sources
26+
uses: actions/checkout@v4
27+
with:
28+
path: 'aws-sdk-kotlin'
29+
30+
- name: Setup Build
31+
uses: ./aws-sdk-kotlin/.github/actions/setup-build
32+
33+
- name: Configure AWS Credentials
34+
uses: aws-actions/configure-aws-credentials@v4
35+
with:
36+
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
37+
aws-region: us-west-2
38+
39+
- name: Setup kat
40+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
41+
42+
- name: Build
43+
working-directory: ./aws-sdk-kotlin
44+
shell: bash
45+
run: |
46+
pwd
47+
ls -lsa
48+
kat bump-version # Bump from `vNext-SNAPSHOT` to `vNext`. kat transform only works on non-SNAPSHOT versions
49+
./gradlew build
50+
./gradlew publishAllPublicationsToTestLocalRepository
51+
52+
- name: Transform
53+
working-directory: ./aws-sdk-kotlin
54+
shell: bash
55+
run: |
56+
pwd
57+
ls -lsa
58+
kat brazil transform -i ./build/m2 -o ./transformed -t .brazil.json -v live -m ./codegen/sdk/packages.json
59+
60+
# Check for manifest file
61+
if [ ! -f "./transformed/brazil-import-manifest.json" ]; then
62+
echo "Error: brazil-import-manifest.json not found in the transformed artifact"
63+
exit 1
64+
fi
65+
66+
echo "Transformation succeeded!"

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ build/
1212
.idea/
1313
__pycache__/
1414
local.properties
15+
1516
# ignore generated files
1617
services/*/generated-src
1718
services/*/build.gradle.kts
1819
.kotest/
19-
*.klib
20+
*.klib
21+
tests/codegen/smoke-tests/services/*/generated-src
22+
tests/codegen/smoke-tests/services/*/build.gradle.kts

CHANGELOG.md

Lines changed: 513 additions & 48 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ AWS service clients are generated from [Smithy](https://awslabs.github.io/smithy
1616
As such the code in `aws-sdk-kotlin` is a layer on top of generic Smithy based code generation tooling.
1717

1818

19-
2. Smithy Kotlin Codegen repo ([awslabs/smithy-kotlin](https://github.com/awslabs/smithy-kotlin))
19+
2. Smithy Kotlin Codegen repo ([smithy-lang/smithy-kotlin](https://github.com/smithy-lang/smithy-kotlin))
2020

2121
The `smithy-kotlin` repository contains the generic Smithy code generation tools for Kotlin.
2222

23-
If you want to contribute by diving into the codegen machinery and helping develop the SDK please refer to the [contributing guide](https://github.com/awslabs/smithy-kotlin/blob/main/CONTRIBUTING.md) in that repo.
23+
If you want to contribute by diving into the codegen machinery and helping develop the SDK please refer to the [contributing guide](https://github.com/smithy-lang/smithy-kotlin/blob/main/CONTRIBUTING.md) in that repo.
2424

2525

2626
## Reporting Bugs/Feature Requests
@@ -78,7 +78,7 @@ following fields:
7878
| `id` | `string` | yes | | A unique identifier for this entry. We recommend you generate a UUID for this field. |
7979
| `type` | `string` | yes | `bugfix`, `feature`, `documentation`, `misc` | The type of change being made. |
8080
| `description` | `string` | yes | | A description of the change being made.<ul><li>Prefix with `**Breaking**:` if the change is breaking</li><li>Use the imperative present tense (e.g., "change" not "changed" nor "changes")</li><li>Capitalize first letter</li><li>No dot (.) at the end unless there are multiple sentences</li></ul> |
81-
| `issues` | `string[]` | no | | A list of references to any related issues in the relevant repositories. A reference can be specified in several ways:<ul><li>The issue number, if local to this repository (eg. `#12345`)</li><li>A fully-qualified issue ID (eg.`awslabs/smithy-kotlin#12345`)</li><li>A fully-qualified URL (eg. `https://issuetracker.com/12345`)</li></ul> |
81+
| `issues` | `string[]` | no | | A list of references to any related issues in the relevant repositories. A reference can be specified in several ways:<ul><li>The issue number, if local to this repository (eg. `#12345`)</li><li>A fully-qualified issue ID (eg.`smithy-lang/smithy-kotlin#12345`)</li><li>A fully-qualified URL (eg. `https://issuetracker.com/12345`)</li></ul> |
8282
| `module` | `string` | no | | The area of the code affected by your changes. If unsure, leave this value unset. |
8383
| `requiresMinorVersionBump` | `boolean` | no | | Indicates the change will require a new minor version. This is usually the case after a breaking change. Defaults to false if flag is not included. |
8484

aws-runtime/aws-config/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
description = "Support for AWS configuration"
1515
extra["moduleName"] = "aws.sdk.kotlin.runtime.config"
1616

17-
apply(plugin = "kotlinx-atomicfu")
17+
apply(plugin = "org.jetbrains.kotlinx.atomicfu")
1818

1919
kotlin {
2020
sourceSets {

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/profile/ConfigSection.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package aws.sdk.kotlin.runtime.config.profile
88
import aws.sdk.kotlin.runtime.InternalSdkApi
99

1010
@InternalSdkApi
11+
@ExposedCopyVisibility // FIXME Change to @ConsistentCopyVisibility in 1.4.x minor version bump
1112
public data class ConfigSection internal constructor(
1213
public val name: String,
1314
internal val properties: Map<String, AwsConfigValue>,

aws-runtime/aws-endpoint/api/aws-endpoint.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public final class aws/sdk/kotlin/runtime/endpoint/functions/PartitionConfig {
4747
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
4848
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;)V
4949
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;)V
50+
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
5051
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;)V
5152
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
5253
public final fun component1 ()Ljava/lang/String;

aws-runtime/aws-endpoint/common/src/aws/sdk/kotlin/runtime/endpoint/functions/Functions.kt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,31 @@ public data class Partition(
6262
* the result of a partition call.
6363
*/
6464
@InternalSdkApi
65-
public data class PartitionConfig @JvmOverloads constructor(
65+
public data class PartitionConfig(
6666
public val name: String? = null,
6767
public val dnsSuffix: String? = null,
6868
public val dualStackDnsSuffix: String? = null,
6969
public val supportsFIPS: Boolean? = null,
7070
public val supportsDualStack: Boolean? = null,
7171
public val implicitGlobalRegion: String? = null,
7272
) {
73+
@Deprecated("This constructor does not support implicitGlobalRegion") // but is added for backwards compatibility
74+
@JvmOverloads
75+
public constructor (
76+
name: String? = null,
77+
dnsSuffix: String? = null,
78+
dualStackDnsSuffix: String? = null,
79+
supportsFIPS: Boolean? = null,
80+
supportsDualStack: Boolean? = null,
81+
) : this(
82+
name,
83+
dnsSuffix,
84+
dualStackDnsSuffix,
85+
supportsFIPS,
86+
supportsDualStack,
87+
null,
88+
)
89+
7390
public fun mergeWith(other: PartitionConfig): PartitionConfig =
7491
PartitionConfig(
7592
other.name ?: name,

aws-runtime/aws-http/api/aws-http.api

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,15 @@ public final class aws/sdk/kotlin/runtime/http/interceptors/AddUserAgentMetadata
140140
public fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
141141
}
142142

143+
public final class aws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric : java/lang/Enum, aws/smithy/kotlin/runtime/businessmetrics/BusinessMetric {
144+
public static final field DDB_MAPPER Laws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric;
145+
public static final field S3_EXPRESS_BUCKET Laws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric;
146+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
147+
public fun getIdentifier ()Ljava/lang/String;
148+
public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric;
149+
public static fun values ()[Laws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric;
150+
}
151+
143152
public final class aws/sdk/kotlin/runtime/http/interceptors/AwsSpanInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
144153
public static final field INSTANCE Laws/sdk/kotlin/runtime/http/interceptors/AwsSpanInterceptor;
145154
public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

0 commit comments

Comments
 (0)