chore: bump version for m0 release (#94)

aajtodd · web-flow · commit b8d5d824c6f0 · 2021-03-18T13:10:09.000-04:00
diff --git a/client-runtime/auth/build.gradle.kts b/client-runtime/auth/build.gradle.kts
@@ -7,15 +7,15 @@ description = "AWS Service Authentication"
 extra["displayName"] = "Software :: AWS :: Kotlin SDK :: Auth"
 extra["moduleName"] = "aws.sdk.kotlin.runtime.auth"
 
-val smithyKotlinClientRtVersion: String by project
+val smithyKotlinVersion: String by project
 
 kotlin {
     sourceSets {
         commonMain {
             dependencies {
                 val crtKotlinVersion: String by project
                 api(project(":client-runtime:aws-client-rt"))
-                api("software.aws.smithy.kotlin:http:$smithyKotlinClientRtVersion")
+                api("software.aws.smithy.kotlin:http:$smithyKotlinVersion")
                 implementation(project(":client-runtime:crt-util"))
                 implementation("aws.sdk.kotlin.crt:aws-crt-kotlin:$crtKotlinVersion")
             }
diff --git a/client-runtime/aws-client-rt/build.gradle.kts b/client-runtime/aws-client-rt/build.gradle.kts
@@ -8,13 +8,13 @@ extra["displayName"] = "Software :: AWS :: Kotlin SDK :: Client Runtime"
 extra["moduleName"] = "aws.sdk.kotlin.runtime"
 
 
-val smithyKotlinClientRtVersion: String by project
+val smithyKotlinVersion: String by project
 
 kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api("software.aws.smithy.kotlin:client-rt-core:$smithyKotlinClientRtVersion")
+                api("software.aws.smithy.kotlin:client-rt-core:$smithyKotlinVersion")
             }
         }
     }
diff --git a/client-runtime/crt-util/build.gradle.kts b/client-runtime/crt-util/build.gradle.kts
@@ -7,7 +7,7 @@ description = "Utilities for working with AWS CRT Kotlin"
 extra["displayName"] = "Software :: AWS :: Kotlin SDK :: CRT :: Util"
 extra["moduleName"] = "aws.sdk.kotlin.runtime.crt"
 
-val smithyKotlinClientRtVersion: String by project
+val smithyKotlinVersion: String by project
 val crtKotlinVersion: String by project
 
 kotlin {
@@ -16,7 +16,7 @@ kotlin {
             dependencies {
                 api(project(":client-runtime:aws-client-rt"))
                 api("aws.sdk.kotlin.crt:aws-crt-kotlin:$crtKotlinVersion")
-                api("software.aws.smithy.kotlin:http:$smithyKotlinClientRtVersion")
+                api("software.aws.smithy.kotlin:http:$smithyKotlinVersion")
             }
         }
     }
diff --git a/client-runtime/protocols/aws-json-protocols/build.gradle.kts b/client-runtime/protocols/aws-json-protocols/build.gradle.kts
@@ -7,18 +7,18 @@ description = "Support for the JSON suite of AWS protocols"
 extra["displayName"] = "Software :: AWS :: Kotlin SDK :: JSON"
 extra["moduleName"] = "aws.sdk.kotlin.runtime.protocol.json"
 
-val smithyKotlinClientRtVersion: String by project
+val smithyKotlinVersion: String by project
 
 kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api("software.aws.smithy.kotlin:http:$smithyKotlinClientRtVersion")
+                api("software.aws.smithy.kotlin:http:$smithyKotlinVersion")
                 api(project(":client-runtime:aws-client-rt"))
                 implementation(project(":client-runtime:protocols:http"))
-                implementation("software.aws.smithy.kotlin:serde:$smithyKotlinClientRtVersion")
-                implementation("software.aws.smithy.kotlin:serde-json:$smithyKotlinClientRtVersion")
-                implementation("software.aws.smithy.kotlin:utils:$smithyKotlinClientRtVersion")
+                implementation("software.aws.smithy.kotlin:serde:$smithyKotlinVersion")
+                implementation("software.aws.smithy.kotlin:serde-json:$smithyKotlinVersion")
+                implementation("software.aws.smithy.kotlin:utils:$smithyKotlinVersion")
             }
         }
 
