Skip to content

Commit 21487eb

Browse files
committed
address PR reviews
1 parent ca01936 commit 21487eb

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

.changes/05ac561b-963f-4953-bb4f-1fc19fc1207c.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "05ac561b-963f-4953-bb4f-1fc19fc1207c",
33
"type": "feature",
4-
"description": "add regionProvider property to client config",
4+
"description": "Add `regionProvider` property to client config",
55
"issues": [
66
"awslabs/aws-sdk-kotlin#1478"
77
]

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsKotlinDependency.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ object AwsKotlinDependency {
4242
val AWS_CONFIG = KotlinDependency(GradleConfiguration.Api, AWS_CLIENT_RT_ROOT_NS, AWS_CLIENT_RT_GROUP, "aws-config", AWS_CLIENT_RT_VERSION)
4343
val AWS_ENDPOINT = KotlinDependency(GradleConfiguration.Api, "$AWS_CLIENT_RT_ROOT_NS.endpoint", AWS_CLIENT_RT_GROUP, "aws-endpoint", AWS_CLIENT_RT_VERSION)
4444
val AWS_HTTP = KotlinDependency(GradleConfiguration.Implementation, "$AWS_CLIENT_RT_ROOT_NS.http", AWS_CLIENT_RT_GROUP, "aws-http", AWS_CLIENT_RT_VERSION)
45-
val KOTLINX_COROUTINES = KotlinDependency(GradleConfiguration.Implementation, "kotlinx.coroutines", KOTLINX_COROUTINES_GROUP, "kotlinx-coroutines-core", KOTLINX_COROUTINES_VERSION)
4645
}
4746

4847
// remap aws-sdk-kotlin dependencies to project notation

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsRuntimeTypes.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ object AwsRuntimeTypes {
1818
val ClientException = symbol("ClientException")
1919
}
2020

21-
object Coroutines : RuntimeTypePackage(AwsKotlinDependency.KOTLINX_COROUTINES) {
22-
val runBlocking = symbol("runBlocking")
23-
}
24-
2521
object Endpoint : RuntimeTypePackage(AwsKotlinDependency.AWS_ENDPOINT) {
2622
object Functions : RuntimeTypePackage(AwsKotlinDependency.AWS_ENDPOINT, "functions") {
2723
val partitionFn = symbol("partition")

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsServiceConfigIntegration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ class AwsServiceConfigIntegration : KotlinIntegration {
3535
propertyType = ConfigPropertyType.Custom(
3636
render = { prop, writer ->
3737
writer.write(
38-
"override val #1L: #2T? = builder.#1L ?: #3T{ builder.regionProvider?.getRegion() ?: #4T() }",
38+
"override val #1L: #2T? = builder.#1L ?: #3T { builder.regionProvider?.getRegion() ?: #4T() }",
3939
prop.propertyName,
4040
prop.symbol,
41-
AwsRuntimeTypes.Coroutines.runBlocking,
41+
KotlinTypes.Coroutines.runBlocking,
4242
AwsRuntimeTypes.Config.Region.resolveRegion,
4343
)
4444
},

tests/codegen/event-stream/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ tasks.generateSmithyProjections {
9494
// ensure the generated tests use the same version of the runtime as the aws aws-runtime
9595
val smithyKotlinRuntimeVersion = libs.versions.smithy.kotlin.runtime.version.get()
9696
System.setProperty("smithy.kotlin.codegen.clientRuntimeVersion", smithyKotlinRuntimeVersion)
97+
98+
val smithyKotlinCoroutinesVersion = libs.versions.coroutines.version.get()
99+
System.setProperty("smithy.kotlin.codegen.kotlinCoroutinesVersion", smithyKotlinCoroutinesVersion)
97100
}
98101
}
99102

0 commit comments

Comments
 (0)