Skip to content

Commit f0dd98c

Browse files
committed
fix(codegen): read values from Prop suffix
1 parent d0a53f5 commit f0dd98c

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

codegen/sdk-codegen/build.gradle.kts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ tasks["jar"].enabled = false
6565
tasks["smithyBuild"].enabled = false
6666

6767
val buildSdk = tasks.register<SmithyBuildTask>("buildSdk") {
68-
val clientNameProp: String? = project.findProperty("clientName")?.toString()
68+
val clientNameProp: String? = project.findProperty("clientNameProp")?.toString()
6969
if (!(clientNameProp?.isEmpty() ?: true)) {
7070
smithyBuildConfigs.set(files("smithy-build-" + clientNameProp + ".json"))
7171
outputDir.set(file("build-single/" + clientNameProp))
@@ -162,17 +162,19 @@ abstract class GenerateSmithyBuildTask : DefaultTask() {
162162
}
163163

164164
val generateSmithyBuild = tasks.register<GenerateSmithyBuildTask>("generate-smithy-build") {
165-
val clientNameProp = providers.gradleProperty("clientName")
166-
val modelsDirProp = providers.gradleProperty("modelsDir").orElse("aws-models")
165+
val clientNameProp = providers.gradleProperty("clientNameProp")
166+
val modelsDirProp = providers.gradleProperty("modelsDirProp").orElse("aws-models")
167167

168168
clientName.set(clientNameProp)
169169
modelsDir.set(modelsDirProp)
170170
modelsDirPath.set(layout.projectDirectory.dir(modelsDirProp))
171171
templateFile.set(layout.projectDirectory.file("../smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/package.json.template"))
172172

173-
val buildFileName = clientNameProp.map { name ->
174-
if (!name.isNullOrEmpty()) "smithy-build-$name.json" else "smithy-build.json"
175-
}.orElse("smithy-build.json")
173+
val buildFileName = if (clientNameProp.isPresent && clientNameProp.get().isNotEmpty()) {
174+
"smithy-build-${clientNameProp.get()}.json"
175+
} else {
176+
"smithy-build.json"
177+
}
176178

177179
buildFile.set(layout.projectDirectory.file(buildFileName))
178180
}

0 commit comments

Comments
 (0)