Skip to content

Commit f390f6a

Browse files
committed
Remove dangerous gradle task, move sdk denylist check to codegen instead of runtime
1 parent d7a4877 commit f390f6a

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import software.amazon.smithy.kotlin.codegen.model.hasTrait
1111
import software.amazon.smithy.kotlin.codegen.model.traits.FailedResponseTrait
1212
import software.amazon.smithy.kotlin.codegen.model.traits.SuccessResponseTrait
1313
import software.amazon.smithy.kotlin.codegen.rendering.GradleWriter
14-
import software.amazon.smithy.kotlin.codegen.utils.dq
1514
import software.amazon.smithy.kotlin.codegen.utils.operations
1615
import software.amazon.smithy.model.shapes.ServiceShape
1716
import software.amazon.smithy.smoketests.traits.SmokeTestsTrait
@@ -83,10 +82,9 @@ class GradleGenerator : KotlinIntegration {
8382
}
8483

8584
private fun generateSmokeTestConfig(writer: GradleWriter, sdkId: String, ctx: CodegenContext) {
86-
val formattedDenyList = smokeTestDenyList.joinToString(",", "setOf(", ")") { it.dq() }
87-
writer.withBlock("if (#S !in #L) {", "}", sdkId, formattedDenyList) {
85+
if (sdkId !in smokeTestDenyList) {
8886
generateSmokeTestJarTask(writer, ctx)
89-
emptyLine()
87+
writer.emptyLine()
9088
generateSmokeTestTask(writer, ctx)
9189
}
9290
}

tests/codegen/smoke-tests/build.gradle.kts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import aws.sdk.kotlin.gradle.codegen.dsl.generateSmithyProjections
77
import aws.sdk.kotlin.gradle.codegen.dsl.smithyKotlinPlugin
88
import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionPath
99

10-
description = "Tests for smoke tests runner"
10+
description = "Tests for smoke tests runners"
1111
plugins {
1212
alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
1313
alias(libs.plugins.kotlin.jvm)
1414
}
1515

1616
val projections = listOf(
17-
ProjectionMetadata("successService", "smoke-tests-success.smithy", "com.test#SuccessService"),
18-
ProjectionMetadata("failureService", "smoke-tests-failure.smithy", "com.test#FailureService"),
17+
ProjectionMetadata("successService", "smoke-tests-success.smithy", "smithy.kotlin.traits#SuccessService"),
18+
ProjectionMetadata("failureService", "smoke-tests-failure.smithy", "smithy.kotlin.traits#FailureService"),
1919
)
2020

2121
configureProject()
@@ -93,14 +93,6 @@ fun configureTasks() {
9393
tasks.build {
9494
dependsOn(tasks.getByName("stageServices"))
9595
}
96-
97-
tasks.register<Exec>("unstageServices") {
98-
commandLine("git", "clean", "-fdx", "services")
99-
}
100-
101-
tasks.clean {
102-
dependsOn(tasks.getByName("unstageServices"))
103-
}
10496
}
10597

10698
/**

tests/codegen/smoke-tests/src/test/resources/smoke-tests-failure.smithy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$version: "2"
2-
namespace com.test
2+
namespace smithy.kotlin.traits
33

44
use aws.protocols#awsJson1_0
55
use aws.api#service

tests/codegen/smoke-tests/src/test/resources/smoke-tests-success.smithy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$version: "2"
2-
namespace com.test
2+
namespace smithy.kotlin.traits
33

44
use aws.protocols#awsJson1_0
55
use aws.api#service

0 commit comments

Comments
 (0)