Skip to content

Commit b9a75f5

Browse files
aws-sdk-kotlin-ciianbotsf0marperezlauzadis
authored
Release merge (#1529)
* fix: enhance smoke test debuggability by echoing build output from inner Gradle runner (#1519) * misc: gradle mirror (#1486) * feat: improve coding style of DDBMapper auto-generated schemas (#1522) * misc: bump build plugin version (#1525) * chore: version bump (#1527) * chore: removing unused ECS container credentials integration test (#1509) --------- Co-authored-by: Ian Botsford <[email protected]> Co-authored-by: 0marperez <[email protected]> Co-authored-by: Matas <[email protected]>
1 parent 9dac546 commit b9a75f5

File tree

33 files changed

+61
-5122
lines changed

33 files changed

+61
-5122
lines changed

Diff for: ‎.changes/5a190de6-e9e5-4908-9bf9-62c34cf254f9.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"id": "5a190de6-e9e5-4908-9bf9-62c34cf254f9",
3+
"type": "bugfix",
4+
"description": "Bump the **smithy-kotlin** version to pick up a [bugfix for Endpoint Discovery](https://github.com/smithy-lang/smithy-kotlin/pull/1240)",
5+
"issues": [
6+
"awslabs/aws-sdk-kotlin#1413"
7+
]
8+
}

Diff for: ‎.changes/5fa3154d-1f42-4b98-9ad1-ef8ef1ad5fbc.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"id": "5fa3154d-1f42-4b98-9ad1-ef8ef1ad5fbc",
3+
"type": "feature",
4+
"description": "Improve the coding style of DynamoDB Mapper auto-generated schemas",
5+
"issues": [
6+
"https://github.com/awslabs/aws-sdk-kotlin/issues/1521"
7+
]
8+
}

Diff for: ‎.github/workflows/codebuild-ci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ jobs:
8585
with:
8686
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
8787
aws-region: us-west-2
88+
- name: Configure Gradle
89+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
8890
- name: Run Service Check Batch and Calculate Artifact Size Metrics
8991
id: svc-check-batch
9092
run: |
@@ -212,6 +214,8 @@ jobs:
212214
with:
213215
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
214216
aws-region: us-west-2
217+
- name: Configure Gradle
218+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
215219
- name: Calculate Artifact Size Metrics
216220
id: svc-check-batch
217221
run: |

Diff for: ‎.github/workflows/continuous-integration.yml

+12
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ jobs:
3333
path: 'aws-sdk-kotlin'
3434
- name: Setup Build
3535
uses: ./aws-sdk-kotlin/.github/actions/setup-build
36+
- name: Configure Gradle
37+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
38+
with:
39+
working-directory: ./aws-sdk-kotlin
3640
- name: Test
3741
working-directory: ./aws-sdk-kotlin
3842
shell: bash
@@ -60,6 +64,10 @@ jobs:
6064
path: 'aws-sdk-kotlin'
6165
- name: Setup Build
6266
uses: ./aws-sdk-kotlin/.github/actions/setup-build
67+
- name: Configure Gradle - smithy-kotlin
68+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
69+
with:
70+
working-directory: ./smithy-kotlin
6371
- name: Build smithy-kotlin
6472
working-directory: ./smithy-kotlin
6573
shell: bash
@@ -68,6 +76,10 @@ jobs:
6876
pwd
6977
./gradlew --parallel assemble
7078
./gradlew publishToMavenLocal
79+
- name: Configure Gradle aws-sdk-kotlin
80+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
81+
with:
82+
working-directory: ./aws-sdk-kotlin
7183
- name: Test
7284
working-directory: ./aws-sdk-kotlin
7385
shell: bash

Diff for: ‎.github/workflows/kat-transform.yml

+5
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ jobs:
3838
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
3939
aws-region: us-west-2
4040

41+
- name: Configure Gradle
42+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
43+
with:
44+
working-directory: ./aws-sdk-kotlin
45+
4146
- name: Setup kat
4247
uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
4348

