Skip to content

Commit 4b9b32c

Browse files
authored
refactor(codegen)!: Generate presigner into nested package for consistency (#502)
1 parent df5337a commit 4b9b32c

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/PresignerGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class PresignerGenerator : KotlinIntegration {
104104

105105
// If presignable operations found for this service, generate a Presigner file
106106
if (presignOperations.isNotEmpty()) {
107-
delegator.useFileWriter("Presigner.kt", ctx.settings.pkg.name) { writer ->
107+
delegator.useFileWriter("Presigners.kt", "${ctx.settings.pkg.name}.presigners") { writer ->
108108
renderPresigner(writer, ctx, httpBindingResolver, service.expectTrait<SigV4Trait>().name, presignOperations, defaultTimestampFormat)
109109
}
110110
}

codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/PresignerGeneratorTest.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ class PresignerGeneratorTest {
8181

8282
testContext.generationCtx.delegator.flushWriters()
8383
val testManifest = testContext.generationCtx.delegator.fileManifest as MockManifest
84-
val actual = testManifest.expectFileString("src/main/kotlin/smithy/kotlin/traits/Presigner.kt")
84+
val actual = testManifest.expectFileString("src/main/kotlin/smithy/kotlin/traits/presigners/Presigners.kt")
8585

8686
val expected = """
87-
package smithy.kotlin.traits
88-
87+
package smithy.kotlin.traits.presigners
88+
8989
import aws.sdk.kotlin.runtime.ClientException
9090
import aws.sdk.kotlin.runtime.auth.credentials.CredentialsProvider
9191
import aws.sdk.kotlin.runtime.auth.credentials.DefaultChainCredentialsProvider
@@ -97,6 +97,7 @@ class PresignerGeneratorTest {
9797
import aws.smithy.kotlin.runtime.client.ExecutionContext
9898
import aws.smithy.kotlin.runtime.http.QueryParameters
9999
import aws.smithy.kotlin.runtime.http.request.HttpRequest
100+
import smithy.kotlin.traits.TestClient
100101
import smithy.kotlin.traits.internal.DefaultEndpointResolver
101102
import smithy.kotlin.traits.model.GetFooRequest
102103
import smithy.kotlin.traits.model.PostFooRequest

services/polly/common/test/aws/sdk/kotlin/services/polly/PollyTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import aws.sdk.kotlin.runtime.testing.runSuspendTest
55
import aws.sdk.kotlin.services.polly.model.OutputFormat
66
import aws.sdk.kotlin.services.polly.model.SynthesizeSpeechRequest
77
import aws.sdk.kotlin.services.polly.model.VoiceId
8+
import aws.sdk.kotlin.services.polly.presigners.PollyPresignConfig
9+
import aws.sdk.kotlin.services.polly.presigners.presign
810
import aws.smithy.kotlin.runtime.http.HttpMethod
911
import kotlin.test.Test
1012
import kotlin.test.assertEquals

services/polly/e2eTest/PollyPresignerTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import aws.sdk.kotlin.runtime.http.engine.crt.CrtHttpEngine
44
import aws.sdk.kotlin.services.polly.model.OutputFormat
55
import aws.sdk.kotlin.services.polly.model.SynthesizeSpeechRequest
66
import aws.sdk.kotlin.services.polly.model.VoiceId
7+
import aws.sdk.kotlin.services.polly.presigners.presign
78
import aws.smithy.kotlin.runtime.http.response.complete
89
import aws.smithy.kotlin.runtime.http.sdkHttpClient
910
import aws.smithy.kotlin.runtime.testing.runSuspendTest

services/s3/e2eTest/S3PresignerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import aws.sdk.kotlin.runtime.testing.runSuspendTest
55
import aws.sdk.kotlin.services.s3.S3Client
66
import aws.sdk.kotlin.services.s3.model.GetObjectRequest
77
import aws.sdk.kotlin.services.s3.model.PutObjectRequest
8-
import aws.sdk.kotlin.services.s3.presign
8+
import aws.sdk.kotlin.services.s3.presigners.presign
99
import aws.smithy.kotlin.runtime.content.ByteStream
1010
import aws.smithy.kotlin.runtime.content.decodeToString
1111
import aws.smithy.kotlin.runtime.http.response.complete

services/sts/e2eTest/STSPresignerTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package aws.sdk.kotlin.services.sts
33
import aws.sdk.kotlin.runtime.http.engine.crt.CrtHttpEngine
44
import aws.sdk.kotlin.runtime.testing.runSuspendTest
55
import aws.sdk.kotlin.services.sts.model.GetCallerIdentityRequest
6+
import aws.sdk.kotlin.services.sts.presigners.presign
67
import aws.smithy.kotlin.runtime.http.response.complete
78
import aws.smithy.kotlin.runtime.http.sdkHttpClient
89
import org.junit.jupiter.api.TestInstance

0 commit comments

Comments
 (0)