diff --git a/client-runtime/protocols/aws-json-protocols/common/src/aws/sdk/kotlin/runtime/protocol/json/RestJsonError.kt b/client-runtime/protocols/aws-json-protocols/common/src/aws/sdk/kotlin/runtime/protocol/json/RestJsonError.kt
@@ -66,7 +66,7 @@ public class RestJsonError(private val registry: ExceptionRegistry) : Feature {
                 error = RestJsonErrorDeserializer.deserialize(httpResponse, payload)
             } catch (ex: Exception) {
                 throw UnknownServiceErrorException(
-                    "failed to parse response as restJson protocol error",
+                    "failed to parse response as Json protocol error",
                     ex
                 ).also {
                     setAseFields(it, wrappedResponse, null)
@@ -76,7 +76,7 @@ public class RestJsonError(private val registry: ExceptionRegistry) : Feature {
             // we already consumed the response body, wrap it to allow the modeled exception to deserialize
             // any members that may be bound to the document
             val deserializer = registry[error.code]?.deserializer
-            val modeledException = deserializer?.deserialize(req.context, wrappedResponse) ?: UnknownServiceErrorException()
+            val modeledException = deserializer?.deserialize(req.context, wrappedResponse) ?: UnknownServiceErrorException(error.message).also { setAseFields(it, wrappedResponse, error) }
             setAseFields(modeledException, wrappedResponse, error)
 
             // this should never happen...
diff --git a/client-runtime/protocols/aws-json-protocols/common/test/aws/sdk/kotlin/runtime/protocol/json/RestJsonErrorTest.kt b/client-runtime/protocols/aws-json-protocols/common/test/aws/sdk/kotlin/runtime/protocol/json/RestJsonErrorTest.kt
@@ -242,6 +242,6 @@ class RestJsonErrorTest {
         // verify it pulls out the error details/meta
         assertEquals(ex.errorCode, "")
         assertEquals(ex.requestId, "guid")
-        assertEquals(ex.message, "failed to parse response as restJson protocol error")
+        assertEquals(ex.message, "failed to parse response as Json protocol error")
     }
 }
diff --git a/client-runtime/protocols/build.gradle.kts b/client-runtime/protocols/build.gradle.kts
@@ -1,3 +1,3 @@
 kotlin {
     jvm() // Create a JVM target with the default name 'jvm'
-}
+}
diff --git a/client-runtime/protocols/http/build.gradle.kts b/client-runtime/protocols/http/build.gradle.kts
@@ -7,15 +7,15 @@ description = "HTTP core for AWS service clients"
 extra["displayName"] = "Software :: AWS :: Kotlin SDK :: HTTP"
 extra["moduleName"] = "aws.sdk.kotlin.runtime.http"
 
-val smithyKotlinClientRtVersion: String by project
+val smithyKotlinVersion: String by project
 
 kotlin {
     sourceSets {
         commonMain {
             dependencies {
                 api(project(":client-runtime:aws-client-rt"))
                 api(project(":client-runtime:regions"))
-                api("software.aws.smithy.kotlin:http:$smithyKotlinClientRtVersion")
+                api("software.aws.smithy.kotlin:http:$smithyKotlinVersion")
             }
         }
 
diff --git a/client-runtime/testing/build.gradle.kts b/client-runtime/testing/build.gradle.kts
@@ -3,4 +3,4 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
-description = "Internal test utilities"
+description = "Internal test utilities"
diff --git a/codegen/protocol-tests/build.gradle.kts b/codegen/protocol-tests/build.gradle.kts
@@ -33,9 +33,9 @@ tasks["smithyBuildJar"].enabled = false
 
 tasks.create<SmithyBuild>("buildSdk") {
     // ensure the generated clients use the same version of the runtime as the aws client-runtime
-    val smithyKotlinClientRtVersion: String by project
+    val smithyKotlinVersion: String by project
     doFirst {
-        System.setProperty("smithy.kotlin.codegen.clientRuntimeVersion", smithyKotlinClientRtVersion)
+        System.setProperty("smithy.kotlin.codegen.clientRuntimeVersion", smithyKotlinVersion)
     }
     addRuntimeClasspath = true
 }
diff --git a/codegen/sdk/build.gradle.kts b/codegen/sdk/build.gradle.kts
@@ -165,9 +165,9 @@ task("generateSmithyBuild") {
 
 tasks.create<SmithyBuild>("generateSdk") {
     // ensure the generated clients use the same version of the runtime as the aws client-runtime
-    val smithyKotlinClientRtVersion: String by project
+    val smithyKotlinVersion: String by project
     doFirst {
-        System.setProperty("smithy.kotlin.codegen.clientRuntimeVersion", smithyKotlinClientRtVersion)
+        System.setProperty("smithy.kotlin.codegen.clientRuntimeVersion", smithyKotlinVersion)
     }
 
     addRuntimeClasspath = true
diff --git a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
@@ -7,9 +7,10 @@ plugins {
     jacoco
 }
 
+val sdkVersion: String by project
 description = "Codegen support for AWS protocols"
 group = "software.amazon.smithy"
-version = "0.1.0"
+version = sdkVersion
 
 val smithyVersion: String by project
 val kotestVersion: String by project
@@ -26,8 +27,21 @@ dependencies {
     testImplementation("io.kotest:kotest-assertions-core-jvm:$kotestVersion")
 }
 
+val generateSdkRuntimeVersion by tasks.registering {
+    // generate the version of the runtime to use as a resource.
+    // this keeps us from having to manually change version numbers in multiple places
+    val resourcesDir = "$buildDir/resources/main/aws/sdk/kotlin/codegen"
+    val versionFile = file("$resourcesDir/sdk-version.txt")
+    outputs.file(versionFile)
+    sourceSets.main.get().output.dir(resourcesDir)
+    doLast {
+        versionFile.writeText("$version")
+    }
+}
+
 tasks.compileKotlin {
     kotlinOptions.jvmTarget = kotlinJVMTargetVersion
+    dependsOn(generateSdkRuntimeVersion)
 }
 
 tasks.compileTestKotlin {
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsKotlinDependency.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsKotlinDependency.kt
@@ -4,19 +4,32 @@
  */
 package aws.sdk.kotlin.codegen
 
+import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.kotlin.codegen.GradleConfiguration
 import software.amazon.smithy.kotlin.codegen.KotlinDependency
+import software.amazon.smithy.kotlin.codegen.isValidVersion
 
 // root namespace for the AWS client-runtime
 const val AWS_CLIENT_RT_ROOT_NS = "aws.sdk.kotlin.runtime"
 const val AWS_CLIENT_RT_AUTH_NS = "aws.sdk.kotlin.runtime.auth"
 const val AWS_CLIENT_RT_REGIONS_NS = "aws.sdk.kotlin.runtime.regions"
 
+private fun getDefaultRuntimeVersion(): String {
+    // generated as part of the build, see smithy-aws-kotlin-codegen/build.gradle.kts
+    try {
+        val version = object {}.javaClass.getResource("sdk-version.txt").readText()
+        check(isValidVersion(version)) { "Version parsed from sdk-version.txt '$version' is not a valid version string" }
+        return version
+    } catch (ex: Exception) {
+        throw CodegenException("failed to load sdk-version.txt which sets the default aws-client-runtime version", ex)
+    }
+}
+
 // publishing info
 const val AWS_CLIENT_RT_GROUP: String = "aws.sdk.kotlin"
 // note: this version doesn't really matter since we substitute it for project dependency notation
-// when generating client build files
-const val AWS_CLIENT_RT_VERSION: String = "0.1.0"
+// when generating client build files (it is used by protocol tests though)
+val AWS_CLIENT_RT_VERSION: String = getDefaultRuntimeVersion()
 
 /**
  * Container object for AWS specific dependencies
diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,13 @@
 kotlin.code.style=official
 
 # sdk
-sdkVersion=0.1.0
+sdkVersion=0.1.0-M0
 
 # codegen
 smithyVersion=1.6.1
 smithyGradleVersion=0.5.2
-smithyKotlinVersion=0.1.0
+# smithy-kotlin codegen and runtime are versioned together
+smithyKotlinVersion=0.1.0-M0
 
 # kotlin
 kotlinVersion=1.4.31
@@ -18,9 +19,8 @@ kotlinJVMTargetVersion=1.8
 # kotlin libraries
 coroutinesVersion=1.4.3
 
-# default smithy-kotlin:client-runtime library version
-smithyKotlinClientRtVersion=0.1.0
-crtKotlinVersion=0.1.0
+# crt
+crtKotlinVersion=0.1.0-M0
 
 # testing/utility
 junitVersion=5.6.2

Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,13 @@ extra["displayName"] = "Software :: AWS :: Kotlin SDK :: Client Runtime"`
`8`	`8`	`extra["moduleName"] = "aws.sdk.kotlin.runtime"`
`9`	`9`
`10`	`10`
`11`		`-val smithyKotlinClientRtVersion: String by project`
	`11`	`+val smithyKotlinVersion: String by project`
`12`	`12`
`13`	`13`	`kotlin {`
`14`	`14`	`sourceSets {`
`15`	`15`	`commonMain {`
`16`	`16`	`dependencies {`
`17`		`- api("software.aws.smithy.kotlin:client-rt-core:$smithyKotlinClientRtVersion")`
	`17`	`+ api("software.aws.smithy.kotlin:client-rt-core:$smithyKotlinVersion")`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ description = "Utilities for working with AWS CRT Kotlin"`
`7`	`7`	`extra["displayName"] = "Software :: AWS :: Kotlin SDK :: CRT :: Util"`
`8`	`8`	`extra["moduleName"] = "aws.sdk.kotlin.runtime.crt"`
`9`	`9`
`10`		`-val smithyKotlinClientRtVersion: String by project`
	`10`	`+val smithyKotlinVersion: String by project`
`11`	`11`	`val crtKotlinVersion: String by project`
`12`	`12`
`13`	`13`	`kotlin {`
`@@ -16,7 +16,7 @@ kotlin {`
`16`	`16`	`dependencies {`
`17`	`17`	`api(project(":client-runtime:aws-client-rt"))`
`18`	`18`	`api("aws.sdk.kotlin.crt:aws-crt-kotlin:$crtKotlinVersion")`
`19`		`- api("software.aws.smithy.kotlin:http:$smithyKotlinClientRtVersion")`
	`19`	`+ api("software.aws.smithy.kotlin:http:$smithyKotlinVersion")`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,6 @@ class RestJsonErrorTest {`
`242`	`242`	`// verify it pulls out the error details/meta`
`243`	`243`	`assertEquals(ex.errorCode, "")`
`244`	`244`	`assertEquals(ex.requestId, "guid")`
`245`		`- assertEquals(ex.message, "failed to parse response as restJson protocol error")`
	`245`	`+ assertEquals(ex.message, "failed to parse response as Json protocol error")`
`246`	`246`	`}`
`247`	`247`	`}`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 kotlin {
     jvm() // Create a JVM target with the default name 'jvm'
 -}
 +}
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ tasks["smithyBuildJar"].enabled = false`
`33`	`33`
`34`	`34`	`tasks.create<SmithyBuild>("buildSdk") {`
`35`	`35`	`// ensure the generated clients use the same version of the runtime as the aws client-runtime`
`36`		`- val smithyKotlinClientRtVersion: String by project`
	`36`	`+ val smithyKotlinVersion: String by project`
`37`	`37`	`doFirst {`
`38`		`- System.setProperty("smithy.kotlin.codegen.clientRuntimeVersion", smithyKotlinClientRtVersion)`
	`38`	`+ System.setProperty("smithy.kotlin.codegen.clientRuntimeVersion", smithyKotlinVersion)`
`39`	`39`	`}`
`40`	`40`	`addRuntimeClasspath = true`
`41`	`41`	`}`