Diff for: ‎.github/workflows/lint.yml

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
steps:
2222
- name: Checkout sources
2323
uses: actions/checkout@v4
24+
- name: Configure Gradle
25+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
2426
- name: Lint ${{ env.PACKAGE_NAME }}
2527
run: |
2628
./gradlew ktlint

Diff for: ‎.github/workflows/update-release-branch.yml

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ jobs:
4343
distribution: 'corretto'
4444
java-version: 17
4545
cache: 'gradle'
46+
- name: Configure Gradle
47+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
4648
- name: Check merge base
4749
shell: bash
4850
run: |

Diff for: ‎examples/gradle/wrapper/gradle-wrapper.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
# Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties
4+
distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip
45
networkTimeout=10000
56
validateDistributionUrl=true
67
zipStoreBase=GRADLE_USER_HOME

Diff for: ‎gradle/libs.versions.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ ksp-version = "2.1.0-1.0.29" # Keep in sync with kotlin-version
44

55
dokka-version = "1.9.10"
66

7-
aws-kotlin-repo-tools-version = "0.4.18"
7+
aws-kotlin-repo-tools-version = "0.4.20"
88

99
# libs
1010
coroutines-version = "1.9.0"
1111
atomicfu-version = "0.25.0"
1212
binary-compatibility-validator-version = "0.16.3"
1313

1414
# smithy-kotlin codegen and runtime are versioned separately
15-
smithy-kotlin-runtime-version = "1.4.2"
16-
smithy-kotlin-codegen-version = "0.34.2"
15+
smithy-kotlin-runtime-version = "1.4.3"
16+
smithy-kotlin-codegen-version = "0.34.3"
1717

1818
# codegen
1919
smithy-version = "1.53.0"

Diff for: ‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

Diff for: ‎hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/rendering/SchemaRenderer.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ internal class SchemaRenderer(
161161

162162
// converter
163163
renderValueConverter(prop.type.resolve())
164-
write("")
164+
write(",")
165165
}
166166
}
167167

