fix!: switch from ULong to Long in public presigner API for better java interop (#359)

Author: kggilmer

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

@@ -291,10 +291,10 @@ class PresignerGenerator : KotlinIntegration {
         presignConfigFnVisitor: PresignConfigFnVisitor,
         contextMap: Map<String, Any?>
     ) {
-        writer.withBlock("private suspend fun $requestConfigFnName(input: $requestTypeName, durationSeconds: ULong) : PresignedRequestConfig {", "}\n") {
+        writer.withBlock("private suspend fun $requestConfigFnName(input: $requestTypeName, durationSeconds: Long) : PresignedRequestConfig {", "}\n") {
 
             writer.declareSection(PresignConfigFnSection, contextMap) {
-                write("require(durationSeconds > 0u) { \"duration must be greater than zero\" }")
+                write("require(durationSeconds > 0) { \"duration must be greater than zero\" }")
                 write("val httpRequestBuilder = #T().serialize(ExecutionContext.build {  }, input)", serializerSymbol)
 
                 writer.withBlock("return PresignedRequestConfig(", ")") {
@@ -322,8 +322,8 @@ class PresignerGenerator : KotlinIntegration {
             write("@param durationSeconds the amount of time from signing for which the request is valid, with seconds granularity.")
             write("@return The [HttpRequest] that can be invoked within the specified time window.")
         }
-        // FIXME ~ Replace or add additional function, swap ULong type for kotlin.time.Duration when type becomes stable
-        writer.withBlock("suspend fun $requestTypeName.presign(config: $serviceClientTypeName.Config, durationSeconds: ULong): HttpRequest {", "}\n") {
+        // FIXME ~ Replace or add additional function, swap Long type for kotlin.time.Duration when type becomes stable
+        writer.withBlock("suspend fun $requestTypeName.presign(config: $serviceClientTypeName.Config, durationSeconds: Long): HttpRequest {", "}\n") {
             withBlock("val presignConfig = $presignConfigTypeName {", "}") {
                 write("credentialsProvider = config.credentialsProvider")
                 write("endpointResolver = config.endpointResolver")
@@ -340,8 +340,8 @@ class PresignerGenerator : KotlinIntegration {
             write("@param durationSeconds the amount of time from signing for which the request is valid, with seconds granularity.")
             write("@return The [HttpRequest] that can be invoked within the specified time window.")
         }
-        // FIXME ~ Replace or add additional function, swap ULong type for kotlin.time.Duration when type becomes stable
-        writer.withBlock("suspend fun $requestTypeName.presign(presignConfig: ServicePresignConfig, durationSeconds: ULong): HttpRequest {", "}\n") {
+        // FIXME ~ Replace or add additional function, swap Long type for kotlin.time.Duration when type becomes stable
+        writer.withBlock("suspend fun $requestTypeName.presign(presignConfig: ServicePresignConfig, durationSeconds: Long): HttpRequest {", "}\n") {
             write("return createPresignedRequest(presignConfig, $requestConfigFnName(this, durationSeconds))")
         }
     }

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

@@ -111,7 +111,7 @@ class PresignerGeneratorTest {
              * @param durationSeconds the amount of time from signing for which the request is valid, with seconds granularity.
              * @return The [HttpRequest] that can be invoked within the specified time window.
              */
-            suspend fun GetFooRequest.presign(presignConfig: ServicePresignConfig, durationSeconds: ULong): HttpRequest {
+            suspend fun GetFooRequest.presign(presignConfig: ServicePresignConfig, durationSeconds: Long): HttpRequest {
                 return createPresignedRequest(presignConfig, getFooPresignConfig(this, durationSeconds))
             }
             
@@ -121,7 +121,7 @@ class PresignerGeneratorTest {
              * @param durationSeconds the amount of time from signing for which the request is valid, with seconds granularity.
              * @return The [HttpRequest] that can be invoked within the specified time window.
              */
-            suspend fun GetFooRequest.presign(config: TestClient.Config, durationSeconds: ULong): HttpRequest {
+            suspend fun GetFooRequest.presign(config: TestClient.Config, durationSeconds: Long): HttpRequest {
                 val presignConfig = TestPresignConfig {
                     credentialsProvider = config.credentialsProvider
                     endpointResolver = config.endpointResolver
@@ -130,8 +130,8 @@ class PresignerGeneratorTest {
                 return createPresignedRequest(presignConfig, getFooPresignConfig(this, durationSeconds))
             }
             
-            private suspend fun getFooPresignConfig(input: GetFooRequest, durationSeconds: ULong) : PresignedRequestConfig {
-                require(durationSeconds > 0u) { "duration must be greater than zero" }
+            private suspend fun getFooPresignConfig(input: GetFooRequest, durationSeconds: Long) : PresignedRequestConfig {
+                require(durationSeconds > 0) { "duration must be greater than zero" }
                 val httpRequestBuilder = GetFooOperationSerializer().serialize(ExecutionContext.build {  }, input)
                 return PresignedRequestConfig(
                     httpRequestBuilder.method,
@@ -149,7 +149,7 @@ class PresignerGeneratorTest {
              * @param durationSeconds the amount of time from signing for which the request is valid, with seconds granularity.
              * @return The [HttpRequest] that can be invoked within the specified time window.
              */
-            suspend fun PostFooRequest.presign(presignConfig: ServicePresignConfig, durationSeconds: ULong): HttpRequest {
+            suspend fun PostFooRequest.presign(presignConfig: ServicePresignConfig, durationSeconds: Long): HttpRequest {
                 return createPresignedRequest(presignConfig, postFooPresignConfig(this, durationSeconds))
             }
             
@@ -159,7 +159,7 @@ class PresignerGeneratorTest {
              * @param durationSeconds the amount of time from signing for which the request is valid, with seconds granularity.
              * @return The [HttpRequest] that can be invoked within the specified time window.
              */
-            suspend fun PostFooRequest.presign(config: TestClient.Config, durationSeconds: ULong): HttpRequest {
+            suspend fun PostFooRequest.presign(config: TestClient.Config, durationSeconds: Long): HttpRequest {
                 val presignConfig = TestPresignConfig {
                     credentialsProvider = config.credentialsProvider
                     endpointResolver = config.endpointResolver
@@ -168,8 +168,8 @@ class PresignerGeneratorTest {
                 return createPresignedRequest(presignConfig, postFooPresignConfig(this, durationSeconds))
             }
             
-            private suspend fun postFooPresignConfig(input: PostFooRequest, durationSeconds: ULong) : PresignedRequestConfig {
-                require(durationSeconds > 0u) { "duration must be greater than zero" }
+            private suspend fun postFooPresignConfig(input: PostFooRequest, durationSeconds: Long) : PresignedRequestConfig {
+                require(durationSeconds > 0) { "duration must be greater than zero" }
                 val httpRequestBuilder = PostFooOperationSerializer().serialize(ExecutionContext.build {  }, input)
                 return PresignedRequestConfig(
                     httpRequestBuilder.method,
@@ -187,7 +187,7 @@ class PresignerGeneratorTest {
              * @param durationSeconds the amount of time from signing for which the request is valid, with seconds granularity.
              * @return The [HttpRequest] that can be invoked within the specified time window.
              */
-            suspend fun PutFooRequest.presign(presignConfig: ServicePresignConfig, durationSeconds: ULong): HttpRequest {
+            suspend fun PutFooRequest.presign(presignConfig: ServicePresignConfig, durationSeconds: Long): HttpRequest {
                 return createPresignedRequest(presignConfig, putFooPresignConfig(this, durationSeconds))
             }
             
@@ -197,7 +197,7 @@ class PresignerGeneratorTest {
              * @param durationSeconds the amount of time from signing for which the request is valid, with seconds granularity.
              * @return The [HttpRequest] that can be invoked within the specified time window.
              */
-            suspend fun PutFooRequest.presign(config: TestClient.Config, durationSeconds: ULong): HttpRequest {
+            suspend fun PutFooRequest.presign(config: TestClient.Config, durationSeconds: Long): HttpRequest {
                 val presignConfig = TestPresignConfig {
                     credentialsProvider = config.credentialsProvider
                     endpointResolver = config.endpointResolver
@@ -206,8 +206,8 @@ class PresignerGeneratorTest {
                 return createPresignedRequest(presignConfig, putFooPresignConfig(this, durationSeconds))
             }
             
-            private suspend fun putFooPresignConfig(input: PutFooRequest, durationSeconds: ULong) : PresignedRequestConfig {
-                require(durationSeconds > 0u) { "duration must be greater than zero" }
+            private suspend fun putFooPresignConfig(input: PutFooRequest, durationSeconds: Long) : PresignedRequestConfig {
+                require(durationSeconds > 0) { "duration must be greater than zero" }
                 val httpRequestBuilder = PutFooOperationSerializer().serialize(ExecutionContext.build {  }, input)
                 return PresignedRequestConfig(
                     httpRequestBuilder.method,

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

@@ -28,7 +28,7 @@ class PollyPresignerTest {
             }
         }
 
-        val presignedRequest = request.presign(clientConfig, 10u)
+        val presignedRequest = request.presign(clientConfig, 10)
 
         assertEquals(HttpMethod.GET, presignedRequest.method)
         assertTrue(presignedRequest.headers.entries().size == 1)