Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws-runtime/aws-config/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ kotlin {
implementation("aws.smithy.kotlin:logging:$smithyKotlinVersion")
implementation("aws.smithy.kotlin:http:$smithyKotlinVersion")
implementation("aws.smithy.kotlin:utils:$smithyKotlinVersion")
implementation(project(":aws-runtime:http-client-engine-crt"))
implementation("aws.smithy.kotlin:http-client-engine-crt:$smithyKotlinVersion")
implementation(project(":aws-runtime:aws-http"))

// parsing common JSON credentials responses
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package aws.sdk.kotlin.runtime.auth.credentials

import aws.sdk.kotlin.runtime.config.AwsSdkSetting
import aws.sdk.kotlin.runtime.config.imds.ImdsClient
import aws.sdk.kotlin.runtime.http.engine.crt.CrtHttpEngine
import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
import aws.smithy.kotlin.runtime.http.engine.crt.CrtHttpEngine
import aws.smithy.kotlin.runtime.io.Closeable
import aws.smithy.kotlin.runtime.util.Platform
import aws.smithy.kotlin.runtime.util.PlatformProvider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ package aws.sdk.kotlin.runtime.auth.credentials
import aws.sdk.kotlin.runtime.config.AwsSdkSetting
import aws.sdk.kotlin.runtime.config.AwsSdkSetting.AwsContainerCredentialsRelativeUri
import aws.sdk.kotlin.runtime.config.resolve
import aws.sdk.kotlin.runtime.http.engine.crt.CrtHttpEngine
import aws.smithy.kotlin.runtime.ServiceException
import aws.smithy.kotlin.runtime.client.ExecutionContext
import aws.smithy.kotlin.runtime.http.*
import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
import aws.smithy.kotlin.runtime.http.engine.crt.CrtHttpEngine
import aws.smithy.kotlin.runtime.http.middleware.ResolveEndpoint
import aws.smithy.kotlin.runtime.http.middleware.Retry
import aws.smithy.kotlin.runtime.http.operation.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ package aws.sdk.kotlin.runtime.config.imds
import aws.sdk.kotlin.runtime.AwsServiceException
import aws.sdk.kotlin.runtime.http.ApiMetadata
import aws.sdk.kotlin.runtime.http.AwsUserAgentMetadata
import aws.sdk.kotlin.runtime.http.engine.crt.CrtHttpEngine
import aws.sdk.kotlin.runtime.http.middleware.UserAgent
import aws.smithy.kotlin.runtime.client.ExecutionContext
import aws.smithy.kotlin.runtime.client.SdkClientOption
import aws.smithy.kotlin.runtime.client.SdkLogMode
import aws.smithy.kotlin.runtime.http.*
import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
import aws.smithy.kotlin.runtime.http.engine.crt.CrtHttpEngine
import aws.smithy.kotlin.runtime.http.middleware.ResolveEndpoint
import aws.smithy.kotlin.runtime.http.middleware.Retry
import aws.smithy.kotlin.runtime.http.operation.*
Expand Down
3 changes: 2 additions & 1 deletion aws-runtime/aws-signing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ kotlin {
commonMain {
dependencies {
val crtKotlinVersion: String by project
api(project(":aws-runtime:aws-core"))
// signing config uses CredentialsProvider/Credentials
api(project(":aws-runtime:aws-types"))
// presigner config exposes endpoint resolver
api(project(":aws-runtime:aws-endpoint"))
// sign() API takes HttpRequest
api("aws.smithy.kotlin:http:$smithyKotlinVersion")

implementation(project(":aws-runtime:crt-util"))
implementation("aws.smithy.kotlin:crt-util:$smithyKotlinVersion")
implementation("aws.sdk.kotlin.crt:aws-crt-kotlin:$crtKotlinVersion")
implementation("aws.smithy.kotlin:logging:$smithyKotlinVersion")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import aws.sdk.kotlin.crt.auth.signing.AwsSignedBodyValue
import aws.sdk.kotlin.crt.auth.signing.AwsSigner
import aws.sdk.kotlin.runtime.InternalSdkApi
import aws.sdk.kotlin.runtime.auth.credentials.CredentialsProvider
import aws.sdk.kotlin.runtime.crt.toSignableCrtRequest
import aws.sdk.kotlin.runtime.crt.update
import aws.sdk.kotlin.runtime.execution.AuthAttributes
import aws.smithy.kotlin.runtime.client.ExecutionContext
import aws.smithy.kotlin.runtime.crt.toSignableCrtRequest
import aws.smithy.kotlin.runtime.crt.update
import aws.smithy.kotlin.runtime.http.*
import aws.smithy.kotlin.runtime.http.operation.*
import aws.smithy.kotlin.runtime.util.get
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package aws.sdk.kotlin.runtime.auth.signing

import aws.sdk.kotlin.crt.auth.signing.AwsSigner
import aws.sdk.kotlin.runtime.InternalSdkApi
import aws.sdk.kotlin.runtime.crt.toSignableCrtRequest
import aws.sdk.kotlin.runtime.crt.update
import aws.smithy.kotlin.runtime.crt.toSignableCrtRequest
import aws.smithy.kotlin.runtime.crt.update
import aws.smithy.kotlin.runtime.http.request.HttpRequest
import aws.smithy.kotlin.runtime.http.request.toBuilder

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import aws.sdk.kotlin.crt.auth.signing.AwsSigner
import aws.sdk.kotlin.crt.auth.signing.AwsSigningConfig
import aws.sdk.kotlin.runtime.InternalSdkApi
import aws.sdk.kotlin.runtime.auth.credentials.CredentialsProvider
import aws.sdk.kotlin.runtime.crt.path
import aws.sdk.kotlin.runtime.crt.queryParameters
import aws.sdk.kotlin.runtime.crt.toCrtHeaders
import aws.sdk.kotlin.runtime.crt.toSdkHeaders
import aws.sdk.kotlin.runtime.endpoint.AwsEndpointResolver
import aws.smithy.kotlin.runtime.crt.path
import aws.smithy.kotlin.runtime.crt.queryParameters
import aws.smithy.kotlin.runtime.crt.toCrtHeaders
import aws.smithy.kotlin.runtime.crt.toSdkHeaders
import aws.smithy.kotlin.runtime.http.Headers
import aws.smithy.kotlin.runtime.http.HttpBody
import aws.smithy.kotlin.runtime.http.HttpMethod
Expand Down
6 changes: 0 additions & 6 deletions aws-runtime/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,6 @@ subprojects {
}
}

// FIXME - resolves build deadlock with aws-core when using composite builds
val topLevelModule = "crt-util"
subprojects.filter { it.name != topLevelModule }.forEach { proj ->
proj.tasks.findByName("generatePomFileForJvmPublication")?.dependsOn(":aws-runtime:$topLevelModule:generatePomFileForJvmPublication")
}

task<org.jetbrains.kotlin.gradle.testing.internal.KotlinTestReport>("rootAllTest"){
destinationDir = File(project.buildDir, "reports/tests/rootAllTest")
val rootAllTest = this
Expand Down
50 changes: 0 additions & 50 deletions aws-runtime/crt-util/build.gradle.kts

This file was deleted.

139 changes: 0 additions & 139 deletions aws-runtime/crt-util/common/src/aws/sdk/kotlin/runtime/crt/Http.kt

This file was deleted.

Loading