@@ -291,7 +291,7 @@ internal class SchemaRenderer(
291291

292292
write("@#T", Types.Smithy.ExperimentalApi)
293293
withBlock("#Lobject #L : #T {", "}", ctx.attributes.visibility, schemaName, schemaType) {
294-
write("override val converter : #1T = #1T", itemConverter)
294+
write("override val converter: #1T = #1T", itemConverter)
295295
write("override val partitionKey: #T = #T(#S)", MapperTypes.Items.keySpec(partitionKeyProp.keySpec), partitionKeyProp.keySpecType, partitionKeyName)
296296
if (sortKeyProp != null) {
297297
write("override val sortKey: #T = #T(#S)", MapperTypes.Items.keySpec(sortKeyProp.keySpec), sortKeyProp.keySpecType, sortKeyName!!)

Diff for: ‎hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt

+11-11
Original file line numberDiff line numberDiff line change
@@ -106,25 +106,25 @@ class SchemaGeneratorPluginTest {
106106
"id",
107107
User::id,
108108
UserBuilder::id::set,
109-
IntConverter
109+
IntConverter,
110110
),
111111
AttributeDescriptor(
112112
"fName",
113113
User::givenName,
114114
UserBuilder::givenName::set,
115-
StringConverter
115+
StringConverter,
116116
),
117117
AttributeDescriptor(
118118
"lName",
119119
User::surname,
120120
UserBuilder::surname::set,
121-
StringConverter
121+
StringConverter,
122122
),
123123
AttributeDescriptor(
124124
"age",
125125
User::age,
126126
UserBuilder::age::set,
127-
IntConverter
127+
IntConverter,
128128
),
129129
),
130130
)
@@ -136,7 +136,7 @@ class SchemaGeneratorPluginTest {
136136
schemaContents,
137137
"""
138138
object UserSchema : ItemSchema.PartitionKey<User, Int> {
139-
override val converter : UserConverter = UserConverter
139+
override val converter: UserConverter = UserConverter
140140
override val partitionKey: KeySpec<Number> = aws.sdk.kotlin.hll.dynamodbmapper.items.KeySpec.Number("id")
141141
}
142142
""".trimIndent(),
@@ -173,25 +173,25 @@ class SchemaGeneratorPluginTest {
173173
"id",
174174
BuilderNotRequired::id,
175175
BuilderNotRequired::id::set,
176-
IntConverter
176+
IntConverter,
177177
),
178178
AttributeDescriptor(
179179
"fName",
180180
BuilderNotRequired::givenName,
181181
BuilderNotRequired::givenName::set,
182-
StringConverter
182+
StringConverter,
183183
),
184184
AttributeDescriptor(
185185
"lName",
186186
BuilderNotRequired::surname,
187187
BuilderNotRequired::surname::set,
188-
StringConverter
188+
StringConverter,
189189
),
190190
AttributeDescriptor(
191191
"age",
192192
BuilderNotRequired::age,
193193
BuilderNotRequired::age::set,
194-
IntConverter
194+
IntConverter,
195195
),
196196
),
197197
)
@@ -414,7 +414,7 @@ class SchemaGeneratorPluginTest {
414414
schemaContents,
415415
"""
416416
public object CustomUserSchema : ItemSchema.PartitionKey<CustomUser, Int> {
417-
override val converter : MyCustomUserConverter = MyCustomUserConverter
417+
override val converter: MyCustomUserConverter = MyCustomUserConverter
418418
override val partitionKey: KeySpec<Number> = aws.sdk.kotlin.hll.dynamodbmapper.items.KeySpec.Number("id")
419419
}
420420
""".trimIndent(),
@@ -570,7 +570,7 @@ class SchemaGeneratorPluginTest {
570570
schemaContents,
571571
"""
572572
object RenamedPartitionKeySchema : ItemSchema.PartitionKey<RenamedPartitionKey, Int> {
573-
override val converter : RenamedPartitionKeyConverter = RenamedPartitionKeyConverter
573+
override val converter: RenamedPartitionKeyConverter = RenamedPartitionKeyConverter
574574
override val partitionKey: KeySpec<Number> = aws.sdk.kotlin.hll.dynamodbmapper.items.KeySpec.Number("user_id")
575575
}
576576
""".trimIndent(),

Diff for: ‎tests/codegen/smoke-tests/src/test/kotlin/aws/sdk/kotlin/test/codegen/smoketest/SmokeTestE2ETest.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ class SmokeTestE2ETest {
3434

3535
assertContains(smokeTestRunnerOutput, "not ok ExceptionService ExceptionTest - no error expected from service")
3636
assertContains(smokeTestRunnerOutput, "#aws.smithy.kotlin.runtime.http.interceptors.SmokeTestsFailureException: Smoke test failed with HTTP status code: 400")
37-
assertContains(smokeTestRunnerOutput, "#\tat aws.smithy.kotlin.runtime.http.interceptors.SmokeTestsInterceptor.readBeforeDeserialization(SmokeTestsInterceptor.kt:19)")
38-
assertContains(smokeTestRunnerOutput, "#\tat aws.smithy.kotlin.runtime.http.interceptors.InterceptorExecutor.readBeforeDeserialization(InterceptorExecutor.kt:252)")
3937
}
4038

4139
@Test
@@ -72,6 +70,7 @@ private fun runSmokeTests(
7270
":tests:codegen:smoke-tests:services:$service:smokeTest",
7371
)
7472
.withEnvironment(envVars)
73+
.forwardOutput()
7574

7675
val buildResult = if (expectingFailure) task.buildAndFail() else task.build()
7776

Diff for: ‎tests/integration-tests/ecs-credentials/.gitattributes

-6
This file was deleted.

Diff for: ‎tests/integration-tests/ecs-credentials/.gitignore

-17
This file was deleted.

Diff for: ‎tests/integration-tests/ecs-credentials/.npmignore

-6
This file was deleted.

Diff for: ‎tests/integration-tests/ecs-credentials/README.md

-70
This file was deleted.

Diff for: ‎tests/integration-tests/ecs-credentials/app/Dockerfile

-9
This file was deleted.

0 commit comments

Comments
 (0)