Skip to content

Commit 26ae193

Browse files
authored
refactor: relocate crt engine to smithy-kotlin (#549)
1 parent 3517d82 commit 26ae193

File tree

37 files changed

+18
-2532
lines changed

37 files changed

+18
-2532
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kotlin {
2424
implementation("aws.smithy.kotlin:logging:$smithyKotlinVersion")
2525
implementation("aws.smithy.kotlin:http:$smithyKotlinVersion")
2626
implementation("aws.smithy.kotlin:utils:$smithyKotlinVersion")
27-
implementation(project(":aws-runtime:http-client-engine-crt"))
27+
implementation("aws.smithy.kotlin:http-client-engine-crt:$smithyKotlinVersion")
2828
implementation(project(":aws-runtime:aws-http"))
2929

3030
// parsing common JSON credentials responses

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package aws.sdk.kotlin.runtime.auth.credentials
77

88
import aws.sdk.kotlin.runtime.config.AwsSdkSetting
99
import aws.sdk.kotlin.runtime.config.imds.ImdsClient
10-
import aws.sdk.kotlin.runtime.http.engine.crt.CrtHttpEngine
1110
import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
11+
import aws.smithy.kotlin.runtime.http.engine.crt.CrtHttpEngine
1212
import aws.smithy.kotlin.runtime.io.Closeable
1313
import aws.smithy.kotlin.runtime.util.Platform
1414
import aws.smithy.kotlin.runtime.util.PlatformProvider

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ package aws.sdk.kotlin.runtime.auth.credentials
88
import aws.sdk.kotlin.runtime.config.AwsSdkSetting
99
import aws.sdk.kotlin.runtime.config.AwsSdkSetting.AwsContainerCredentialsRelativeUri
1010
import aws.sdk.kotlin.runtime.config.resolve
11-
import aws.sdk.kotlin.runtime.http.engine.crt.CrtHttpEngine
1211
import aws.smithy.kotlin.runtime.ServiceException
1312
import aws.smithy.kotlin.runtime.client.ExecutionContext
1413
import aws.smithy.kotlin.runtime.http.*
1514
import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
15+
import aws.smithy.kotlin.runtime.http.engine.crt.CrtHttpEngine
1616
import aws.smithy.kotlin.runtime.http.middleware.ResolveEndpoint
1717
import aws.smithy.kotlin.runtime.http.middleware.Retry
1818
import aws.smithy.kotlin.runtime.http.operation.*

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/ImdsClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ package aws.sdk.kotlin.runtime.config.imds
88
import aws.sdk.kotlin.runtime.AwsServiceException
99
import aws.sdk.kotlin.runtime.http.ApiMetadata
1010
import aws.sdk.kotlin.runtime.http.AwsUserAgentMetadata
11-
import aws.sdk.kotlin.runtime.http.engine.crt.CrtHttpEngine
1211
import aws.sdk.kotlin.runtime.http.middleware.UserAgent
1312
import aws.smithy.kotlin.runtime.client.ExecutionContext
1413
import aws.smithy.kotlin.runtime.client.SdkClientOption
1514
import aws.smithy.kotlin.runtime.client.SdkLogMode
1615
import aws.smithy.kotlin.runtime.http.*
1716
import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
17+
import aws.smithy.kotlin.runtime.http.engine.crt.CrtHttpEngine
1818
import aws.smithy.kotlin.runtime.http.middleware.ResolveEndpoint
1919
import aws.smithy.kotlin.runtime.http.middleware.Retry
2020
import aws.smithy.kotlin.runtime.http.operation.*

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@ kotlin {
1818
commonMain {
1919
dependencies {
2020
val crtKotlinVersion: String by project
21+
api(project(":aws-runtime:aws-core"))
2122
// signing config uses CredentialsProvider/Credentials
2223
api(project(":aws-runtime:aws-types"))
2324
// presigner config exposes endpoint resolver
2425
api(project(":aws-runtime:aws-endpoint"))
2526
// sign() API takes HttpRequest
2627
api("aws.smithy.kotlin:http:$smithyKotlinVersion")
2728

28-
implementation(project(":aws-runtime:crt-util"))
29+
implementation("aws.smithy.kotlin:crt-util:$smithyKotlinVersion")
2930
implementation("aws.sdk.kotlin.crt:aws-crt-kotlin:$crtKotlinVersion")
3031
implementation("aws.smithy.kotlin:logging:$smithyKotlinVersion")
3132
}

aws-runtime/aws-signing/common/src/aws/sdk/kotlin/runtime/auth/signing/AwsSigV4SigningMiddleware.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import aws.sdk.kotlin.crt.auth.signing.AwsSignedBodyValue
99
import aws.sdk.kotlin.crt.auth.signing.AwsSigner
1010
import aws.sdk.kotlin.runtime.InternalSdkApi
1111
import aws.sdk.kotlin.runtime.auth.credentials.CredentialsProvider
12-
import aws.sdk.kotlin.runtime.crt.toSignableCrtRequest
13-
import aws.sdk.kotlin.runtime.crt.update
1412
import aws.sdk.kotlin.runtime.execution.AuthAttributes
1513
import aws.smithy.kotlin.runtime.client.ExecutionContext
14+
import aws.smithy.kotlin.runtime.crt.toSignableCrtRequest
15+
import aws.smithy.kotlin.runtime.crt.update
1616
import aws.smithy.kotlin.runtime.http.*
1717
import aws.smithy.kotlin.runtime.http.operation.*
1818
import aws.smithy.kotlin.runtime.util.get

aws-runtime/aws-signing/common/src/aws/sdk/kotlin/runtime/auth/signing/AwsSigning.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package aws.sdk.kotlin.runtime.auth.signing
77

88
import aws.sdk.kotlin.crt.auth.signing.AwsSigner
99
import aws.sdk.kotlin.runtime.InternalSdkApi
10-
import aws.sdk.kotlin.runtime.crt.toSignableCrtRequest
11-
import aws.sdk.kotlin.runtime.crt.update
10+
import aws.smithy.kotlin.runtime.crt.toSignableCrtRequest
11+
import aws.smithy.kotlin.runtime.crt.update
1212
import aws.smithy.kotlin.runtime.http.request.HttpRequest
1313
import aws.smithy.kotlin.runtime.http.request.toBuilder
1414

aws-runtime/aws-signing/common/src/aws/sdk/kotlin/runtime/auth/signing/Presigner.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import aws.sdk.kotlin.crt.auth.signing.AwsSigner
1212
import aws.sdk.kotlin.crt.auth.signing.AwsSigningConfig
1313
import aws.sdk.kotlin.runtime.InternalSdkApi
1414
import aws.sdk.kotlin.runtime.auth.credentials.CredentialsProvider
15-
import aws.sdk.kotlin.runtime.crt.path
16-
import aws.sdk.kotlin.runtime.crt.queryParameters
17-
import aws.sdk.kotlin.runtime.crt.toCrtHeaders
18-
import aws.sdk.kotlin.runtime.crt.toSdkHeaders
1915
import aws.sdk.kotlin.runtime.endpoint.AwsEndpointResolver
16+
import aws.smithy.kotlin.runtime.crt.path
17+
import aws.smithy.kotlin.runtime.crt.queryParameters
18+
import aws.smithy.kotlin.runtime.crt.toCrtHeaders
19+
import aws.smithy.kotlin.runtime.crt.toSdkHeaders
2020
import aws.smithy.kotlin.runtime.http.Headers
2121
import aws.smithy.kotlin.runtime.http.HttpBody
2222
import aws.smithy.kotlin.runtime.http.HttpMethod

aws-runtime/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,6 @@ subprojects {
8686
}
8787
}
8888

89-
// FIXME - resolves build deadlock with aws-core when using composite builds
90-
val topLevelModule = "crt-util"
91-
subprojects.filter { it.name != topLevelModule }.forEach { proj ->
92-
proj.tasks.findByName("generatePomFileForJvmPublication")?.dependsOn(":aws-runtime:$topLevelModule:generatePomFileForJvmPublication")
93-
}
94-
9589
task<org.jetbrains.kotlin.gradle.testing.internal.KotlinTestReport>("rootAllTest"){
9690
destinationDir = File(project.buildDir, "reports/tests/rootAllTest")
9791
val rootAllTest = this

aws-runtime/crt-util/build.gradle.kts

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)