refactor!: separate hashing functions into new subproject (#593)

Author: ianbotsf

.changes/d08e52ab-010f-42f0-b4b5-e63bd3890da2.json

@@ -0,0 +1,5 @@
+{
+    "id": "d08e52ab-010f-42f0-b4b5-e63bd3890da2",
+    "type": "misc",
+    "description": "Refactor hashing functions into new subproject"
+}

aws-runtime/aws-config/build.gradle.kts

@@ -22,6 +22,7 @@ kotlin {
             dependencies {
                 api(project(":aws-runtime:aws-core"))
                 implementation("aws.smithy.kotlin:logging:$smithyKotlinVersion")
+                implementation("aws.smithy.kotlin:hashing:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:http:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:utils:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:http-client-engine-default:$smithyKotlinVersion")

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/SsoCredentialsProvider.kt

@@ -10,6 +10,7 @@ import aws.sdk.kotlin.runtime.auth.credentials.internal.sso.SsoClient
 import aws.sdk.kotlin.runtime.config.profile.normalizePath
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
+import aws.smithy.kotlin.runtime.hashing.sha1
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
 import aws.smithy.kotlin.runtime.serde.json.*
 import aws.smithy.kotlin.runtime.time.Clock

aws-runtime/protocols/aws-event-stream/build.gradle.kts

@@ -14,6 +14,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":aws-runtime:aws-core"))
+                implementation("aws.smithy.kotlin:hashing:$smithyKotlinVersion")
                 // exposes Buffer/MutableBuffer and SdkByteReadChannel
                 api("aws.smithy.kotlin:io:$smithyKotlinVersion")
                 // exposes Flow<T>

aws-runtime/protocols/aws-event-stream/common/src/aws/sdk/kotlin/runtime/protocol/eventstream/Message.kt

@@ -6,8 +6,8 @@
 package aws.sdk.kotlin.runtime.protocol.eventstream
 
 import aws.sdk.kotlin.runtime.InternalSdkApi
+import aws.smithy.kotlin.runtime.hashing.crc32
 import aws.smithy.kotlin.runtime.io.*
-import aws.smithy.kotlin.runtime.util.crc32
 
 internal const val MESSAGE_CRC_BYTE_LEN = 4
 

aws-runtime/protocols/aws-event-stream/common/src/aws/sdk/kotlin/runtime/protocol/eventstream/Prelude.kt

@@ -6,8 +6,8 @@
 package aws.sdk.kotlin.runtime.protocol.eventstream
 
 import aws.sdk.kotlin.runtime.InternalSdkApi
+import aws.smithy.kotlin.runtime.hashing.crc32
 import aws.smithy.kotlin.runtime.io.*
-import aws.smithy.kotlin.runtime.util.crc32
 
 internal const val PRELUDE_BYTE_LEN = 8
 internal const val PRELUDE_BYTE_LEN_WITH_CRC = PRELUDE_BYTE_LEN + 4
@@ -36,7 +36,7 @@ public data class Prelude(val totalLen: Int, val headersLength: Int) {
         preludeBuf.writeInt(headersLength)
 
         dest.writeFully(preludeBuf)
-        dest.writeInt(bytes.crc32().toInt())
+        dest.writeUInt(bytes.crc32())
     }
 
     public companion object {

aws-runtime/protocols/aws-event-stream/common/test/aws/sdk/kotlin/runtime/protocol/eventstream/EventStreamSigningTest.kt

@@ -10,12 +10,12 @@ import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
 import aws.smithy.kotlin.runtime.auth.awssigning.AwsSignatureType
 import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig
 import aws.smithy.kotlin.runtime.auth.awssigning.crt.CrtAwsSigner
+import aws.smithy.kotlin.runtime.hashing.sha256
 import aws.smithy.kotlin.runtime.io.SdkByteBuffer
 import aws.smithy.kotlin.runtime.io.bytes
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.time.ManualClock
 import aws.smithy.kotlin.runtime.util.encodeToHex
-import aws.smithy.kotlin.runtime.util.sha256
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Ignore

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/glacier/GlacierBodyChecksum.kt

@@ -40,7 +40,7 @@ public class GlacierBodyChecksum : KotlinIntegration {
         }
 
         override fun render(ctx: ProtocolGenerator.GenerationContext, op: OperationShape, writer: KotlinWriter) {
-            writer.addImport(RuntimeTypes.Utils.Sha256)
+            writer.addImport(RuntimeTypes.Hashing.Sha256)
             val middleware = glacierSymbol("GlacierBodyChecksum")
             writer.addImport(middleware)
             writer.write("op.install(#T())", middleware)

gradle.properties

@@ -6,13 +6,13 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.jvmargs=-Xmx6g -XX:MaxPermSize=6g -XX:MaxMetaspaceSize=1G
 
 # sdk
-sdkVersion=0.14.5-SNAPSHOT
+sdkVersion=0.15.0-SNAPSHOT
 
 # codegen
 smithyVersion=1.17.0
 smithyGradleVersion=0.5.3
 # smithy-kotlin codegen and runtime are versioned together
-smithyKotlinVersion=0.8.6-SNAPSHOT
+smithyKotlinVersion=0.9.0-SNAPSHOT
 
 # kotlin
 kotlinVersion=1.6.10

services/glacier/common/src/aws/sdk/kotlin/services/glacier/internal/GlacierBodyChecksum.kt

@@ -7,18 +7,18 @@ package aws.sdk.kotlin.services.glacier.internal
 
 import aws.sdk.kotlin.services.glacier.model.GlacierException
 import aws.smithy.kotlin.runtime.client.operationName
+import aws.smithy.kotlin.runtime.hashing.Sha256
 import aws.smithy.kotlin.runtime.http.HttpBody
 import aws.smithy.kotlin.runtime.http.operation.ModifyRequestMiddleware
 import aws.smithy.kotlin.runtime.http.operation.SdkHttpOperation
 import aws.smithy.kotlin.runtime.http.operation.SdkHttpRequest
 import aws.smithy.kotlin.runtime.http.request.headers
-import aws.smithy.kotlin.runtime.util.Sha256
 import aws.smithy.kotlin.runtime.util.encodeToHex
 
 private const val defaultChunkSizeBytes = 1024 * 1024 // 1MB
 
 internal class GlacierBodyChecksum(
-    private val treeHasher: TreeHasher = TreeHasherImpl(defaultChunkSizeBytes) { Sha256() }
+    private val treeHasher: TreeHasher = TreeHasherImpl(defaultChunkSizeBytes, ::Sha256)
 ) : ModifyRequestMiddleware {
     override fun install(op: SdkHttpOperation<*, *>) {
         op.execution.finalize.register(this)