From a2347c74ca07b54001bdecdc802571f1e2d10e21 Mon Sep 17 00:00:00 2001 From: Matas Date: Fri, 9 Feb 2024 14:57:35 -0500 Subject: [PATCH 01/28] feat: add `toBuilder` and S3 Express signing algorithm (#90) * Add `toBuilder` and S3 Express signing algorithm * Changelog --- .../87608337-174a-46aa-add3-8ec1370c737c.json | 5 +++++ aws-crt-kotlin/api/android/aws-crt-kotlin.api | 2 ++ aws-crt-kotlin/api/jvm/aws-crt-kotlin.api | 2 ++ .../crt/auth/signing/AwsSigningConfig.kt | 18 ++++++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 .changes/87608337-174a-46aa-add3-8ec1370c737c.json diff --git a/.changes/87608337-174a-46aa-add3-8ec1370c737c.json b/.changes/87608337-174a-46aa-add3-8ec1370c737c.json new file mode 100644 index 00000000..2ab86648 --- /dev/null +++ b/.changes/87608337-174a-46aa-add3-8ec1370c737c.json @@ -0,0 +1,5 @@ +{ + "id": "87608337-174a-46aa-add3-8ec1370c737c", + "type": "feature", + "description": "Add SIGV4_S3EXPRESS signing algorithm and AwsSigningConfig.toBuilder function" +} \ No newline at end of file diff --git a/aws-crt-kotlin/api/android/aws-crt-kotlin.api b/aws-crt-kotlin/api/android/aws-crt-kotlin.api index 07a56b73..635b3d45 100644 --- a/aws-crt-kotlin/api/android/aws-crt-kotlin.api +++ b/aws-crt-kotlin/api/android/aws-crt-kotlin.api @@ -319,6 +319,7 @@ public final class aws/sdk/kotlin/crt/auth/signing/AwsSigner { public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm : java/lang/Enum { public static final field SIGV4 Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; public static final field SIGV4_ASYMMETRIC Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; + public static final field SIGV4_S3EXPRESS Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; public static fun getEntries ()Lkotlin/enums/EnumEntries; public final fun getValue ()I public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; @@ -342,6 +343,7 @@ public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig { public final fun getSignedBodyHeader ()Laws/sdk/kotlin/crt/auth/signing/AwsSignedBodyHeaderType; public final fun getSignedBodyValue ()Ljava/lang/String; public final fun getUseDoubleUriEncode ()Z + public final fun toBuilder ()Laws/sdk/kotlin/crt/auth/signing/AwsSigningConfig$Builder; } public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig$Builder { diff --git a/aws-crt-kotlin/api/jvm/aws-crt-kotlin.api b/aws-crt-kotlin/api/jvm/aws-crt-kotlin.api index 07a56b73..635b3d45 100644 --- a/aws-crt-kotlin/api/jvm/aws-crt-kotlin.api +++ b/aws-crt-kotlin/api/jvm/aws-crt-kotlin.api @@ -319,6 +319,7 @@ public final class aws/sdk/kotlin/crt/auth/signing/AwsSigner { public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm : java/lang/Enum { public static final field SIGV4 Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; public static final field SIGV4_ASYMMETRIC Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; + public static final field SIGV4_S3EXPRESS Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; public static fun getEntries ()Lkotlin/enums/EnumEntries; public final fun getValue ()I public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; @@ -342,6 +343,7 @@ public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig { public final fun getSignedBodyHeader ()Laws/sdk/kotlin/crt/auth/signing/AwsSignedBodyHeaderType; public final fun getSignedBodyValue ()Ljava/lang/String; public final fun getUseDoubleUriEncode ()Z + public final fun toBuilder ()Laws/sdk/kotlin/crt/auth/signing/AwsSigningConfig$Builder; } public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig$Builder { diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig.kt index 731d2436..ffb0050b 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig.kt @@ -12,6 +12,7 @@ import aws.sdk.kotlin.crt.auth.credentials.CredentialsProvider public enum class AwsSigningAlgorithm(public val value: Int) { SIGV4(0), SIGV4_ASYMMETRIC(1), + SIGV4_S3EXPRESS(2), } public enum class AwsSignatureType(public val value: Int) { @@ -176,4 +177,21 @@ public class AwsSigningConfig(builder: Builder) { public fun build(): AwsSigningConfig = AwsSigningConfig(this) } + + public fun toBuilder(): Builder = Builder().apply { + region = this@AwsSigningConfig.region + service = this@AwsSigningConfig.service + date = this@AwsSigningConfig.date + algorithm = this@AwsSigningConfig.algorithm + shouldSignHeader = this@AwsSigningConfig.shouldSignHeader + signatureType = this@AwsSigningConfig.signatureType + useDoubleUriEncode = this@AwsSigningConfig.useDoubleUriEncode + normalizeUriPath = this@AwsSigningConfig.normalizeUriPath + omitSessionToken = this@AwsSigningConfig.omitSessionToken + signedBodyValue = this@AwsSigningConfig.signedBodyValue + signedBodyHeader = this@AwsSigningConfig.signedBodyHeader + credentials = this@AwsSigningConfig.credentials + credentialsProvider = this@AwsSigningConfig.credentialsProvider + expirationInSeconds = this@AwsSigningConfig.expirationInSeconds + } } From 93479775c5186454aa978d44735b726c00b5a73e Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Fri, 9 Feb 2024 20:07:38 +0000 Subject: [PATCH 02/28] chore: release 0.8.5 --- .changes/87608337-174a-46aa-add3-8ec1370c737c.json | 5 ----- CHANGELOG.md | 5 +++++ gradle.properties | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 .changes/87608337-174a-46aa-add3-8ec1370c737c.json diff --git a/.changes/87608337-174a-46aa-add3-8ec1370c737c.json b/.changes/87608337-174a-46aa-add3-8ec1370c737c.json deleted file mode 100644 index 2ab86648..00000000 --- a/.changes/87608337-174a-46aa-add3-8ec1370c737c.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "87608337-174a-46aa-add3-8ec1370c737c", - "type": "feature", - "description": "Add SIGV4_S3EXPRESS signing algorithm and AwsSigningConfig.toBuilder function" -} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2742ff7b..7bbc89ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [0.8.5] - 02/09/2024 + +### Features +* Add SIGV4_S3EXPRESS signing algorithm and AwsSigningConfig.toBuilder function + ## [0.8.4] - 01/10/2024 ### Features diff --git a/gradle.properties b/gradle.properties index 66e53cbf..f5974ed4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.5-SNAPSHOT +sdkVersion=0.8.5 # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From c69302026dbc09366a451941cb9fb8e99681d044 Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Fri, 9 Feb 2024 20:07:39 +0000 Subject: [PATCH 03/28] chore: bump snapshot version to 0.8.6-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f5974ed4..d36adc2d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.5 +sdkVersion=0.8.6-SNAPSHOT # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From 452471988fef495c35e81f3f53baabdaa037e71c Mon Sep 17 00:00:00 2001 From: 0marperez <60363173+0marperez@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:28:17 -0600 Subject: [PATCH 04/28] feat: artifact size metrics (#102) --- .github/workflows/artifact-size-metrics.yml | 106 ++++++++++++++++++++ build.gradle.kts | 7 ++ gradle/libs.versions.toml | 5 +- settings.gradle.kts | 1 + 4 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/artifact-size-metrics.yml diff --git a/.github/workflows/artifact-size-metrics.yml b/.github/workflows/artifact-size-metrics.yml new file mode 100644 index 00000000..1d266208 --- /dev/null +++ b/.github/workflows/artifact-size-metrics.yml @@ -0,0 +1,106 @@ +name: Artifact Size Metrics +on: + pull_request: + types: [ opened, synchronize, reopened, labeled, unlabeled ] + branches: [ main ] + release: + types: [published] + +permissions: + id-token: write + contents: read + pull-requests: write + +jobs: + release-metrics: + if: github.event_name == 'release' + runs-on: ubuntu-latest + steps: + - name: Checkout Sources + uses: actions/checkout@v4 + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} + aws-region: us-west-2 + - name: Generate Artifact Size Metrics + run: ./gradlew artifactSizeMetrics + - name: Save Artifact Size Metrics + run: ./gradlew saveArtifactSizeMetrics + - name: Put Artifact Size Metrics in CloudWatch + run: ./gradlew putArtifactSizeMetricsInCloudWatch -Prelease=${{ github.event.release.tag_name }} + size-check: + if: github.event_name == 'pull_request' + runs-on: ubuntu-latest + steps: + - name: Checkout Sources + uses: actions/checkout@v4 + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} + aws-region: us-west-2 + - name: Generate Artifact Size Metrics + run: ./gradlew artifactSizeMetrics + - name: Analyze Artifact Size Metrics + run: ./gradlew analyzeArtifactSizeMetrics + - name: Show Results + uses: actions/github-script@v7 + with: + script: | + const getComments = + `query { + repository(owner:"${context.repo.owner}", name:"${context.repo.repo}"){ + pullRequest(number: ${context.issue.number}) { + id + comments(last:100) { + nodes { + id + body + author { + login + } + isMinimized + } + } + } + } + }` + + const response = await github.graphql(getComments) + const comments = response.repository.pullRequest.comments.nodes + + const mutations = comments + .filter(comment => comment.author.login == 'github-actions' && !comment.isMinimized && comment.body.startsWith('Affected Artifacts')) + .map(comment => + github.graphql( + `mutation { + minimizeComment(input:{subjectId:"${comment.id}", classifier:OUTDATED}){ + clientMutationId + } + }` + ) + ) + await Promise.all(mutations) + + const fs = require('node:fs') + const comment = fs.readFileSync('build/reports/metrics/artifact-analysis.md', 'utf8') + + const writeComment = + `mutation { + addComment(input:{body:"""${comment}""", subjectId:"${response.repository.pullRequest.id}"}){ + clientMutationId + } + }` + + await github.graphql(writeComment) + + - name: Evaluate + if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-artifact-size-increase') }} + run: | + cd build/reports/metrics + cat has-significant-change.txt | grep false || { + echo An artifact increased in size by more than allowed or a new artifact was created. + echo If this is expected please add the 'acknowledge-artifact-size-increase' label to this pull request. + exit 1 + } diff --git a/build.gradle.kts b/build.gradle.kts index 942fea26..1d50fa80 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,6 +18,13 @@ plugins { id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2" alias(libs.plugins.kotlin.multiplatform) apply false alias(libs.plugins.aws.kotlin.repo.tools.kmp) + alias(libs.plugins.aws.kotlin.repo.tools.artifactsizemetrics) +} + +artifactSizeMetrics { + artifactPrefixes = setOf(":aws-crt-kotlin") + significantChangeThresholdPercentage = 5.0 + projectRepositoryName = "aws-crt-kotlin" } allprojects { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7446c35b..7c33e302 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin-version = "1.9.21" -aws-kotlin-repo-tools-version = "0.3.2" +aws-kotlin-repo-tools-version = "0.4.4" # libs crt-java-version = "0.29.6" @@ -40,4 +40,5 @@ mockserver-netty = { module = "org.mock-server:mockserver-netty", version.ref = [plugins] kotlin-multiplatform = {id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" } -aws-kotlin-repo-tools-kmp = { id = "aws.sdk.kotlin.kmp", version.ref = "aws-kotlin-repo-tools-version" } +aws-kotlin-repo-tools-kmp = { id = "aws.sdk.kotlin.gradle.kmp", version.ref = "aws-kotlin-repo-tools-version" } +aws-kotlin-repo-tools-artifactsizemetrics = { id = "aws.sdk.kotlin.gradle.artifactsizemetrics", version.ref = "aws-kotlin-repo-tools-version" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 4cf4beae..cb778036 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,6 +4,7 @@ */ pluginManagement { repositories { + mavenLocal() mavenCentral() gradlePluginPortal() maven { From 68cbd08910bf399c5026330f28ee83030d1e0304 Mon Sep 17 00:00:00 2001 From: 0marperez <60363173+0marperez@users.noreply.github.com> Date: Thu, 2 May 2024 09:41:46 -0600 Subject: [PATCH 05/28] misc: repo tools version bump (#104) --- .github/workflows/artifact-size-metrics.yml | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/artifact-size-metrics.yml b/.github/workflows/artifact-size-metrics.yml index 1d266208..3097b819 100644 --- a/.github/workflows/artifact-size-metrics.yml +++ b/.github/workflows/artifact-size-metrics.yml @@ -26,7 +26,7 @@ jobs: - name: Generate Artifact Size Metrics run: ./gradlew artifactSizeMetrics - name: Save Artifact Size Metrics - run: ./gradlew saveArtifactSizeMetrics + run: ./gradlew saveArtifactSizeMetrics -Prelease=${{ github.event.release.tag_name }} - name: Put Artifact Size Metrics in CloudWatch run: ./gradlew putArtifactSizeMetricsInCloudWatch -Prelease=${{ github.event.release.tag_name }} size-check: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7c33e302..40a8c987 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin-version = "1.9.21" -aws-kotlin-repo-tools-version = "0.4.4" +aws-kotlin-repo-tools-version = "0.4.5" # libs crt-java-version = "0.29.6" From 5c6c89dd4f2d06b3b304619745077f750ea44926 Mon Sep 17 00:00:00 2001 From: 0marperez <60363173+0marperez@users.noreply.github.com> Date: Tue, 14 May 2024 12:38:06 -0600 Subject: [PATCH 06/28] misc: version bump repo tools (#105) --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 40a8c987..d88ef269 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin-version = "1.9.21" -aws-kotlin-repo-tools-version = "0.4.5" +aws-kotlin-repo-tools-version = "0.4.6" # libs crt-java-version = "0.29.6" From 514f214ffafa1c4ca96d25b1ce9f9b5c8aaa7b90 Mon Sep 17 00:00:00 2001 From: Matas Date: Thu, 27 Jun 2024 12:17:29 -0500 Subject: [PATCH 07/28] misc: upgrade to ktlint v1.3.0 (#108) --- .../f8ec80f6-cd00-413a-b59a-5d53159c094e.json | 5 +++++ .editorconfig | 3 +++ .github/workflows/dependabot.yml | 17 +++++++++++++++++ .../credentials/CachedCredentialsProvider.kt | 3 +-- .../crt/auth/credentials/CredentialsProvider.kt | 4 +++- .../DefaultChainCredentialsProvider.kt | 6 ++---- .../auth/credentials/EcsCredentialsProvider.kt | 7 ++++--- .../credentials/ProfileCredentialsProvider.kt | 7 ++++--- .../credentials/StaticCredentialsProvider.kt | 3 +-- .../StsAssumeRoleCredentialsProvider.kt | 7 ++++--- .../StsWebIdentityCredentialsProvider.kt | 7 ++++--- .../auth/credentials/X509CredentialsProvider.kt | 3 +-- .../aws/sdk/kotlin/crt/io/ClientBootstrap.kt | 4 +++- .../src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt | 4 +++- .../src/aws/sdk/kotlin/crt/io/HostResolver.kt | 4 +++- .../sdk/kotlin/crt/util/CaseInsensitiveMap.kt | 2 +- .../auth/credentials/CredentialsProviderTest.kt | 4 ++-- .../sdk/kotlin/crt/auth/signing/SigningTest.kt | 12 ++++++------ .../aws/sdk/kotlin/crt/http/HttpClientTest.kt | 4 +++- .../credentials/CachedCredentialsProviderJVM.kt | 3 ++- .../DefaultChainCredentialsProviderJVM.kt | 3 ++- .../credentials/EcsCredentialsProviderJVM.kt | 6 ++++-- .../auth/credentials/JniCredentialsProvider.kt | 5 ++++- .../ProfileCredentialsProviderJVM.kt | 6 ++++-- .../credentials/StaticCredentialsProviderJVM.kt | 3 ++- .../StsAssumeRoleCredentialsProviderJVM.kt | 6 ++++-- .../StsWebIdentityCredentialsProviderJVM.kt | 6 ++++-- .../credentials/X509CredentialsProviderJVM.kt | 3 ++- .../crt/http/HttpClientConnectionManagerJVM.kt | 3 ++- .../aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt | 4 +++- .../kotlin/crt/http/HttpRequestResponseTest.kt | 6 +++--- .../CachedCredentialsProviderNative.kt | 3 +-- .../DefaultChainCredentialsProviderNative.kt | 3 +-- .../credentials/EcsCredentialsProviderNative.kt | 5 +++-- .../ProfileCredentialsProviderNative.kt | 5 +++-- .../StaticCredentialsProviderNative.kt | 3 +-- .../StsAssumeRoleCredentialsProviderNative.kt | 5 +++-- .../StsWebIdentityCredentialsProviderNative.kt | 5 +++-- .../X509CredentialsProviderNative.kt | 3 +-- .../http/HttpClientConnectionManagerNative.kt | 3 ++- .../sdk/kotlin/crt/io/ClientBootstrapNative.kt | 4 +++- .../sdk/kotlin/crt/io/EventLoopGroupNative.kt | 4 +++- .../aws/sdk/kotlin/crt/io/HostResolverNative.kt | 4 +++- gradle/libs.versions.toml | 2 +- 44 files changed, 134 insertions(+), 75 deletions(-) create mode 100644 .changes/f8ec80f6-cd00-413a-b59a-5d53159c094e.json create mode 100644 .github/workflows/dependabot.yml diff --git a/.changes/f8ec80f6-cd00-413a-b59a-5d53159c094e.json b/.changes/f8ec80f6-cd00-413a-b59a-5d53159c094e.json new file mode 100644 index 00000000..f33d8fe9 --- /dev/null +++ b/.changes/f8ec80f6-cd00-413a-b59a-5d53159c094e.json @@ -0,0 +1,5 @@ +{ + "id": "f8ec80f6-cd00-413a-b59a-5d53159c094e", + "type": "misc", + "description": "Upgrade to ktlint v1.3.0" +} \ No newline at end of file diff --git a/.editorconfig b/.editorconfig index ab5c775c..3dbc6d83 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,7 +1,10 @@ [*.{kt,kts}] +ktlint_code_style = intellij_idea + # ktlint rules to disable ktlint_standard_no-wildcard-imports = disabled ktlint_standard_filename = disabled +ktlint_standard_backing-property-naming = disabled # enable trailing commas per JetBrains recommendation # (https://kotlinlang.org/docs/coding-conventions.html#trailing-commas) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml new file mode 100644 index 00000000..69fb0c98 --- /dev/null +++ b/.github/workflows/dependabot.yml @@ -0,0 +1,17 @@ +name: Dependabot Dependency Submission + +on: + push: + branches: [ main ] + +permissions: + contents: write + +jobs: + dependency-submission: + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v4 + - name: Generate and submit dependency graph + uses: gradle/actions/dependency-submission@v3 diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider.kt index 3501733b..1a82070c 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider.kt @@ -43,5 +43,4 @@ public class CachedCredentialsProviderBuilder { /** * Construct a new credentials provider using a builder */ -public fun CachedCredentialsProvider.Companion.build(block: CachedCredentialsProviderBuilder.() -> Unit): - CachedCredentialsProvider = CachedCredentialsProviderBuilder().apply(block).build() +public fun CachedCredentialsProvider.Companion.build(block: CachedCredentialsProviderBuilder.() -> Unit): CachedCredentialsProvider = CachedCredentialsProviderBuilder().apply(block).build() diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider.kt index 7efa1683..5951a131 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider.kt @@ -11,7 +11,9 @@ import aws.sdk.kotlin.crt.Closeable /** * Represents a producer/source of AWS credentials */ -public interface CredentialsProvider : Closeable, AsyncShutdown { +public interface CredentialsProvider : + Closeable, + AsyncShutdown { /** * Request credentials from the provider diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider.kt index 62e33ff3..b0fa1551 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider.kt @@ -22,8 +22,7 @@ import aws.sdk.kotlin.crt.io.ClientBootstrap * * @return the newly-constructed credentials provider */ -public expect class DefaultChainCredentialsProvider internal constructor(builder: DefaultChainCredentialsProviderBuilder) : - CredentialsProvider { +public expect class DefaultChainCredentialsProvider internal constructor(builder: DefaultChainCredentialsProviderBuilder) : CredentialsProvider { public companion object } @@ -40,5 +39,4 @@ public class DefaultChainCredentialsProviderBuilder { /** * Construct a new credentials provider using a builder */ -public fun DefaultChainCredentialsProvider.Companion.build(block: DefaultChainCredentialsProviderBuilder.() -> Unit): - DefaultChainCredentialsProvider = DefaultChainCredentialsProviderBuilder().apply(block).build() +public fun DefaultChainCredentialsProvider.Companion.build(block: DefaultChainCredentialsProviderBuilder.() -> Unit): DefaultChainCredentialsProvider = DefaultChainCredentialsProviderBuilder().apply(block).build() diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider.kt index 5c92f807..152f243f 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider.kt @@ -12,7 +12,9 @@ import aws.sdk.kotlin.crt.io.TlsContext * A credentials provider that sources credentials from an ECS environment. */ public expect class EcsCredentialsProvider -internal constructor(builder: EcsCredentialsProviderBuilder) : CredentialsProvider { +internal constructor( + builder: EcsCredentialsProviderBuilder, +) : CredentialsProvider { public companion object } @@ -50,5 +52,4 @@ public class EcsCredentialsProviderBuilder { /** * Construct a new ECS credentials provider using a builder. */ -public fun EcsCredentialsProvider.Companion.build(block: EcsCredentialsProviderBuilder.() -> Unit): - EcsCredentialsProvider = EcsCredentialsProviderBuilder().apply(block).build() +public fun EcsCredentialsProvider.Companion.build(block: EcsCredentialsProviderBuilder.() -> Unit): EcsCredentialsProvider = EcsCredentialsProviderBuilder().apply(block).build() diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider.kt index 1bb7e04f..6af30328 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider.kt @@ -12,7 +12,9 @@ import aws.sdk.kotlin.crt.io.TlsContext * A credentials provider that uses profile files. */ public expect class ProfileCredentialsProvider -internal constructor(builder: ProfileCredentialsProviderBuilder) : CredentialsProvider { +internal constructor( + builder: ProfileCredentialsProviderBuilder, +) : CredentialsProvider { public companion object } @@ -50,5 +52,4 @@ public class ProfileCredentialsProviderBuilder { /** * Construct a new credentials provider using a builder. */ -public fun ProfileCredentialsProvider.Companion.build(block: ProfileCredentialsProviderBuilder.() -> Unit): - ProfileCredentialsProvider = ProfileCredentialsProviderBuilder().apply(block).build() +public fun ProfileCredentialsProvider.Companion.build(block: ProfileCredentialsProviderBuilder.() -> Unit): ProfileCredentialsProvider = ProfileCredentialsProviderBuilder().apply(block).build() diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider.kt index b4fa248d..80565d30 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider.kt @@ -28,8 +28,7 @@ public class StaticCredentialsProviderBuilder { /** * Construct a new credentials provider using a builder */ -public fun StaticCredentialsProvider.Companion.build(block: StaticCredentialsProviderBuilder.() -> Unit): - StaticCredentialsProvider = StaticCredentialsProviderBuilder().apply(block).build() +public fun StaticCredentialsProvider.Companion.build(block: StaticCredentialsProviderBuilder.() -> Unit): StaticCredentialsProvider = StaticCredentialsProviderBuilder().apply(block).build() /** * Create provider from a set of credentials diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider.kt index 953e6093..2e5086b3 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider.kt @@ -12,7 +12,9 @@ import aws.sdk.kotlin.crt.io.TlsContext * Provides credentials from STS by assuming a role */ public expect class StsAssumeRoleCredentialsProvider -internal constructor(builder: StsAssumeRoleCredentialsProviderBuilder) : CredentialsProvider { +internal constructor( + builder: StsAssumeRoleCredentialsProviderBuilder, +) : CredentialsProvider { public companion object } @@ -53,5 +55,4 @@ public class StsAssumeRoleCredentialsProviderBuilder { /** * Construct a new credentials provider using a builder. */ -public fun StsAssumeRoleCredentialsProvider.Companion.build(block: StsAssumeRoleCredentialsProviderBuilder.() -> Unit): - StsAssumeRoleCredentialsProvider = StsAssumeRoleCredentialsProviderBuilder().apply(block).build() +public fun StsAssumeRoleCredentialsProvider.Companion.build(block: StsAssumeRoleCredentialsProviderBuilder.() -> Unit): StsAssumeRoleCredentialsProvider = StsAssumeRoleCredentialsProviderBuilder().apply(block).build() diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider.kt index f8b77841..572f0d2f 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider.kt @@ -13,7 +13,9 @@ import aws.sdk.kotlin.crt.io.TlsContext * authenticated in a mobile or web application with a web identity provider. */ public expect class StsWebIdentityCredentialsProvider -internal constructor(builder: StsWebIdentityCredentialsProviderBuilder) : CredentialsProvider { +internal constructor( + builder: StsWebIdentityCredentialsProviderBuilder, +) : CredentialsProvider { public companion object } @@ -34,5 +36,4 @@ public class StsWebIdentityCredentialsProviderBuilder { /** * Construct a new credentials provider using a builder. */ -public fun StsWebIdentityCredentialsProvider.Companion.build(block: StsWebIdentityCredentialsProviderBuilder.() -> Unit): - StsWebIdentityCredentialsProvider = StsWebIdentityCredentialsProviderBuilder().apply(block).build() +public fun StsWebIdentityCredentialsProvider.Companion.build(block: StsWebIdentityCredentialsProviderBuilder.() -> Unit): StsWebIdentityCredentialsProvider = StsWebIdentityCredentialsProviderBuilder().apply(block).build() diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider.kt index 65ab2afb..dbad5fdf 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider.kt @@ -60,5 +60,4 @@ public class X509CredentialsProviderBuilder { /** * Construct a new credentials provider using a builder */ -public fun X509CredentialsProvider.Companion.build(block: X509CredentialsProviderBuilder.() -> Unit): - X509CredentialsProvider = X509CredentialsProviderBuilder().apply(block).build() +public fun X509CredentialsProvider.Companion.build(block: X509CredentialsProviderBuilder.() -> Unit): X509CredentialsProvider = X509CredentialsProviderBuilder().apply(block).build() diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/ClientBootstrap.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/ClientBootstrap.kt index 4983bf76..d90a60aa 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/ClientBootstrap.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/ClientBootstrap.kt @@ -12,4 +12,6 @@ import aws.sdk.kotlin.crt.Closeable * This class wraps the aws_client_bootstrap from aws-c-io to provide * a client context for all protocol stacks in the AWS Common Runtime. */ -public expect class ClientBootstrap(elg: EventLoopGroup, hr: HostResolver) : Closeable, AsyncShutdown +public expect class ClientBootstrap(elg: EventLoopGroup, hr: HostResolver) : + Closeable, + AsyncShutdown diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt index 1062159f..0ef33b95 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt @@ -16,4 +16,6 @@ import aws.sdk.kotlin.crt.Closeable * Otherwise, maxThreads will be the number of event loops in the group. * @throws [aws.sdk.kotlin.crt.CrtRuntimeException] If the system is unable to allocate space for a native event loop group */ -public expect class EventLoopGroup(maxThreads: Int = 1) : Closeable, AsyncShutdown +public expect class EventLoopGroup(maxThreads: Int = 1) : + Closeable, + AsyncShutdown diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/HostResolver.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/HostResolver.kt index b60e8c39..e8d8d640 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/HostResolver.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/HostResolver.kt @@ -10,6 +10,8 @@ import aws.sdk.kotlin.crt.Closeable internal const val DEFAULT_MAX_ENTRIES = 8 -public expect class HostResolver(elg: EventLoopGroup, maxEntries: Int) : Closeable, AsyncShutdown { +public expect class HostResolver(elg: EventLoopGroup, maxEntries: Int) : + Closeable, + AsyncShutdown { public constructor(elg: EventLoopGroup) } diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/util/CaseInsensitiveMap.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/util/CaseInsensitiveMap.kt index 93ad428c..eea723c2 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/util/CaseInsensitiveMap.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/util/CaseInsensitiveMap.kt @@ -18,7 +18,7 @@ private fun String.toInsensitive(): CaseInsensitiveString = /** * Map of case-insensitive [String] to [Value] */ -internal class CaseInsensitiveMap() : MutableMap { +internal class CaseInsensitiveMap : MutableMap { private val impl: MutableMap = mutableMapOf() override val size: Int diff --git a/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/credentials/CredentialsProviderTest.kt b/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/credentials/CredentialsProviderTest.kt index c2dbfecf..38b3f560 100644 --- a/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/credentials/CredentialsProviderTest.kt +++ b/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/credentials/CredentialsProviderTest.kt @@ -13,9 +13,9 @@ import aws.sdk.kotlin.crt.runSuspendTest import kotlin.test.Test import kotlin.test.assertEquals -class CredentialsProviderTest : CrtTest() { - private val EXPECTED_CREDENTIALS = Credentials("access_key_id", "secret_access_key", "session_token") +private val EXPECTED_CREDENTIALS = Credentials("access_key_id", "secret_access_key", "session_token") +class CredentialsProviderTest : CrtTest() { @Test fun testStaticProvider() = runSuspendTest { val provider = StaticCredentialsProvider.fromCredentials(EXPECTED_CREDENTIALS) diff --git a/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/signing/SigningTest.kt b/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/signing/SigningTest.kt index 58c57503..2f0e8c0b 100644 --- a/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/signing/SigningTest.kt +++ b/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/signing/SigningTest.kt @@ -15,14 +15,14 @@ import aws.sdk.kotlin.crt.http.headers import aws.sdk.kotlin.crt.io.Uri import kotlin.test.* -// ported over from crt-java -class SigningTest : CrtTest() { - private val TEST_ACCESS_KEY_ID: String = "AKIDEXAMPLE" - private val TEST_SECRET_ACCESS_KEY: String = "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY" +private val TEST_ACCESS_KEY_ID: String = "AKIDEXAMPLE" +private val TEST_SECRET_ACCESS_KEY: String = "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY" - // 2015-08-30T12:36:00Z - private val TEST_DATE_EPOCH_MILLI: Long = 1440938160000 +// 2015-08-30T12:36:00Z +private val TEST_DATE_EPOCH_MILLI: Long = 1440938160000 +// ported over from crt-java +class SigningTest : CrtTest() { private fun createSimpleRequest(url: String, method: String, path: String, body: String? = null): HttpRequest = HttpRequest.build { this.method = method this.encodedPath = path diff --git a/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/http/HttpClientTest.kt b/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/http/HttpClientTest.kt index d50fb97c..d3f02795 100644 --- a/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/http/HttpClientTest.kt +++ b/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/http/HttpClientTest.kt @@ -116,7 +116,9 @@ data class HttpTestResponse(val statusCode: Int, val headers: Headers, val body: if (body != null) { if (other.body == null) return false if (!body.contentEquals(other.body)) return false - } else if (other.body != null) return false + } else if (other.body != null) { + return false + } return true } diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderJVM.kt index ae349bc9..334f7ee6 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderJVM.kt @@ -10,7 +10,8 @@ import software.amazon.awssdk.crt.auth.credentials.CachedCredentialsProvider as import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as CredentialsProviderJni public actual class CachedCredentialsProvider internal actual constructor(builder: CachedCredentialsProviderBuilder) : - CredentialsProvider, JniCredentialsProvider() { + JniCredentialsProvider(), + CredentialsProvider { public actual companion object {} override val jniCredentials: CredentialsProviderJni = diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderJVM.kt index 5b72665a..54442999 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderJVM.kt @@ -9,7 +9,8 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden import software.amazon.awssdk.crt.auth.credentials.DefaultChainCredentialsProvider as DefaultChainCredentialsProviderJni public actual class DefaultChainCredentialsProvider internal actual constructor(builder: DefaultChainCredentialsProviderBuilder) : - CredentialsProvider, JniCredentialsProvider() { + JniCredentialsProvider(), + CredentialsProvider { public actual companion object {} override val jniCredentials: CredentialsProviderJni = diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderJVM.kt index 919b2d24..d8d19a72 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderJVM.kt @@ -9,8 +9,10 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden import software.amazon.awssdk.crt.auth.credentials.EcsCredentialsProvider as EcsCredentialsProviderJni public actual class EcsCredentialsProvider -internal actual constructor(builder: EcsCredentialsProviderBuilder) : - CredentialsProvider, JniCredentialsProvider() { +internal actual constructor( + builder: EcsCredentialsProviderBuilder, +) : JniCredentialsProvider(), + CredentialsProvider { public actual companion object {} override val jniCredentials: CredentialsProviderJni = diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider.kt index e4960482..e7fec750 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider.kt @@ -13,7 +13,10 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden /** * Base class for proxying JNI credentials providers */ -public abstract class JniCredentialsProvider : CredentialsProvider, Closeable, AsyncShutdown { +public abstract class JniCredentialsProvider : + CredentialsProvider, + Closeable, + AsyncShutdown { internal abstract val jniCredentials: CredentialsProviderJni override suspend fun getCredentials(): Credentials { diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderJVM.kt index dce6a0a4..dacabea9 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderJVM.kt @@ -9,8 +9,10 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden import software.amazon.awssdk.crt.auth.credentials.ProfileCredentialsProvider as ProfileCredentialsProviderJni public actual class ProfileCredentialsProvider -internal actual constructor(builder: ProfileCredentialsProviderBuilder) : - CredentialsProvider, JniCredentialsProvider() { +internal actual constructor( + builder: ProfileCredentialsProviderBuilder, +) : JniCredentialsProvider(), + CredentialsProvider { public actual companion object {} override val jniCredentials: CredentialsProviderJni = diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderJVM.kt index 882be5ac..61c6d239 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderJVM.kt @@ -10,7 +10,8 @@ import software.amazon.awssdk.crt.auth.credentials.StaticCredentialsProvider as * A credentials provider for a fixed set of credentials */ public actual class StaticCredentialsProvider internal actual constructor(builder: StaticCredentialsProviderBuilder) : - JniCredentialsProvider(), CredentialsProvider { + JniCredentialsProvider(), + CredentialsProvider { public actual companion object {} override val jniCredentials = StaticCredentialsProviderJni.StaticCredentialsProviderBuilder().apply { diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderJVM.kt index 431dde6a..6b7402b4 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderJVM.kt @@ -19,8 +19,10 @@ import software.amazon.awssdk.crt.auth.credentials.StsCredentialsProvider as Sts private const val DEFAULT_DURATION_SECONDS = 3600 public actual class StsAssumeRoleCredentialsProvider -internal actual constructor(builder: StsAssumeRoleCredentialsProviderBuilder) : - CredentialsProvider, JniCredentialsProvider() { +internal actual constructor( + builder: StsAssumeRoleCredentialsProviderBuilder, +) : JniCredentialsProvider(), + CredentialsProvider { public actual companion object {} override val jniCredentials: CredentialsProviderJni = diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderJVM.kt index 5b261ada..a02657db 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderJVM.kt @@ -9,8 +9,10 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden import software.amazon.awssdk.crt.auth.credentials.StsWebIdentityCredentialsProvider as StsWebIdentityCredentialsProviderJni public actual class StsWebIdentityCredentialsProvider -internal actual constructor(builder: StsWebIdentityCredentialsProviderBuilder) : - CredentialsProvider, JniCredentialsProvider() { +internal actual constructor( + builder: StsWebIdentityCredentialsProviderBuilder, +) : JniCredentialsProvider(), + CredentialsProvider { public actual companion object {} override val jniCredentials: CredentialsProviderJni = diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderJVM.kt index b4555c16..0c22d867 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderJVM.kt @@ -9,7 +9,8 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden import software.amazon.awssdk.crt.auth.credentials.X509CredentialsProvider as X509CredentialsProviderJni public actual class X509CredentialsProvider internal actual constructor(builder: X509CredentialsProviderBuilder) : - CredentialsProvider, JniCredentialsProvider() { + JniCredentialsProvider(), + CredentialsProvider { public actual companion object {} diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerJVM.kt index ca12819d..dc3f9ff6 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerJVM.kt @@ -20,7 +20,8 @@ import software.amazon.awssdk.crt.io.SocketOptions as SocketOptionsJni public actual class HttpClientConnectionManager actual constructor( public actual val options: HttpClientConnectionManagerOptions, -) : Closeable, AsyncShutdown { +) : Closeable, + AsyncShutdown { private val jniManager = HttpClientConnectionManagerJni.create(options.into()) diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt index bb199632..d8e44792 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt @@ -18,7 +18,9 @@ import software.amazon.awssdk.crt.io.EventLoopGroup as EventLoopGroupJni * Otherwise, maxThreads will be the number of event loops in the group. * @throws [aws.sdk.kotlin.crt.CrtRuntimeException] If the system is unable to allocate space for a native event loop group */ -public actual class EventLoopGroup actual constructor(maxThreads: Int) : Closeable, AsyncShutdown { +public actual class EventLoopGroup actual constructor(maxThreads: Int) : + Closeable, + AsyncShutdown { internal val jniElg = EventLoopGroupJni(maxThreads) /** diff --git a/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/http/HttpRequestResponseTest.kt b/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/http/HttpRequestResponseTest.kt index e2164a53..1ac46705 100644 --- a/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/http/HttpRequestResponseTest.kt +++ b/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/http/HttpRequestResponseTest.kt @@ -17,11 +17,11 @@ import org.mockserver.model.HttpRequest.request import org.mockserver.model.HttpResponse.response import kotlin.test.* +private val TEST_DOC_LINE = "This is a sample to prove that http downloads and uploads work." +private val TEST_DOC_SHA256 = "c7fdb5314b9742467b16bd5ea2f8012190b5e2c44a005f7984f89aab58219534" + @TestInstance(TestInstance.Lifecycle.PER_CLASS) class HttpRequestResponseTest : HttpClientTest() { - private val TEST_DOC_LINE = - "This is a sample to prove that http downloads and uploads work. It doesn't really matter what's in here, we mainly just need to verify the downloads and uploads work." - private val TEST_DOC_SHA256 = "c7fdb5314b9742467b16bd5ea2f8012190b5e2c44a005f7984f89aab58219534" lateinit var mockServer: MockServerClient lateinit var url: String diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderNative.kt index 8e20b5b8..f72644fb 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderNative.kt @@ -5,8 +5,7 @@ package aws.sdk.kotlin.crt.auth.credentials -public actual class CachedCredentialsProvider internal actual constructor(builder: CachedCredentialsProviderBuilder) : - CredentialsProvider { +public actual class CachedCredentialsProvider internal actual constructor(builder: CachedCredentialsProviderBuilder) : CredentialsProvider { public actual companion object {} override suspend fun getCredentials(): Credentials { diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderNative.kt index b6ed9eea..eb926448 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderNative.kt @@ -5,8 +5,7 @@ package aws.sdk.kotlin.crt.auth.credentials -public actual class DefaultChainCredentialsProvider internal actual constructor(builder: DefaultChainCredentialsProviderBuilder) : - CredentialsProvider { +public actual class DefaultChainCredentialsProvider internal actual constructor(builder: DefaultChainCredentialsProviderBuilder) : CredentialsProvider { public actual companion object {} override suspend fun getCredentials(): Credentials { diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderNative.kt index 81cc45ae..c267777c 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderNative.kt @@ -6,8 +6,9 @@ package aws.sdk.kotlin.crt.auth.credentials public actual class EcsCredentialsProvider -internal actual constructor(builder: EcsCredentialsProviderBuilder) : - CredentialsProvider { +internal actual constructor( + builder: EcsCredentialsProviderBuilder, +) : CredentialsProvider { public actual companion object {} override suspend fun getCredentials(): Credentials { diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderNative.kt index d681bb97..082e399e 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderNative.kt @@ -6,8 +6,9 @@ package aws.sdk.kotlin.crt.auth.credentials public actual class ProfileCredentialsProvider -internal actual constructor(builder: ProfileCredentialsProviderBuilder) : - CredentialsProvider { +internal actual constructor( + builder: ProfileCredentialsProviderBuilder, +) : CredentialsProvider { public actual companion object {} override suspend fun getCredentials(): Credentials { diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt index 0a568407..c46139af 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt @@ -8,8 +8,7 @@ package aws.sdk.kotlin.crt.auth.credentials /** * A credentials provider for a fixed set of credentials */ -public actual class StaticCredentialsProvider internal actual constructor(builder: StaticCredentialsProviderBuilder) : - CredentialsProvider { +public actual class StaticCredentialsProvider internal actual constructor(builder: StaticCredentialsProviderBuilder) : CredentialsProvider { public actual companion object {} override suspend fun getCredentials(): Credentials { diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderNative.kt index 14d113e6..62bb45ea 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderNative.kt @@ -6,8 +6,9 @@ package aws.sdk.kotlin.crt.auth.credentials public actual class StsAssumeRoleCredentialsProvider -internal actual constructor(builder: StsAssumeRoleCredentialsProviderBuilder) : - CredentialsProvider { +internal actual constructor( + builder: StsAssumeRoleCredentialsProviderBuilder, +) : CredentialsProvider { public actual companion object {} override suspend fun getCredentials(): Credentials { diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderNative.kt index 817043de..e12fc0d0 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderNative.kt @@ -6,8 +6,9 @@ package aws.sdk.kotlin.crt.auth.credentials public actual class StsWebIdentityCredentialsProvider -internal actual constructor(builder: StsWebIdentityCredentialsProviderBuilder) : - CredentialsProvider { +internal actual constructor( + builder: StsWebIdentityCredentialsProviderBuilder, +) : CredentialsProvider { public actual companion object {} override suspend fun getCredentials(): Credentials { diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderNative.kt index 77e52921..839f5e1a 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderNative.kt @@ -5,8 +5,7 @@ package aws.sdk.kotlin.crt.auth.credentials -public actual class X509CredentialsProvider internal actual constructor(builder: X509CredentialsProviderBuilder) : - CredentialsProvider { +public actual class X509CredentialsProvider internal actual constructor(builder: X509CredentialsProviderBuilder) : CredentialsProvider { public actual companion object {} diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt index 242b780f..05c5adb2 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt @@ -10,7 +10,8 @@ import aws.sdk.kotlin.crt.Closeable public actual class HttpClientConnectionManager actual constructor( public actual val options: HttpClientConnectionManagerOptions, -) : Closeable, AsyncShutdown { +) : Closeable, + AsyncShutdown { public actual val managerMetrics: HttpManagerMetrics get() = TODO("Not yet implemented") diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt index c9e20f76..43eadc8f 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt @@ -8,7 +8,9 @@ package aws.sdk.kotlin.crt.io import aws.sdk.kotlin.crt.AsyncShutdown import aws.sdk.kotlin.crt.Closeable -public actual class ClientBootstrap actual constructor(elg: EventLoopGroup, hr: HostResolver) : Closeable, AsyncShutdown { +public actual class ClientBootstrap actual constructor(elg: EventLoopGroup, hr: HostResolver) : + Closeable, + AsyncShutdown { override suspend fun waitForShutdown() { TODO("Not yet implemented") } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt index bf12fe84..a449bb8c 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt @@ -16,7 +16,9 @@ import aws.sdk.kotlin.crt.Closeable * Otherwise, maxThreads will be the number of event loops in the group. * @throws [aws.sdk.kotlin.crt.CrtRuntimeException] If the system is unable to allocate space for a native event loop group */ -public actual class EventLoopGroup actual constructor(maxThreads: Int) : Closeable, AsyncShutdown { +public actual class EventLoopGroup actual constructor(maxThreads: Int) : + Closeable, + AsyncShutdown { override suspend fun waitForShutdown() { TODO("Not yet implemented") } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt index bf7d4432..acfb6f18 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt @@ -8,7 +8,9 @@ package aws.sdk.kotlin.crt.io import aws.sdk.kotlin.crt.AsyncShutdown import aws.sdk.kotlin.crt.Closeable -public actual class HostResolver actual constructor(elg: EventLoopGroup, maxEntries: Int) : Closeable, AsyncShutdown { +public actual class HostResolver actual constructor(elg: EventLoopGroup, maxEntries: Int) : + Closeable, + AsyncShutdown { public actual constructor(elg: EventLoopGroup) : this(elg, DEFAULT_MAX_ENTRIES) override suspend fun waitForShutdown() { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d88ef269..f005c90e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin-version = "1.9.21" -aws-kotlin-repo-tools-version = "0.4.6" +aws-kotlin-repo-tools-version = "0.4.9" # libs crt-java-version = "0.29.6" From c3bbb58c107bb38ec45b308549626f023fe60ac0 Mon Sep 17 00:00:00 2001 From: Matas Date: Fri, 28 Jun 2024 12:05:37 -0500 Subject: [PATCH 08/28] misc: upgrade to latest version of aws-crt-java (#109) --- .changes/1803e06b-e4dc-4566-bb54-e05ff90eb5d3.json | 5 +++++ .gitignore | 1 + build.gradle.kts | 3 +++ gradle/libs.versions.toml | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .changes/1803e06b-e4dc-4566-bb54-e05ff90eb5d3.json diff --git a/.changes/1803e06b-e4dc-4566-bb54-e05ff90eb5d3.json b/.changes/1803e06b-e4dc-4566-bb54-e05ff90eb5d3.json new file mode 100644 index 00000000..31973356 --- /dev/null +++ b/.changes/1803e06b-e4dc-4566-bb54-e05ff90eb5d3.json @@ -0,0 +1,5 @@ +{ + "id": "1803e06b-e4dc-4566-bb54-e05ff90eb5d3", + "type": "misc", + "description": "Upgrade to aws-crt-java v0.29.25" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 185f74e5..01338eef 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ build/ *.iml .idea/ local.properties +*.klib \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 1d50fa80..7f1b3267 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,6 +32,9 @@ allprojects { mavenLocal() mavenCentral() } + + // Enables running `./gradlew allDeps` to get a comprehensive list of dependencies for every subproject + tasks.register("allDeps") { } } subprojects { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f005c90e..6f9df270 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ kotlin-version = "1.9.21" aws-kotlin-repo-tools-version = "0.4.9" # libs -crt-java-version = "0.29.6" +crt-java-version = "0.29.25" coroutines-version = "1.7.3" # testing From 7a2ef4913aac43814aeaffa5212878017034c97e Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Fri, 28 Jun 2024 17:11:19 +0000 Subject: [PATCH 09/28] chore: release 0.8.6 --- .changes/1803e06b-e4dc-4566-bb54-e05ff90eb5d3.json | 5 ----- .changes/f8ec80f6-cd00-413a-b59a-5d53159c094e.json | 5 ----- CHANGELOG.md | 6 ++++++ gradle.properties | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 .changes/1803e06b-e4dc-4566-bb54-e05ff90eb5d3.json delete mode 100644 .changes/f8ec80f6-cd00-413a-b59a-5d53159c094e.json diff --git a/.changes/1803e06b-e4dc-4566-bb54-e05ff90eb5d3.json b/.changes/1803e06b-e4dc-4566-bb54-e05ff90eb5d3.json deleted file mode 100644 index 31973356..00000000 --- a/.changes/1803e06b-e4dc-4566-bb54-e05ff90eb5d3.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "1803e06b-e4dc-4566-bb54-e05ff90eb5d3", - "type": "misc", - "description": "Upgrade to aws-crt-java v0.29.25" -} \ No newline at end of file diff --git a/.changes/f8ec80f6-cd00-413a-b59a-5d53159c094e.json b/.changes/f8ec80f6-cd00-413a-b59a-5d53159c094e.json deleted file mode 100644 index f33d8fe9..00000000 --- a/.changes/f8ec80f6-cd00-413a-b59a-5d53159c094e.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "f8ec80f6-cd00-413a-b59a-5d53159c094e", - "type": "misc", - "description": "Upgrade to ktlint v1.3.0" -} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bbc89ca..4d54c4f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [0.8.6] - 06/28/2024 + +### Miscellaneous +* Upgrade to aws-crt-java v0.29.25 +* Upgrade to ktlint v1.3.0 + ## [0.8.5] - 02/09/2024 ### Features diff --git a/gradle.properties b/gradle.properties index d36adc2d..4d3359cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.6-SNAPSHOT +sdkVersion=0.8.6 # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From c153a28337e9ec00822665615f8bab31f71a2092 Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Fri, 28 Jun 2024 17:11:20 +0000 Subject: [PATCH 10/28] chore: bump snapshot version to 0.8.7-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4d3359cd..7cba9456 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.6 +sdkVersion=0.8.7-SNAPSHOT # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From a960459344e7983031fc0a6953de9ddc6f4b0096 Mon Sep 17 00:00:00 2001 From: Matas Date: Thu, 25 Jul 2024 15:38:14 -0400 Subject: [PATCH 11/28] misc: Upgrade to Kotlin 2.0.0 (#107) --- .brazil.json | 12 +- .../9f0978c5-7652-4cef-9d03-6aab441c1d8d.json | 5 + aws-crt-kotlin/api/aws-crt-kotlin.api | 998 ++++++++++++++++++ .../credentials/CachedCredentialsProvider.kt | 6 +- .../DefaultChainCredentialsProvider.kt | 6 +- .../credentials/EcsCredentialsProvider.kt | 6 +- .../credentials/ProfileCredentialsProvider.kt | 6 +- .../credentials/StaticCredentialsProvider.kt | 6 +- .../StsAssumeRoleCredentialsProvider.kt | 6 +- .../StsWebIdentityCredentialsProvider.kt | 6 +- .../credentials/X509CredentialsProvider.kt | 6 +- .../crt/http/HttpClientConnectionManager.kt | 3 + .../aws/sdk/kotlin/crt/io/ClientBootstrap.kt | 5 +- .../aws/sdk/kotlin/crt/io/EventLoopGroup.kt | 5 +- .../src/aws/sdk/kotlin/crt/io/HostResolver.kt | 2 + .../src/aws/sdk/kotlin/crt/io/TlsContext.kt | 1 + .../http/HttpClientConnectionManagerJVM.kt | 4 +- .../sdk/kotlin/crt/io/ClientBootstrapJVM.kt | 4 +- .../sdk/kotlin/crt/io/EventLoopGroupJVM.kt | 4 +- .../aws/sdk/kotlin/crt/io/HostResolverJVM.kt | 4 +- .../aws/sdk/kotlin/crt/io/TlsContextJVM.kt | 2 +- .../CachedCredentialsProviderNative.kt | 6 +- .../DefaultChainCredentialsProviderNative.kt | 6 +- .../EcsCredentialsProviderNative.kt | 6 +- .../ProfileCredentialsProviderNative.kt | 6 +- .../StaticCredentialsProviderNative.kt | 6 +- .../StsAssumeRoleCredentialsProviderNative.kt | 6 +- ...StsWebIdentityCredentialsProviderNative.kt | 6 +- .../X509CredentialsProviderNative.kt | 6 +- .../http/HttpClientConnectionManagerNative.kt | 4 +- .../kotlin/crt/io/ClientBootstrapNative.kt | 4 +- .../sdk/kotlin/crt/io/EventLoopGroupNative.kt | 4 +- .../sdk/kotlin/crt/io/HostResolverNative.kt | 4 +- .../aws/sdk/kotlin/crt/io/TlsContextNative.kt | 2 +- gradle.properties | 2 +- gradle/libs.versions.toml | 4 +- 36 files changed, 1110 insertions(+), 59 deletions(-) create mode 100644 .changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json create mode 100644 aws-crt-kotlin/api/aws-crt-kotlin.api diff --git a/.brazil.json b/.brazil.json index 3e55e57a..d8fb86ab 100644 --- a/.brazil.json +++ b/.brazil.json @@ -1,14 +1,18 @@ { "dependencies": { + "org.jetbrains.kotlin:kotlin-stdlib-common:2.0.*": "KotlinStdlibCommon-2.x", + "org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x", + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.*": "KotlinxCoroutinesCoreJvm-1.8.x", + "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.*": "KotlinxCoroutinesCore-1.8.x", + "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.*": "KotlinxCoroutinesJdk8-1.8.x", + "software.amazon.awssdk.crt:aws-crt:0.*": "Aws-crt-java-1.0.x", + "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.*": "KotlinStdlibCommon-1.9.x", "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.*": "KotlinStdlibJdk8-1.9.x", "org.jetbrains.kotlin:kotlin-stdlib:1.9.*": "KotlinStdlib-1.9.x", - "org.jetbrains.kotlinx:atomicfu-jvm:0.23.1": "AtomicfuJvm-0.23.1", - "org.jetbrains.kotlinx:atomicfu:0.23.1": "Atomicfu-0.23.1", "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": "KotlinxCoroutinesCoreJvm-1.7.x", "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.*": "KotlinxCoroutinesCore-1.7.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.*": "KotlinxCoroutinesJdk8-1.7.x", - "software.amazon.awssdk.crt:aws-crt:0.*": "Aws-crt-java-1.0.x" + "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.*": "KotlinxCoroutinesJdk8-1.7.x" }, "packageHandlingRules": { "versioning": { diff --git a/.changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json b/.changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json new file mode 100644 index 00000000..f49eb27f --- /dev/null +++ b/.changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json @@ -0,0 +1,5 @@ +{ + "id": "9f0978c5-7652-4cef-9d03-6aab441c1d8d", + "type": "misc", + "description": "Upgrade to Kotlin 2.0.0" +} \ No newline at end of file diff --git a/aws-crt-kotlin/api/aws-crt-kotlin.api b/aws-crt-kotlin/api/aws-crt-kotlin.api new file mode 100644 index 00000000..635b3d45 --- /dev/null +++ b/aws-crt-kotlin/api/aws-crt-kotlin.api @@ -0,0 +1,998 @@ +public abstract interface class aws/sdk/kotlin/crt/AsyncShutdown { + public abstract fun waitForShutdown (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; +} + +public final class aws/sdk/kotlin/crt/CRT { + public static final field INSTANCE Laws/sdk/kotlin/crt/CRT; + public final fun errorName (I)Ljava/lang/String; + public final fun errorString (I)Ljava/lang/String; + public final fun initRuntime (Lkotlin/jvm/functions/Function1;)V + public static synthetic fun initRuntime$default (Laws/sdk/kotlin/crt/CRT;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun isHttpErrorRetryable (I)Z + public final fun lastError ()I + public final fun nativeMemory ()J +} + +public abstract interface class aws/sdk/kotlin/crt/Closeable { + public abstract fun close ()V +} + +public final class aws/sdk/kotlin/crt/CloseableKt { + public static final fun use (Laws/sdk/kotlin/crt/Closeable;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; +} + +public final class aws/sdk/kotlin/crt/Config { + public fun ()V + public final fun getLogDestination ()Laws/sdk/kotlin/crt/LogDestination; + public final fun getLogFile ()Ljava/lang/String; + public final fun getLogLovel ()Laws/sdk/kotlin/crt/LogLevel; + public final fun setLogDestination (Laws/sdk/kotlin/crt/LogDestination;)V + public final fun setLogFile (Ljava/lang/String;)V + public final fun setLogLovel (Laws/sdk/kotlin/crt/LogLevel;)V +} + +public class aws/sdk/kotlin/crt/CrtRuntimeException : java/lang/RuntimeException { + public fun (Ljava/lang/String;)V + public fun getErrorCode ()I + public final fun getErrorDescription ()Ljava/lang/String; + public final fun getErrorName ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/LogDestination : java/lang/Enum { + public static final field File Laws/sdk/kotlin/crt/LogDestination; + public static final field None Laws/sdk/kotlin/crt/LogDestination; + public static final field Stderr Laws/sdk/kotlin/crt/LogDestination; + public static final field Stdout Laws/sdk/kotlin/crt/LogDestination; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/LogDestination; + public static fun values ()[Laws/sdk/kotlin/crt/LogDestination; +} + +public final class aws/sdk/kotlin/crt/LogLevel : java/lang/Enum { + public static final field Debug Laws/sdk/kotlin/crt/LogLevel; + public static final field Error Laws/sdk/kotlin/crt/LogLevel; + public static final field Fatal Laws/sdk/kotlin/crt/LogLevel; + public static final field Info Laws/sdk/kotlin/crt/LogLevel; + public static final field None Laws/sdk/kotlin/crt/LogLevel; + public static final field Trace Laws/sdk/kotlin/crt/LogLevel; + public static final field Warn Laws/sdk/kotlin/crt/LogLevel; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public final fun getValue ()I + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/LogLevel; + public static fun values ()[Laws/sdk/kotlin/crt/LogLevel; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider : aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider, aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider { + public static final field Companion Laws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider$Companion; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider$Companion { +} + +public final class aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider; + public final fun getRefreshTimeInMilliseconds ()J + public final fun getSource ()Laws/sdk/kotlin/crt/auth/credentials/CredentialsProvider; + public final fun setRefreshTimeInMilliseconds (J)V + public final fun setSource (Laws/sdk/kotlin/crt/auth/credentials/CredentialsProvider;)V +} + +public final class aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderKt { + public static final fun build (Laws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider$Companion;Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/Credentials { + public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + public fun ([B[B[B)V + public final fun component1 ()Ljava/lang/String; + public final fun component2 ()Ljava/lang/String; + public final fun component3 ()Ljava/lang/String; + public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Laws/sdk/kotlin/crt/auth/credentials/Credentials; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/auth/credentials/Credentials;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/sdk/kotlin/crt/auth/credentials/Credentials; + public fun equals (Ljava/lang/Object;)Z + public final fun getAccessKeyId ()Ljava/lang/String; + public final fun getSecretAccessKey ()Ljava/lang/String; + public final fun getSessionToken ()Ljava/lang/String; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public abstract interface class aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider : aws/sdk/kotlin/crt/AsyncShutdown, aws/sdk/kotlin/crt/Closeable { + public abstract fun getCredentials (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider : aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider, aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider { + public static final field Companion Laws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider$Companion; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider$Companion { +} + +public final class aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider; + public final fun getClientBootstrap ()Laws/sdk/kotlin/crt/io/ClientBootstrap; + public final fun setClientBootstrap (Laws/sdk/kotlin/crt/io/ClientBootstrap;)V +} + +public final class aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderKt { + public static final fun build (Laws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider$Companion;Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider : aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider, aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider { + public static final field Companion Laws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider$Companion; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider$Companion { +} + +public final class aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider; + public final fun getAuthToken ()Ljava/lang/String; + public final fun getClientBootstrap ()Laws/sdk/kotlin/crt/io/ClientBootstrap; + public final fun getHost ()Ljava/lang/String; + public final fun getPathAndQuery ()Ljava/lang/String; + public final fun getTlsContext ()Laws/sdk/kotlin/crt/io/TlsContext; + public final fun setAuthToken (Ljava/lang/String;)V + public final fun setClientBootstrap (Laws/sdk/kotlin/crt/io/ClientBootstrap;)V + public final fun setHost (Ljava/lang/String;)V + public final fun setPathAndQuery (Ljava/lang/String;)V + public final fun setTlsContext (Laws/sdk/kotlin/crt/io/TlsContext;)V +} + +public final class aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderKt { + public static final fun build (Laws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider$Companion;Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider; +} + +public abstract class aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider : aws/sdk/kotlin/crt/AsyncShutdown, aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider, java/io/Closeable { + public fun ()V + public fun close ()V + public fun getCredentials (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public fun waitForShutdown (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider : aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider, aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider { + public static final field Companion Laws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider$Companion; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider$Companion { +} + +public final class aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider; + public final fun getClientBootstrap ()Laws/sdk/kotlin/crt/io/ClientBootstrap; + public final fun getConfigFileName ()Ljava/lang/String; + public final fun getCredentialsFileName ()Ljava/lang/String; + public final fun getProfileName ()Ljava/lang/String; + public final fun getTlsContext ()Laws/sdk/kotlin/crt/io/TlsContext; + public final fun setClientBootstrap (Laws/sdk/kotlin/crt/io/ClientBootstrap;)V + public final fun setConfigFileName (Ljava/lang/String;)V + public final fun setCredentialsFileName (Ljava/lang/String;)V + public final fun setProfileName (Ljava/lang/String;)V + public final fun setTlsContext (Laws/sdk/kotlin/crt/io/TlsContext;)V +} + +public final class aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderKt { + public static final fun build (Laws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider$Companion;Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider : aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider, aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider { + public static final field Companion Laws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider$Companion; + public synthetic fun getJniCredentials$aws_crt_kotlin ()Lsoftware/amazon/awssdk/crt/auth/credentials/CredentialsProvider; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider$Companion { +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider; + public final fun getAccessKeyId ()Ljava/lang/String; + public final fun getSecretAccessKey ()Ljava/lang/String; + public final fun getSessionToken ()Ljava/lang/String; + public final fun setAccessKeyId (Ljava/lang/String;)V + public final fun setSecretAccessKey (Ljava/lang/String;)V + public final fun setSessionToken (Ljava/lang/String;)V +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderKt { + public static final fun build (Laws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider$Companion;Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider; + public static final fun fromCredentials (Laws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider$Companion;Laws/sdk/kotlin/crt/auth/credentials/Credentials;)Laws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider : aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider, aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider { + public static final field Companion Laws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider$Companion; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider$Companion { +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider; + public final fun getClientBootstrap ()Laws/sdk/kotlin/crt/io/ClientBootstrap; + public final fun getCredentialsProvider ()Laws/sdk/kotlin/crt/auth/credentials/CredentialsProvider; + public final fun getDurationSeconds ()Ljava/lang/Integer; + public final fun getRoleArn ()Ljava/lang/String; + public final fun getSessionName ()Ljava/lang/String; + public final fun getTlsContext ()Laws/sdk/kotlin/crt/io/TlsContext; + public final fun setClientBootstrap (Laws/sdk/kotlin/crt/io/ClientBootstrap;)V + public final fun setCredentialsProvider (Laws/sdk/kotlin/crt/auth/credentials/CredentialsProvider;)V + public final fun setDurationSeconds (Ljava/lang/Integer;)V + public final fun setRoleArn (Ljava/lang/String;)V + public final fun setSessionName (Ljava/lang/String;)V + public final fun setTlsContext (Laws/sdk/kotlin/crt/io/TlsContext;)V +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderKt { + public static final fun build (Laws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider$Companion;Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider : aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider, aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider { + public static final field Companion Laws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider$Companion; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider$Companion { +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider; + public final fun getClientBootstrap ()Laws/sdk/kotlin/crt/io/ClientBootstrap; + public final fun getTlsContext ()Laws/sdk/kotlin/crt/io/TlsContext; + public final fun setClientBootstrap (Laws/sdk/kotlin/crt/io/ClientBootstrap;)V + public final fun setTlsContext (Laws/sdk/kotlin/crt/io/TlsContext;)V +} + +public final class aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderKt { + public static final fun build (Laws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider$Companion;Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider : aws/sdk/kotlin/crt/auth/credentials/JniCredentialsProvider, aws/sdk/kotlin/crt/auth/credentials/CredentialsProvider { + public static final field Companion Laws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider$Companion; +} + +public final class aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider$Companion { +} + +public final class aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider; + public final fun getClientBootstrap ()Laws/sdk/kotlin/crt/io/ClientBootstrap; + public final fun getEndpoint ()Ljava/lang/String; + public final fun getProxyOptions ()Laws/sdk/kotlin/crt/http/HttpProxyOptions; + public final fun getRoleAlias ()Ljava/lang/String; + public final fun getThingName ()Ljava/lang/String; + public final fun getTlsContext ()Laws/sdk/kotlin/crt/io/TlsContext; + public final fun setClientBootstrap (Laws/sdk/kotlin/crt/io/ClientBootstrap;)V + public final fun setEndpoint (Ljava/lang/String;)V + public final fun setProxyOptions (Laws/sdk/kotlin/crt/http/HttpProxyOptions;)V + public final fun setRoleAlias (Ljava/lang/String;)V + public final fun setThingName (Ljava/lang/String;)V + public final fun setTlsContext (Laws/sdk/kotlin/crt/io/TlsContext;)V +} + +public final class aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderKt { + public static final fun build (Laws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider$Companion;Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider; +} + +public final class aws/sdk/kotlin/crt/auth/signing/AwsSignatureType : java/lang/Enum { + public static final field HTTP_REQUEST_CHUNK Laws/sdk/kotlin/crt/auth/signing/AwsSignatureType; + public static final field HTTP_REQUEST_EVENT Laws/sdk/kotlin/crt/auth/signing/AwsSignatureType; + public static final field HTTP_REQUEST_TRAILING_HEADERS Laws/sdk/kotlin/crt/auth/signing/AwsSignatureType; + public static final field HTTP_REQUEST_VIA_HEADERS Laws/sdk/kotlin/crt/auth/signing/AwsSignatureType; + public static final field HTTP_REQUEST_VIA_QUERY_PARAMS Laws/sdk/kotlin/crt/auth/signing/AwsSignatureType; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public final fun getValue ()I + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/auth/signing/AwsSignatureType; + public static fun values ()[Laws/sdk/kotlin/crt/auth/signing/AwsSignatureType; +} + +public final class aws/sdk/kotlin/crt/auth/signing/AwsSignedBodyHeaderType : java/lang/Enum { + public static final field NONE Laws/sdk/kotlin/crt/auth/signing/AwsSignedBodyHeaderType; + public static final field X_AMZ_CONTENT_SHA256 Laws/sdk/kotlin/crt/auth/signing/AwsSignedBodyHeaderType; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public final fun getValue ()I + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/auth/signing/AwsSignedBodyHeaderType; + public static fun values ()[Laws/sdk/kotlin/crt/auth/signing/AwsSignedBodyHeaderType; +} + +public final class aws/sdk/kotlin/crt/auth/signing/AwsSignedBodyValue { + public static final field EMPTY_SHA256 Ljava/lang/String; + public static final field INSTANCE Laws/sdk/kotlin/crt/auth/signing/AwsSignedBodyValue; + public static final field STREAMING_AWS4_HMAC_SHA256_EVENTS Ljava/lang/String; + public static final field STREAMING_AWS4_HMAC_SHA256_PAYLOAD Ljava/lang/String; + public static final field UNSIGNED_PAYLOAD Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/auth/signing/AwsSigner { + public static final field INSTANCE Laws/sdk/kotlin/crt/auth/signing/AwsSigner; + public final fun sign (Laws/sdk/kotlin/crt/http/HttpRequest;Laws/sdk/kotlin/crt/auth/signing/AwsSigningConfig;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public final fun signChunk ([B[BLaws/sdk/kotlin/crt/auth/signing/AwsSigningConfig;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public final fun signChunkTrailer (Laws/sdk/kotlin/crt/http/Headers;[BLaws/sdk/kotlin/crt/auth/signing/AwsSigningConfig;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public final fun signRequest (Laws/sdk/kotlin/crt/http/HttpRequest;Laws/sdk/kotlin/crt/auth/signing/AwsSigningConfig;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; +} + +public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm : java/lang/Enum { + public static final field SIGV4 Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; + public static final field SIGV4_ASYMMETRIC Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; + public static final field SIGV4_S3EXPRESS Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public final fun getValue ()I + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; + public static fun values ()[Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; +} + +public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig { + public static final field Companion Laws/sdk/kotlin/crt/auth/signing/AwsSigningConfig$Companion; + public fun (Laws/sdk/kotlin/crt/auth/signing/AwsSigningConfig$Builder;)V + public final fun getAlgorithm ()Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; + public final fun getCredentials ()Laws/sdk/kotlin/crt/auth/credentials/Credentials; + public final fun getCredentialsProvider ()Laws/sdk/kotlin/crt/auth/credentials/CredentialsProvider; + public final fun getDate ()J + public final fun getExpirationInSeconds ()J + public final fun getNormalizeUriPath ()Z + public final fun getOmitSessionToken ()Z + public final fun getRegion ()Ljava/lang/String; + public final fun getService ()Ljava/lang/String; + public final fun getShouldSignHeader ()Lkotlin/jvm/functions/Function1; + public final fun getSignatureType ()Laws/sdk/kotlin/crt/auth/signing/AwsSignatureType; + public final fun getSignedBodyHeader ()Laws/sdk/kotlin/crt/auth/signing/AwsSignedBodyHeaderType; + public final fun getSignedBodyValue ()Ljava/lang/String; + public final fun getUseDoubleUriEncode ()Z + public final fun toBuilder ()Laws/sdk/kotlin/crt/auth/signing/AwsSigningConfig$Builder; +} + +public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig$Builder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/auth/signing/AwsSigningConfig; + public final fun getAlgorithm ()Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm; + public final fun getCredentials ()Laws/sdk/kotlin/crt/auth/credentials/Credentials; + public final fun getCredentialsProvider ()Laws/sdk/kotlin/crt/auth/credentials/CredentialsProvider; + public final fun getDate ()Ljava/lang/Long; + public final fun getExpirationInSeconds ()J + public final fun getNormalizeUriPath ()Z + public final fun getOmitSessionToken ()Z + public final fun getRegion ()Ljava/lang/String; + public final fun getService ()Ljava/lang/String; + public final fun getShouldSignHeader ()Lkotlin/jvm/functions/Function1; + public final fun getSignatureType ()Laws/sdk/kotlin/crt/auth/signing/AwsSignatureType; + public final fun getSignedBodyHeader ()Laws/sdk/kotlin/crt/auth/signing/AwsSignedBodyHeaderType; + public final fun getSignedBodyValue ()Ljava/lang/String; + public final fun getUseDoubleUriEncode ()Z + public final fun setAlgorithm (Laws/sdk/kotlin/crt/auth/signing/AwsSigningAlgorithm;)V + public final fun setCredentials (Laws/sdk/kotlin/crt/auth/credentials/Credentials;)V + public final fun setCredentialsProvider (Laws/sdk/kotlin/crt/auth/credentials/CredentialsProvider;)V + public final fun setDate (Ljava/lang/Long;)V + public final fun setExpirationInSeconds (J)V + public final fun setNormalizeUriPath (Z)V + public final fun setOmitSessionToken (Z)V + public final fun setRegion (Ljava/lang/String;)V + public final fun setService (Ljava/lang/String;)V + public final fun setShouldSignHeader (Lkotlin/jvm/functions/Function1;)V + public final fun setSignatureType (Laws/sdk/kotlin/crt/auth/signing/AwsSignatureType;)V + public final fun setSignedBodyHeader (Laws/sdk/kotlin/crt/auth/signing/AwsSignedBodyHeaderType;)V + public final fun setSignedBodyValue (Ljava/lang/String;)V + public final fun setUseDoubleUriEncode (Z)V +} + +public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningConfig$Companion { + public final fun build (Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/auth/signing/AwsSigningConfig; +} + +public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningResult { + public fun (Laws/sdk/kotlin/crt/http/HttpRequest;[B)V + public final fun component1 ()Laws/sdk/kotlin/crt/http/HttpRequest; + public final fun component2 ()[B + public final fun copy (Laws/sdk/kotlin/crt/http/HttpRequest;[B)Laws/sdk/kotlin/crt/auth/signing/AwsSigningResult; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/auth/signing/AwsSigningResult;Laws/sdk/kotlin/crt/http/HttpRequest;[BILjava/lang/Object;)Laws/sdk/kotlin/crt/auth/signing/AwsSigningResult; + public fun equals (Ljava/lang/Object;)Z + public final fun getSignature ()[B + public final fun getSignedRequest ()Laws/sdk/kotlin/crt/http/HttpRequest; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public abstract interface class aws/sdk/kotlin/crt/http/Headers { + public static final field Companion Laws/sdk/kotlin/crt/http/Headers$Companion; + public abstract fun contains (Ljava/lang/String;)Z + public abstract fun contains (Ljava/lang/String;Ljava/lang/String;)Z + public abstract fun entries ()Ljava/util/Set; + public abstract fun forEach (Lkotlin/jvm/functions/Function2;)V + public abstract fun get (Ljava/lang/String;)Ljava/lang/String; + public abstract fun getAll (Ljava/lang/String;)Ljava/util/List; + public abstract fun isEmpty ()Z + public abstract fun names ()Ljava/util/Set; +} + +public final class aws/sdk/kotlin/crt/http/Headers$Companion { + public final fun build (Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/http/Headers; +} + +public final class aws/sdk/kotlin/crt/http/Headers$DefaultImpls { + public static fun contains (Laws/sdk/kotlin/crt/http/Headers;Ljava/lang/String;Ljava/lang/String;)Z + public static fun forEach (Laws/sdk/kotlin/crt/http/Headers;Lkotlin/jvm/functions/Function2;)V + public static fun get (Laws/sdk/kotlin/crt/http/Headers;Ljava/lang/String;)Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/http/HeadersBuilder { + public fun ()V + public final fun append (Ljava/lang/String;Ljava/lang/String;)V + public final fun appendAll (Laws/sdk/kotlin/crt/http/Headers;)V + public final fun appendAll (Ljava/lang/String;Ljava/lang/Iterable;)V + public final fun appendMissing (Laws/sdk/kotlin/crt/http/Headers;)V + public final fun appendMissing (Ljava/lang/String;Ljava/lang/Iterable;)V + public final fun build ()Laws/sdk/kotlin/crt/http/Headers; + public final fun clear ()V + public final fun contains (Ljava/lang/String;)Z + public final fun contains (Ljava/lang/String;Ljava/lang/String;)Z + public final fun entries ()Ljava/util/Set; + public final fun get (Ljava/lang/String;)Ljava/lang/String; + public final fun getAll (Ljava/lang/String;)Ljava/util/List; + public final fun isEmpty ()Z + public final fun names ()Ljava/util/Set; + public final fun remove (Ljava/lang/String;)Ljava/util/List; + public final fun remove (Ljava/lang/String;Ljava/lang/String;)Z + public final fun removeKeysWithNoEntries ()V + public final fun set (Ljava/lang/String;Ljava/lang/String;)V +} + +public abstract interface class aws/sdk/kotlin/crt/http/HttpClientConnection : aws/sdk/kotlin/crt/Closeable { + public abstract fun getId ()Ljava/lang/String; + public abstract fun makeRequest (Laws/sdk/kotlin/crt/http/HttpRequest;Laws/sdk/kotlin/crt/http/HttpStreamResponseHandler;)Laws/sdk/kotlin/crt/http/HttpStream; + public abstract fun shutdown ()V +} + +public final class aws/sdk/kotlin/crt/http/HttpClientConnectionManager : aws/sdk/kotlin/crt/AsyncShutdown, aws/sdk/kotlin/crt/Closeable { + public fun (Laws/sdk/kotlin/crt/http/HttpClientConnectionManagerOptions;)V + public final fun acquireConnection (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public fun close ()V + public final fun getManagerMetrics ()Laws/sdk/kotlin/crt/http/HttpManagerMetrics; + public final fun getOptions ()Laws/sdk/kotlin/crt/http/HttpClientConnectionManagerOptions; + public final fun releaseConnection (Laws/sdk/kotlin/crt/http/HttpClientConnection;)V + public fun waitForShutdown (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; +} + +public final class aws/sdk/kotlin/crt/http/HttpClientConnectionManagerOptions { + public static final field Companion Laws/sdk/kotlin/crt/http/HttpClientConnectionManagerOptions$Companion; + public static final field DEFAULT_INITIAL_WINDOW_SIZE I + public static final field DEFAULT_MAX_CONNECTIONS I + public final fun getClientBootstrap ()Laws/sdk/kotlin/crt/io/ClientBootstrap; + public final fun getInitialWindowSize ()I + public final fun getManualWindowManagement ()Z + public final fun getMaxConnectionIdleMs ()J + public final fun getMaxConnections ()I + public final fun getMonitoringOptions ()Laws/sdk/kotlin/crt/http/HttpMonitoringOptions; + public final fun getProxyOptions ()Laws/sdk/kotlin/crt/http/HttpProxyOptions; + public final fun getSocketOptions ()Laws/sdk/kotlin/crt/io/SocketOptions; + public final fun getTlsContext ()Laws/sdk/kotlin/crt/io/TlsContext; + public final fun getUri ()Laws/sdk/kotlin/crt/io/Uri; +} + +public final class aws/sdk/kotlin/crt/http/HttpClientConnectionManagerOptions$Companion { + public final fun build (Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/http/HttpClientConnectionManagerOptions; +} + +public final class aws/sdk/kotlin/crt/http/HttpClientConnectionManagerOptionsBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/http/HttpClientConnectionManagerOptions; + public final fun getClientBootstrap ()Laws/sdk/kotlin/crt/io/ClientBootstrap; + public final fun getInitialWindowSize ()I + public final fun getManualWindowManagement ()Z + public final fun getMaxConnectionIdleMs ()J + public final fun getMaxConnections ()I + public final fun getMonitoringOptions ()Laws/sdk/kotlin/crt/http/HttpMonitoringOptions; + public final fun getProxyOptions ()Laws/sdk/kotlin/crt/http/HttpProxyOptions; + public final fun getSocketOptions ()Laws/sdk/kotlin/crt/io/SocketOptions; + public final fun getTlsContext ()Laws/sdk/kotlin/crt/io/TlsContext; + public final fun getUri ()Laws/sdk/kotlin/crt/io/Uri; + public final fun setClientBootstrap (Laws/sdk/kotlin/crt/io/ClientBootstrap;)V + public final fun setInitialWindowSize (I)V + public final fun setManualWindowManagement (Z)V + public final fun setMaxConnectionIdleMs (J)V + public final fun setMaxConnections (I)V + public final fun setMonitoringOptions (Laws/sdk/kotlin/crt/http/HttpMonitoringOptions;)V + public final fun setProxyOptions (Laws/sdk/kotlin/crt/http/HttpProxyOptions;)V + public final fun setSocketOptions (Laws/sdk/kotlin/crt/io/SocketOptions;)V + public final fun setTlsContext (Laws/sdk/kotlin/crt/io/TlsContext;)V + public final fun setUri (Laws/sdk/kotlin/crt/io/Uri;)V + public final fun uri (Lkotlin/jvm/functions/Function1;)V +} + +public final class aws/sdk/kotlin/crt/http/HttpException : aws/sdk/kotlin/crt/CrtRuntimeException { + public fun (I)V + public fun getErrorCode ()I +} + +public final class aws/sdk/kotlin/crt/http/HttpHeader { + public fun (Ljava/lang/String;Ljava/lang/String;)V + public final fun component1 ()Ljava/lang/String; + public final fun component2 ()Ljava/lang/String; + public final fun copy (Ljava/lang/String;Ljava/lang/String;)Laws/sdk/kotlin/crt/http/HttpHeader; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/http/HttpHeader;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/sdk/kotlin/crt/http/HttpHeader; + public fun equals (Ljava/lang/Object;)Z + public final fun getName ()Ljava/lang/String; + public final fun getValue ()Ljava/lang/String; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/http/HttpHeaderBlock : java/lang/Enum { + public static final field INFORMATIONAL Laws/sdk/kotlin/crt/http/HttpHeaderBlock; + public static final field MAIN Laws/sdk/kotlin/crt/http/HttpHeaderBlock; + public static final field TRAILING Laws/sdk/kotlin/crt/http/HttpHeaderBlock; + public final fun getBlockType ()I + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/http/HttpHeaderBlock; + public static fun values ()[Laws/sdk/kotlin/crt/http/HttpHeaderBlock; +} + +public final class aws/sdk/kotlin/crt/http/HttpManagerMetrics { + public fun (JJJ)V + public final fun component1 ()J + public final fun component2 ()J + public final fun component3 ()J + public final fun copy (JJJ)Laws/sdk/kotlin/crt/http/HttpManagerMetrics; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/http/HttpManagerMetrics;JJJILjava/lang/Object;)Laws/sdk/kotlin/crt/http/HttpManagerMetrics; + public fun equals (Ljava/lang/Object;)Z + public final fun getAvailableConcurrency ()J + public final fun getLeasedConcurrency ()J + public final fun getPendingConcurrencyAcquires ()J + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/http/HttpMonitoringOptions { + public fun ()V + public fun (II)V + public synthetic fun (IIILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()I + public final fun component2 ()I + public final fun copy (II)Laws/sdk/kotlin/crt/http/HttpMonitoringOptions; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/http/HttpMonitoringOptions;IIILjava/lang/Object;)Laws/sdk/kotlin/crt/http/HttpMonitoringOptions; + public fun equals (Ljava/lang/Object;)Z + public final fun getAllowableThroughputFailureIntervalSeconds ()I + public final fun getMinThroughputBytesPerSecond ()I + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/http/HttpProxyAuthorizationType : java/lang/Enum { + public static final field Basic Laws/sdk/kotlin/crt/http/HttpProxyAuthorizationType; + public static final field None Laws/sdk/kotlin/crt/http/HttpProxyAuthorizationType; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public final fun getValue ()I + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/http/HttpProxyAuthorizationType; + public static fun values ()[Laws/sdk/kotlin/crt/http/HttpProxyAuthorizationType; +} + +public final class aws/sdk/kotlin/crt/http/HttpProxyOptions { + public fun (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/io/TlsContext;Laws/sdk/kotlin/crt/http/HttpProxyAuthorizationType;)V + public synthetic fun (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/io/TlsContext;Laws/sdk/kotlin/crt/http/HttpProxyAuthorizationType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Ljava/lang/String; + public final fun component2 ()Ljava/lang/Integer; + public final fun component3 ()Ljava/lang/String; + public final fun component4 ()Ljava/lang/String; + public final fun component5 ()Laws/sdk/kotlin/crt/io/TlsContext; + public final fun component6 ()Laws/sdk/kotlin/crt/http/HttpProxyAuthorizationType; + public final fun copy (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/io/TlsContext;Laws/sdk/kotlin/crt/http/HttpProxyAuthorizationType;)Laws/sdk/kotlin/crt/http/HttpProxyOptions; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/http/HttpProxyOptions;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/io/TlsContext;Laws/sdk/kotlin/crt/http/HttpProxyAuthorizationType;ILjava/lang/Object;)Laws/sdk/kotlin/crt/http/HttpProxyOptions; + public fun equals (Ljava/lang/Object;)Z + public final fun getAuthPassword ()Ljava/lang/String; + public final fun getAuthType ()Laws/sdk/kotlin/crt/http/HttpProxyAuthorizationType; + public final fun getAuthUsername ()Ljava/lang/String; + public final fun getHost ()Ljava/lang/String; + public final fun getPort ()Ljava/lang/Integer; + public final fun getTlsContext ()Laws/sdk/kotlin/crt/io/TlsContext; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/http/HttpRequest { + public static final field Companion Laws/sdk/kotlin/crt/http/HttpRequest$Companion; + public fun (Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/http/Headers;Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;)V + public synthetic fun (Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/http/Headers;Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Ljava/lang/String; + public final fun component2 ()Ljava/lang/String; + public final fun component3 ()Laws/sdk/kotlin/crt/http/Headers; + public final fun component4 ()Laws/sdk/kotlin/crt/http/HttpRequestBodyStream; + public final fun copy (Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/http/Headers;Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;)Laws/sdk/kotlin/crt/http/HttpRequest; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/http/HttpRequest;Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/http/Headers;Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;ILjava/lang/Object;)Laws/sdk/kotlin/crt/http/HttpRequest; + public fun equals (Ljava/lang/Object;)Z + public final fun getBody ()Laws/sdk/kotlin/crt/http/HttpRequestBodyStream; + public final fun getEncodedPath ()Ljava/lang/String; + public final fun getHeaders ()Laws/sdk/kotlin/crt/http/Headers; + public final fun getMethod ()Ljava/lang/String; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/http/HttpRequest$Companion { + public final fun build (Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/http/HttpRequest; +} + +public abstract interface class aws/sdk/kotlin/crt/http/HttpRequestBodyStream { + public static final field Companion Laws/sdk/kotlin/crt/http/HttpRequestBodyStream$Companion; + public abstract fun resetPosition ()Z + public abstract fun sendRequestBody (Laws/sdk/kotlin/crt/io/MutableBuffer;)Z +} + +public final class aws/sdk/kotlin/crt/http/HttpRequestBodyStream$Companion { + public final fun fromByteArray ([B)Laws/sdk/kotlin/crt/http/HttpRequestBodyStream; +} + +public final class aws/sdk/kotlin/crt/http/HttpRequestBodyStream$DefaultImpls { + public static fun resetPosition (Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;)Z + public static fun sendRequestBody (Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;Laws/sdk/kotlin/crt/io/MutableBuffer;)Z +} + +public final class aws/sdk/kotlin/crt/http/HttpRequestBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/http/HttpRequest; + public final fun getBody ()Laws/sdk/kotlin/crt/http/HttpRequestBodyStream; + public final fun getEncodedPath ()Ljava/lang/String; + public final fun getHeaders ()Laws/sdk/kotlin/crt/http/HeadersBuilder; + public final fun getMethod ()Ljava/lang/String; + public final fun setBody (Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;)V + public final fun setEncodedPath (Ljava/lang/String;)V + public final fun setMethod (Ljava/lang/String;)V +} + +public final class aws/sdk/kotlin/crt/http/HttpRequestKt { + public static final fun headers (Laws/sdk/kotlin/crt/http/HttpRequestBuilder;Lkotlin/jvm/functions/Function1;)V +} + +public abstract interface class aws/sdk/kotlin/crt/http/HttpStream : aws/sdk/kotlin/crt/Closeable { + public abstract fun activate ()V + public abstract fun getResponseStatusCode ()I + public abstract fun incrementWindow (I)V + public abstract fun writeChunk ([BZ)V +} + +public final class aws/sdk/kotlin/crt/http/HttpStreamMetrics { + public fun (JJJJJJI)V + public final fun component1 ()J + public final fun component2 ()J + public final fun component3 ()J + public final fun component4 ()J + public final fun component5 ()J + public final fun component6 ()J + public final fun component7 ()I + public final fun copy (JJJJJJI)Laws/sdk/kotlin/crt/http/HttpStreamMetrics; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/http/HttpStreamMetrics;JJJJJJIILjava/lang/Object;)Laws/sdk/kotlin/crt/http/HttpStreamMetrics; + public fun equals (Ljava/lang/Object;)Z + public final fun getReceiveEndTimestampNs ()J + public final fun getReceiveStartTimestampNs ()J + public final fun getReceivingDurationNs ()J + public final fun getSendEndTimestampNs ()J + public final fun getSendStartTimestampNs ()J + public final fun getSendingDurationNs ()J + public final fun getStreamId ()I + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/http/HttpStreamMetricsJVMKt { + public static final fun toKotlin (Lsoftware/amazon/awssdk/crt/http/HttpStreamMetrics;)Laws/sdk/kotlin/crt/http/HttpStreamMetrics; +} + +public abstract interface class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler { + public abstract fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V + public abstract fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I + public abstract fun onResponseComplete (Laws/sdk/kotlin/crt/http/HttpStream;I)V + public abstract fun onResponseHeaders (Laws/sdk/kotlin/crt/http/HttpStream;IILjava/util/List;)V + public abstract fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStream;I)V +} + +public final class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler$DefaultImpls { + public static fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStreamResponseHandler;Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V + public static fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStreamResponseHandler;Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I + public static fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStreamResponseHandler;Laws/sdk/kotlin/crt/http/HttpStream;I)V +} + +public abstract interface class aws/sdk/kotlin/crt/io/Buffer { + public static final field Companion Laws/sdk/kotlin/crt/io/Buffer$Companion; + public abstract fun copyTo ([BI)I + public abstract fun getLen ()I + public abstract fun readAll ()[B +} + +public final class aws/sdk/kotlin/crt/io/Buffer$Companion { + public final fun getEmpty ()Laws/sdk/kotlin/crt/io/Buffer; +} + +public final class aws/sdk/kotlin/crt/io/Buffer$DefaultImpls { + public static synthetic fun copyTo$default (Laws/sdk/kotlin/crt/io/Buffer;[BIILjava/lang/Object;)I +} + +public final class aws/sdk/kotlin/crt/io/BufferKt { + public static final fun byteArrayBuffer ([B)Laws/sdk/kotlin/crt/io/Buffer; +} + +public final class aws/sdk/kotlin/crt/io/ClientBootstrap : aws/sdk/kotlin/crt/AsyncShutdown, aws/sdk/kotlin/crt/Closeable { + public fun (Laws/sdk/kotlin/crt/io/EventLoopGroup;Laws/sdk/kotlin/crt/io/HostResolver;)V + public fun close ()V + public fun waitForShutdown (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; +} + +public final class aws/sdk/kotlin/crt/io/EventLoopGroup : aws/sdk/kotlin/crt/AsyncShutdown, aws/sdk/kotlin/crt/Closeable { + public fun ()V + public fun (I)V + public synthetic fun (IILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun close ()V + public fun waitForShutdown (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; +} + +public final class aws/sdk/kotlin/crt/io/HostResolver : aws/sdk/kotlin/crt/AsyncShutdown, aws/sdk/kotlin/crt/Closeable { + public fun (Laws/sdk/kotlin/crt/io/EventLoopGroup;)V + public fun (Laws/sdk/kotlin/crt/io/EventLoopGroup;I)V + public fun close ()V + public fun waitForShutdown (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; +} + +public final class aws/sdk/kotlin/crt/io/MutableBuffer { + public static final field Companion Laws/sdk/kotlin/crt/io/MutableBuffer$Companion; + public fun (Ljava/nio/ByteBuffer;)V + public final fun getBuffer ()Ljava/nio/ByteBuffer; + public final fun getWriteRemaining ()I + public final fun write ([BII)I + public static synthetic fun write$default (Laws/sdk/kotlin/crt/io/MutableBuffer;[BIIILjava/lang/Object;)I +} + +public final class aws/sdk/kotlin/crt/io/MutableBuffer$Companion { + public final fun of ([B)Laws/sdk/kotlin/crt/io/MutableBuffer; +} + +public final class aws/sdk/kotlin/crt/io/Protocol { + public static final field Companion Laws/sdk/kotlin/crt/io/Protocol$Companion; + public fun (Ljava/lang/String;I)V + public final fun component1 ()Ljava/lang/String; + public final fun component2 ()I + public final fun copy (Ljava/lang/String;I)Laws/sdk/kotlin/crt/io/Protocol; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/io/Protocol;Ljava/lang/String;IILjava/lang/Object;)Laws/sdk/kotlin/crt/io/Protocol; + public fun equals (Ljava/lang/Object;)Z + public final fun getDefaultPort ()I + public final fun getName ()Ljava/lang/String; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/io/Protocol$Companion { + public final fun createOrDefault (Ljava/lang/String;)Laws/sdk/kotlin/crt/io/Protocol; + public final fun getByName ()Ljava/util/Map; + public final fun getHTTP ()Laws/sdk/kotlin/crt/io/Protocol; + public final fun getHTTPS ()Laws/sdk/kotlin/crt/io/Protocol; + public final fun getWS ()Laws/sdk/kotlin/crt/io/Protocol; + public final fun getWSS ()Laws/sdk/kotlin/crt/io/Protocol; +} + +public final class aws/sdk/kotlin/crt/io/SocketDomain : java/lang/Enum { + public static final field IPv4 Laws/sdk/kotlin/crt/io/SocketDomain; + public static final field IPv6 Laws/sdk/kotlin/crt/io/SocketDomain; + public static final field LOCAL Laws/sdk/kotlin/crt/io/SocketDomain; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public final fun getValue ()I + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/io/SocketDomain; + public static fun values ()[Laws/sdk/kotlin/crt/io/SocketDomain; +} + +public final class aws/sdk/kotlin/crt/io/SocketOptions { + public fun ()V + public fun (Laws/sdk/kotlin/crt/io/SocketDomain;Laws/sdk/kotlin/crt/io/SocketType;III)V + public synthetic fun (Laws/sdk/kotlin/crt/io/SocketDomain;Laws/sdk/kotlin/crt/io/SocketType;IIIILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Laws/sdk/kotlin/crt/io/SocketDomain; + public final fun component2 ()Laws/sdk/kotlin/crt/io/SocketType; + public final fun component3 ()I + public final fun component4 ()I + public final fun component5 ()I + public final fun copy (Laws/sdk/kotlin/crt/io/SocketDomain;Laws/sdk/kotlin/crt/io/SocketType;III)Laws/sdk/kotlin/crt/io/SocketOptions; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/io/SocketOptions;Laws/sdk/kotlin/crt/io/SocketDomain;Laws/sdk/kotlin/crt/io/SocketType;IIIILjava/lang/Object;)Laws/sdk/kotlin/crt/io/SocketOptions; + public fun equals (Ljava/lang/Object;)Z + public final fun getConnectTimeoutMs ()I + public final fun getDomain ()Laws/sdk/kotlin/crt/io/SocketDomain; + public final fun getKeepAliveIntervalSecs ()I + public final fun getKeepAliveTimeoutSecs ()I + public final fun getType ()Laws/sdk/kotlin/crt/io/SocketType; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/io/SocketType : java/lang/Enum { + public static final field DGRAM Laws/sdk/kotlin/crt/io/SocketType; + public static final field STREAM Laws/sdk/kotlin/crt/io/SocketType; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public final fun getValue ()I + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/io/SocketType; + public static fun values ()[Laws/sdk/kotlin/crt/io/SocketType; +} + +public final class aws/sdk/kotlin/crt/io/TlsCipherPreference : java/lang/Enum { + public static final field KMS_PQ_SIKE_TLS_V1_0_2019_11 Laws/sdk/kotlin/crt/io/TlsCipherPreference; + public static final field KMS_PQ_SIKE_TLS_V1_0_2020_02 Laws/sdk/kotlin/crt/io/TlsCipherPreference; + public static final field KMS_PQ_TLS_V1_0_2019_06 Laws/sdk/kotlin/crt/io/TlsCipherPreference; + public static final field KMS_PQ_TLS_V1_0_2020_02 Laws/sdk/kotlin/crt/io/TlsCipherPreference; + public static final field KMS_PQ_TLS_V1_0_2020_07 Laws/sdk/kotlin/crt/io/TlsCipherPreference; + public static final field PQ_TLS_V1_0_2021_05 Laws/sdk/kotlin/crt/io/TlsCipherPreference; + public static final field SYSTEM_DEFAULT Laws/sdk/kotlin/crt/io/TlsCipherPreference; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public final fun getValue ()I + public final fun isSupported ()Z + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/io/TlsCipherPreference; + public static fun values ()[Laws/sdk/kotlin/crt/io/TlsCipherPreference; +} + +public final class aws/sdk/kotlin/crt/io/TlsContext : aws/sdk/kotlin/crt/Closeable { + public static final field Companion Laws/sdk/kotlin/crt/io/TlsContext$Companion; + public fun ()V + public fun (Laws/sdk/kotlin/crt/io/TlsContextOptions;)V + public synthetic fun (Laws/sdk/kotlin/crt/io/TlsContextOptions;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun close ()V +} + +public final class aws/sdk/kotlin/crt/io/TlsContext$Companion { +} + +public final class aws/sdk/kotlin/crt/io/TlsContextKt { + public static final fun build (Laws/sdk/kotlin/crt/io/TlsContext$Companion;Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/io/TlsContext; +} + +public final class aws/sdk/kotlin/crt/io/TlsContextOptions { + public static final field Companion Laws/sdk/kotlin/crt/io/TlsContextOptions$Companion; + public final fun getAlpn ()Ljava/lang/String; + public final fun getCaDir ()Ljava/lang/String; + public final fun getCaFile ()Ljava/lang/String; + public final fun getCaRoot ()Ljava/lang/String; + public final fun getCertificate ()Ljava/lang/String; + public final fun getCertificatePath ()Ljava/lang/String; + public final fun getMinTlsVersion ()Laws/sdk/kotlin/crt/io/TlsVersion; + public final fun getPkcs12Password ()Ljava/lang/String; + public final fun getPkcs12Path ()Ljava/lang/String; + public final fun getPrivateKey ()Ljava/lang/String; + public final fun getPrivateKeyPath ()Ljava/lang/String; + public final fun getTlsCipherPreference ()Laws/sdk/kotlin/crt/io/TlsCipherPreference; + public final fun getVerifyPeer ()Z +} + +public final class aws/sdk/kotlin/crt/io/TlsContextOptions$Companion { + public final fun build (Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/io/TlsContextOptions; + public final fun defaultClient ()Laws/sdk/kotlin/crt/io/TlsContextOptions; + public final fun defaultServer ()Laws/sdk/kotlin/crt/io/TlsContextOptions; + public final fun isAlpnSupported ()Z + public final fun isCipherPreferenceSupported (Laws/sdk/kotlin/crt/io/TlsCipherPreference;)Z +} + +public final class aws/sdk/kotlin/crt/io/TlsContextOptionsBuilder { + public fun ()V + public final fun build ()Laws/sdk/kotlin/crt/io/TlsContextOptions; + public final fun getAlpn ()Ljava/lang/String; + public final fun getCaDir ()Ljava/lang/String; + public final fun getCaFile ()Ljava/lang/String; + public final fun getCaRoot ()Ljava/lang/String; + public final fun getCertificate ()Ljava/lang/String; + public final fun getCertificatePath ()Ljava/lang/String; + public final fun getMinTlsVersion ()Laws/sdk/kotlin/crt/io/TlsVersion; + public final fun getPkcs12Password ()Ljava/lang/String; + public final fun getPkcs12Path ()Ljava/lang/String; + public final fun getPrivateKey ()Ljava/lang/String; + public final fun getPrivateKeyPath ()Ljava/lang/String; + public final fun getTlsCipherPreference ()Laws/sdk/kotlin/crt/io/TlsCipherPreference; + public final fun getVerifyPeer ()Z + public final fun setAlpn (Ljava/lang/String;)V + public final fun setCaDir (Ljava/lang/String;)V + public final fun setCaFile (Ljava/lang/String;)V + public final fun setCaRoot (Ljava/lang/String;)V + public final fun setCertificate (Ljava/lang/String;)V + public final fun setCertificatePath (Ljava/lang/String;)V + public final fun setMinTlsVersion (Laws/sdk/kotlin/crt/io/TlsVersion;)V + public final fun setPkcs12Password (Ljava/lang/String;)V + public final fun setPkcs12Path (Ljava/lang/String;)V + public final fun setPrivateKey (Ljava/lang/String;)V + public final fun setPrivateKeyPath (Ljava/lang/String;)V + public final fun setTlsCipherPreference (Laws/sdk/kotlin/crt/io/TlsCipherPreference;)V + public final fun setVerifyPeer (Z)V +} + +public final class aws/sdk/kotlin/crt/io/TlsVersion : java/lang/Enum { + public static final field SSLv3 Laws/sdk/kotlin/crt/io/TlsVersion; + public static final field SYS_DEFAULT Laws/sdk/kotlin/crt/io/TlsVersion; + public static final field TLS_V1_1 Laws/sdk/kotlin/crt/io/TlsVersion; + public static final field TLS_V1_2 Laws/sdk/kotlin/crt/io/TlsVersion; + public static final field TLS_V1_3 Laws/sdk/kotlin/crt/io/TlsVersion; + public static final field TLSv1 Laws/sdk/kotlin/crt/io/TlsVersion; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public final fun getValue ()I + public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/crt/io/TlsVersion; + public static fun values ()[Laws/sdk/kotlin/crt/io/TlsVersion; +} + +public final class aws/sdk/kotlin/crt/io/Uri { + public static final field Companion Laws/sdk/kotlin/crt/io/Uri$Companion; + public fun (Laws/sdk/kotlin/crt/io/Protocol;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/io/UserInfo;Z)V + public synthetic fun (Laws/sdk/kotlin/crt/io/Protocol;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/io/UserInfo;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Laws/sdk/kotlin/crt/io/Protocol; + public final fun component2 ()Ljava/lang/String; + public final fun component3 ()I + public final fun component4 ()Ljava/lang/String; + public final fun component5 ()Ljava/lang/String; + public final fun component6 ()Ljava/lang/String; + public final fun component7 ()Laws/sdk/kotlin/crt/io/UserInfo; + public final fun component8 ()Z + public final fun copy (Laws/sdk/kotlin/crt/io/Protocol;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/io/UserInfo;Z)Laws/sdk/kotlin/crt/io/Uri; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/io/Uri;Laws/sdk/kotlin/crt/io/Protocol;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Laws/sdk/kotlin/crt/io/UserInfo;ZILjava/lang/Object;)Laws/sdk/kotlin/crt/io/Uri; + public fun equals (Ljava/lang/Object;)Z + public final fun getAuthority ()Ljava/lang/String; + public final fun getForceQuery ()Z + public final fun getFragment ()Ljava/lang/String; + public final fun getHost ()Ljava/lang/String; + public final fun getHostAndPort ()Ljava/lang/String; + public final fun getParameters ()Ljava/lang/String; + public final fun getPath ()Ljava/lang/String; + public final fun getPort ()I + public final fun getScheme ()Laws/sdk/kotlin/crt/io/Protocol; + public final fun getSpecifiedPort ()I + public final fun getUserInfo ()Laws/sdk/kotlin/crt/io/UserInfo; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/io/Uri$Companion { + public final fun build (Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/io/Uri; + public final fun parse (Ljava/lang/String;)Laws/sdk/kotlin/crt/io/Uri; +} + +public final class aws/sdk/kotlin/crt/io/UriBuilder { + public static final field Companion Laws/sdk/kotlin/crt/io/UriBuilder$Companion; + public fun ()V + public final fun getForceQuery ()Z + public final fun getFragment ()Ljava/lang/String; + public final fun getHost ()Ljava/lang/String; + public final fun getParameters ()Ljava/lang/String; + public final fun getPath ()Ljava/lang/String; + public final fun getPort ()Ljava/lang/Integer; + public final fun getScheme ()Laws/sdk/kotlin/crt/io/Protocol; + public final fun getUserInfo ()Laws/sdk/kotlin/crt/io/UserInfo; + public final fun setForceQuery (Z)V + public final fun setFragment (Ljava/lang/String;)V + public final fun setHost (Ljava/lang/String;)V + public final fun setParameters (Ljava/lang/String;)V + public final fun setPath (Ljava/lang/String;)V + public final fun setPort (Ljava/lang/Integer;)V + public final fun setScheme (Laws/sdk/kotlin/crt/io/Protocol;)V + public final fun setUserInfo (Laws/sdk/kotlin/crt/io/UserInfo;)V +} + +public final class aws/sdk/kotlin/crt/io/UriBuilder$Companion { + public final fun build (Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/io/Uri; +} + +public final class aws/sdk/kotlin/crt/io/UriKt { + public static final field DEFAULT_SCHEME_PORT I + public static final fun requiresTls (Laws/sdk/kotlin/crt/io/Protocol;)Z +} + +public final class aws/sdk/kotlin/crt/io/UserInfo { + public fun (Ljava/lang/String;Ljava/lang/String;)V + public final fun component1 ()Ljava/lang/String; + public final fun component2 ()Ljava/lang/String; + public final fun copy (Ljava/lang/String;Ljava/lang/String;)Laws/sdk/kotlin/crt/io/UserInfo; + public static synthetic fun copy$default (Laws/sdk/kotlin/crt/io/UserInfo;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/sdk/kotlin/crt/io/UserInfo; + public fun equals (Ljava/lang/Object;)Z + public final fun getPassword ()Ljava/lang/String; + public final fun getUsername ()Ljava/lang/String; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class aws/sdk/kotlin/crt/util/Digest { + public static final field INSTANCE Laws/sdk/kotlin/crt/util/Digest; + public final fun sha256 ([B)[B +} + +public final class aws/sdk/kotlin/crt/util/DigestKt { + public static final fun encodeToHex ([B)Ljava/lang/String; + public static final fun hex (Laws/sdk/kotlin/crt/util/Digest;[B)Ljava/lang/String; +} + diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider.kt index 1a82070c..bbf1c678 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider.kt @@ -18,7 +18,11 @@ package aws.sdk.kotlin.crt.auth.credentials * @return the newly-constructed credentials provider */ public expect class CachedCredentialsProvider internal constructor(builder: CachedCredentialsProviderBuilder) : CredentialsProvider { - public companion object + public companion object { } + + override fun close() + override suspend fun getCredentials(): Credentials + override suspend fun waitForShutdown() } public class CachedCredentialsProviderBuilder { diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider.kt index b0fa1551..d71a9d93 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider.kt @@ -24,7 +24,11 @@ import aws.sdk.kotlin.crt.io.ClientBootstrap */ public expect class DefaultChainCredentialsProvider internal constructor(builder: DefaultChainCredentialsProviderBuilder) : CredentialsProvider { - public companion object + public companion object { } + + override fun close() + override suspend fun getCredentials(): Credentials + override suspend fun waitForShutdown() } public class DefaultChainCredentialsProviderBuilder { diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider.kt index 152f243f..bb5d591f 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider.kt @@ -15,7 +15,11 @@ public expect class EcsCredentialsProvider internal constructor( builder: EcsCredentialsProviderBuilder, ) : CredentialsProvider { - public companion object + public companion object { } + + override fun close() + override suspend fun getCredentials(): Credentials + override suspend fun waitForShutdown() } public class EcsCredentialsProviderBuilder { diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider.kt index 6af30328..dabb67dd 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider.kt @@ -15,7 +15,11 @@ public expect class ProfileCredentialsProvider internal constructor( builder: ProfileCredentialsProviderBuilder, ) : CredentialsProvider { - public companion object + public companion object { } + + override fun close() + override suspend fun getCredentials(): Credentials + override suspend fun waitForShutdown() } public class ProfileCredentialsProviderBuilder { diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider.kt index 80565d30..f9ca35ba 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider.kt @@ -9,7 +9,11 @@ package aws.sdk.kotlin.crt.auth.credentials * A credentials provider for a fixed set of credentials */ public expect class StaticCredentialsProvider internal constructor(builder: StaticCredentialsProviderBuilder) : CredentialsProvider { - public companion object + public companion object { } + + override fun close() + override suspend fun getCredentials(): Credentials + override suspend fun waitForShutdown() } public class StaticCredentialsProviderBuilder { diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider.kt index 2e5086b3..ae948896 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider.kt @@ -15,7 +15,11 @@ public expect class StsAssumeRoleCredentialsProvider internal constructor( builder: StsAssumeRoleCredentialsProviderBuilder, ) : CredentialsProvider { - public companion object + public companion object { } + + override fun close() + override suspend fun getCredentials(): Credentials + override suspend fun waitForShutdown() } public class StsAssumeRoleCredentialsProviderBuilder { diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider.kt index 572f0d2f..2f7740a6 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider.kt @@ -16,7 +16,11 @@ public expect class StsWebIdentityCredentialsProvider internal constructor( builder: StsWebIdentityCredentialsProviderBuilder, ) : CredentialsProvider { - public companion object + public companion object { } + + override fun close() + override suspend fun getCredentials(): Credentials + override suspend fun waitForShutdown() } public class StsWebIdentityCredentialsProviderBuilder { diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider.kt index dbad5fdf..64cb4c4f 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider.kt @@ -15,7 +15,11 @@ import aws.sdk.kotlin.crt.io.TlsContext * @return the newly-constructed credentials provider */ public expect class X509CredentialsProvider internal constructor(builder: X509CredentialsProviderBuilder) : CredentialsProvider { - public companion object + public companion object { } + + override fun close() + override suspend fun getCredentials(): Credentials + override suspend fun waitForShutdown() } public class X509CredentialsProviderBuilder { diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManager.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManager.kt index 59576a7f..4bafa0e6 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManager.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManager.kt @@ -34,4 +34,7 @@ public expect class HttpClientConnectionManager(options: HttpClientConnectionMan * @param conn Connection to release */ public fun releaseConnection(conn: HttpClientConnection) + + override fun close() + override suspend fun waitForShutdown() } diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/ClientBootstrap.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/ClientBootstrap.kt index d90a60aa..e0c18745 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/ClientBootstrap.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/ClientBootstrap.kt @@ -14,4 +14,7 @@ import aws.sdk.kotlin.crt.Closeable */ public expect class ClientBootstrap(elg: EventLoopGroup, hr: HostResolver) : Closeable, - AsyncShutdown + AsyncShutdown { + override suspend fun waitForShutdown() + override fun close() +} diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt index 0ef33b95..1984f074 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt @@ -18,4 +18,7 @@ import aws.sdk.kotlin.crt.Closeable */ public expect class EventLoopGroup(maxThreads: Int = 1) : Closeable, - AsyncShutdown + AsyncShutdown { + override fun close() + override suspend fun waitForShutdown() +} diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/HostResolver.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/HostResolver.kt index e8d8d640..ab93a204 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/HostResolver.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/HostResolver.kt @@ -14,4 +14,6 @@ public expect class HostResolver(elg: EventLoopGroup, maxEntries: Int) : Closeable, AsyncShutdown { public constructor(elg: EventLoopGroup) + override fun close() + override suspend fun waitForShutdown() } diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/TlsContext.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/TlsContext.kt index d28b69de..03905359 100644 --- a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/TlsContext.kt +++ b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/TlsContext.kt @@ -13,6 +13,7 @@ import aws.sdk.kotlin.crt.Closeable */ public expect class TlsContext(options: TlsContextOptions? = null) : Closeable { public companion object {} + override fun close() } /** diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerJVM.kt index dc3f9ff6..54d57f25 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerJVM.kt @@ -53,11 +53,11 @@ public actual class HttpClientConnectionManager actual constructor( jniManager.releaseConnection(ktConn.jniConn) } - override fun close() { + actual override fun close() { jniManager.close() } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { jniManager.shutdownCompleteFuture.await() } } diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/ClientBootstrapJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/ClientBootstrapJVM.kt index 18c6f120..1199b38b 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/ClientBootstrapJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/ClientBootstrapJVM.kt @@ -15,11 +15,11 @@ public actual class ClientBootstrap actual constructor(elg: EventLoopGroup, hr: AsyncShutdown { internal val jniBootstrap = ClientBootstrapJni(elg.jniElg, hr.jniHr) - override fun close() { + actual override fun close() { jniBootstrap.close() } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { jniBootstrap.shutdownCompleteFuture.await() } } diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt index d8e44792..a9b8ea00 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt @@ -26,11 +26,11 @@ public actual class EventLoopGroup actual constructor(maxThreads: Int) : /** * Close this ELG */ - override fun close() { + actual override fun close() { jniElg.close() } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { jniElg.shutdownCompleteFuture.await() } } diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/HostResolverJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/HostResolverJVM.kt index 1a7feded..559f6a87 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/HostResolverJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/HostResolverJVM.kt @@ -16,11 +16,11 @@ public actual class HostResolver actual constructor(elg: EventLoopGroup, maxEntr public actual constructor(elg: EventLoopGroup) : this(elg, DEFAULT_MAX_ENTRIES) - override fun close() { + actual override fun close() { jniHr.close() } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { // TODO jni HostResolver is missing a shutdown complete future... } } diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/TlsContextJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/TlsContextJVM.kt index 8eb4e311..1c3d5cb1 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/TlsContextJVM.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/TlsContextJVM.kt @@ -17,7 +17,7 @@ public actual class TlsContext actual constructor(options: TlsContextOptions?) : public actual companion object { } - override fun close() { + actual override fun close() { jniCtx.close() } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderNative.kt index f72644fb..67b7cdda 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderNative.kt @@ -8,15 +8,15 @@ package aws.sdk.kotlin.crt.auth.credentials public actual class CachedCredentialsProvider internal actual constructor(builder: CachedCredentialsProviderBuilder) : CredentialsProvider { public actual companion object {} - override suspend fun getCredentials(): Credentials { + actual override suspend fun getCredentials(): Credentials { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderNative.kt index eb926448..c192bc45 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderNative.kt @@ -8,15 +8,15 @@ package aws.sdk.kotlin.crt.auth.credentials public actual class DefaultChainCredentialsProvider internal actual constructor(builder: DefaultChainCredentialsProviderBuilder) : CredentialsProvider { public actual companion object {} - override suspend fun getCredentials(): Credentials { + actual override suspend fun getCredentials(): Credentials { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderNative.kt index c267777c..940271c4 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderNative.kt @@ -11,15 +11,15 @@ internal actual constructor( ) : CredentialsProvider { public actual companion object {} - override suspend fun getCredentials(): Credentials { + actual override suspend fun getCredentials(): Credentials { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderNative.kt index 082e399e..9ab83da7 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderNative.kt @@ -11,15 +11,15 @@ internal actual constructor( ) : CredentialsProvider { public actual companion object {} - override suspend fun getCredentials(): Credentials { + actual override suspend fun getCredentials(): Credentials { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt index c46139af..02d4d4a0 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt @@ -11,15 +11,15 @@ package aws.sdk.kotlin.crt.auth.credentials public actual class StaticCredentialsProvider internal actual constructor(builder: StaticCredentialsProviderBuilder) : CredentialsProvider { public actual companion object {} - override suspend fun getCredentials(): Credentials { + actual override suspend fun getCredentials(): Credentials { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderNative.kt index 62bb45ea..ebff80dd 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderNative.kt @@ -11,15 +11,15 @@ internal actual constructor( ) : CredentialsProvider { public actual companion object {} - override suspend fun getCredentials(): Credentials { + actual override suspend fun getCredentials(): Credentials { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderNative.kt index e12fc0d0..2465c451 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderNative.kt @@ -11,15 +11,15 @@ internal actual constructor( ) : CredentialsProvider { public actual companion object {} - override suspend fun getCredentials(): Credentials { + actual override suspend fun getCredentials(): Credentials { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderNative.kt index 839f5e1a..9939db16 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderNative.kt @@ -9,15 +9,15 @@ public actual class X509CredentialsProvider internal actual constructor(builder: public actual companion object {} - override suspend fun getCredentials(): Credentials { + actual override suspend fun getCredentials(): Credentials { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt index 05c5adb2..33419a46 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt @@ -29,11 +29,11 @@ public actual class HttpClientConnectionManager actual constructor( public actual fun releaseConnection(conn: HttpClientConnection) { } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt index 43eadc8f..ad9d3fd8 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt @@ -11,11 +11,11 @@ import aws.sdk.kotlin.crt.Closeable public actual class ClientBootstrap actual constructor(elg: EventLoopGroup, hr: HostResolver) : Closeable, AsyncShutdown { - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt index a449bb8c..638c1ee1 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt @@ -19,11 +19,11 @@ import aws.sdk.kotlin.crt.Closeable public actual class EventLoopGroup actual constructor(maxThreads: Int) : Closeable, AsyncShutdown { - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt index acfb6f18..9c742f45 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt @@ -13,11 +13,11 @@ public actual class HostResolver actual constructor(elg: EventLoopGroup, maxEntr AsyncShutdown { public actual constructor(elg: EventLoopGroup) : this(elg, DEFAULT_MAX_ENTRIES) - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt index 13a7d2a6..318a1c8e 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt @@ -10,7 +10,7 @@ import aws.sdk.kotlin.crt.Closeable public actual class TlsContext actual constructor(options: TlsContextOptions?) : Closeable { public actual companion object {} - override fun close() { + actual override fun close() { TODO("Not yet implemented") } } diff --git a/gradle.properties b/gradle.properties index 7cba9456..c1181b8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G sdkVersion=0.8.7-SNAPSHOT # publishing -publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file +publishGroupName=aws.sdk.kotlin.crt diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6f9df270..b7531e18 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] -kotlin-version = "1.9.21" +kotlin-version = "2.0.0" aws-kotlin-repo-tools-version = "0.4.9" # libs crt-java-version = "0.29.25" -coroutines-version = "1.7.3" +coroutines-version = "1.8.1" # testing junit-version = "5.10.1" From 4da31939233955fca2d62f3f46a59d7d0e8b2bf7 Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Thu, 25 Jul 2024 19:40:42 +0000 Subject: [PATCH 12/28] chore: release 0.8.7 --- .changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json | 5 ----- CHANGELOG.md | 5 +++++ gradle.properties | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 .changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json diff --git a/.changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json b/.changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json deleted file mode 100644 index f49eb27f..00000000 --- a/.changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "9f0978c5-7652-4cef-9d03-6aab441c1d8d", - "type": "misc", - "description": "Upgrade to Kotlin 2.0.0" -} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d54c4f9..19e540b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [0.8.7] - 07/25/2024 + +### Miscellaneous +* Upgrade to Kotlin 2.0.0 + ## [0.8.6] - 06/28/2024 ### Miscellaneous diff --git a/gradle.properties b/gradle.properties index c1181b8d..62522dd2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.7-SNAPSHOT +sdkVersion=0.8.7 # publishing -publishGroupName=aws.sdk.kotlin.crt +publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From d0e62ccdb99eb016bf7c7cb52a8f9a6fc12929d3 Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Thu, 25 Jul 2024 19:40:43 +0000 Subject: [PATCH 13/28] chore: bump snapshot version to 0.8.8-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 62522dd2..7d2984bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.7 +sdkVersion=0.8.8-SNAPSHOT # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From b68f273be437c617fe685aa7063a937dc04c5a4f Mon Sep 17 00:00:00 2001 From: Matas Date: Fri, 2 Aug 2024 10:46:21 -0400 Subject: [PATCH 14/28] misc: prune transformation config (#110) --- .brazil.json | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.brazil.json b/.brazil.json index d8fb86ab..e00a9989 100644 --- a/.brazil.json +++ b/.brazil.json @@ -1,18 +1,9 @@ { "dependencies": { - "org.jetbrains.kotlin:kotlin-stdlib-common:2.0.*": "KotlinStdlibCommon-2.x", "org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x", "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.*": "KotlinxCoroutinesCoreJvm-1.8.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.*": "KotlinxCoroutinesCore-1.8.x", "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.*": "KotlinxCoroutinesJdk8-1.8.x", - "software.amazon.awssdk.crt:aws-crt:0.*": "Aws-crt-java-1.0.x", - - "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.*": "KotlinStdlibCommon-1.9.x", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.*": "KotlinStdlibJdk8-1.9.x", - "org.jetbrains.kotlin:kotlin-stdlib:1.9.*": "KotlinStdlib-1.9.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": "KotlinxCoroutinesCoreJvm-1.7.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.*": "KotlinxCoroutinesCore-1.7.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.*": "KotlinxCoroutinesJdk8-1.7.x" + "software.amazon.awssdk.crt:aws-crt:0.*": "Aws-crt-java-1.0.x" }, "packageHandlingRules": { "versioning": { @@ -25,13 +16,6 @@ "aws.sdk.kotlin.crt:aws-crt-kotlin-android" ], "resolvesConflictDependencies": { - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": [ - "KotlinStdlibCommon-1.9.x", - "KotlinStdlibJdk8-1.9.x" - ], - "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.*": [ - "KotlinStdlibJdk8-1.9.x" - ] } } } From cc7573256994cc3191134549b243a48ffa88d1b5 Mon Sep 17 00:00:00 2001 From: Matas Date: Tue, 6 Aug 2024 15:29:47 -0400 Subject: [PATCH 15/28] misc: upgrade to Kotlin 2.0.10 (#111) --- .changes/1df4ae4b-0bba-4e59-9933-47a7f6bb8bac.json | 5 +++++ .changes/b92432b1-14e7-4aff-ad44-05ee02b0c416.json | 5 +++++ gradle/libs.versions.toml | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 .changes/1df4ae4b-0bba-4e59-9933-47a7f6bb8bac.json create mode 100644 .changes/b92432b1-14e7-4aff-ad44-05ee02b0c416.json diff --git a/.changes/1df4ae4b-0bba-4e59-9933-47a7f6bb8bac.json b/.changes/1df4ae4b-0bba-4e59-9933-47a7f6bb8bac.json new file mode 100644 index 00000000..96ab1310 --- /dev/null +++ b/.changes/1df4ae4b-0bba-4e59-9933-47a7f6bb8bac.json @@ -0,0 +1,5 @@ +{ + "id": "1df4ae4b-0bba-4e59-9933-47a7f6bb8bac", + "type": "misc", + "description": "Upgrade to Kotlin 2.0.10" +} \ No newline at end of file diff --git a/.changes/b92432b1-14e7-4aff-ad44-05ee02b0c416.json b/.changes/b92432b1-14e7-4aff-ad44-05ee02b0c416.json new file mode 100644 index 00000000..878c1d70 --- /dev/null +++ b/.changes/b92432b1-14e7-4aff-ad44-05ee02b0c416.json @@ -0,0 +1,5 @@ +{ + "id": "b92432b1-14e7-4aff-ad44-05ee02b0c416", + "type": "misc", + "description": "Upgrade to aws-crt-java 0.30.5" +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b7531e18..ca9701e2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] -kotlin-version = "2.0.0" +kotlin-version = "2.0.10" -aws-kotlin-repo-tools-version = "0.4.9" +aws-kotlin-repo-tools-version = "0.4.10" # libs -crt-java-version = "0.29.25" +crt-java-version = "0.30.5" coroutines-version = "1.8.1" # testing From b5e38682dc7a9f316c3792079372be5663f14c22 Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Tue, 6 Aug 2024 19:33:31 +0000 Subject: [PATCH 16/28] chore: release 0.8.8 --- .changes/1df4ae4b-0bba-4e59-9933-47a7f6bb8bac.json | 5 ----- .changes/b92432b1-14e7-4aff-ad44-05ee02b0c416.json | 5 ----- CHANGELOG.md | 6 ++++++ gradle.properties | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 .changes/1df4ae4b-0bba-4e59-9933-47a7f6bb8bac.json delete mode 100644 .changes/b92432b1-14e7-4aff-ad44-05ee02b0c416.json diff --git a/.changes/1df4ae4b-0bba-4e59-9933-47a7f6bb8bac.json b/.changes/1df4ae4b-0bba-4e59-9933-47a7f6bb8bac.json deleted file mode 100644 index 96ab1310..00000000 --- a/.changes/1df4ae4b-0bba-4e59-9933-47a7f6bb8bac.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "1df4ae4b-0bba-4e59-9933-47a7f6bb8bac", - "type": "misc", - "description": "Upgrade to Kotlin 2.0.10" -} \ No newline at end of file diff --git a/.changes/b92432b1-14e7-4aff-ad44-05ee02b0c416.json b/.changes/b92432b1-14e7-4aff-ad44-05ee02b0c416.json deleted file mode 100644 index 878c1d70..00000000 --- a/.changes/b92432b1-14e7-4aff-ad44-05ee02b0c416.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "b92432b1-14e7-4aff-ad44-05ee02b0c416", - "type": "misc", - "description": "Upgrade to aws-crt-java 0.30.5" -} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 19e540b5..8d666425 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [0.8.8] - 08/06/2024 + +### Miscellaneous +* Upgrade to Kotlin 2.0.10 +* Upgrade to aws-crt-java 0.30.5 + ## [0.8.7] - 07/25/2024 ### Miscellaneous diff --git a/gradle.properties b/gradle.properties index 7d2984bf..31a3e169 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.8-SNAPSHOT +sdkVersion=0.8.8 # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From 0978cda7e46d5117abfb128d609eec1de65a5783 Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Tue, 6 Aug 2024 19:33:32 +0000 Subject: [PATCH 17/28] chore: bump snapshot version to 0.8.9-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 31a3e169..1999aee1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.8 +sdkVersion=0.8.9-SNAPSHOT # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From 016c8a92a7a9d4cb853a58f031cf30a8e79db6e8 Mon Sep 17 00:00:00 2001 From: Matas Date: Wed, 18 Sep 2024 10:27:27 -0400 Subject: [PATCH 18/28] misc: upgrade to kotlinx.coroutines 1.9.0 (#112) --- .brazil.json | 4 ++-- .changes/bc0b11a8-48ce-4bc0-8b3f-4ee858477647.json | 5 +++++ gradle/libs.versions.toml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .changes/bc0b11a8-48ce-4bc0-8b3f-4ee858477647.json diff --git a/.brazil.json b/.brazil.json index e00a9989..0a4b9769 100644 --- a/.brazil.json +++ b/.brazil.json @@ -1,8 +1,8 @@ { "dependencies": { "org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.*": "KotlinxCoroutinesCoreJvm-1.8.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.*": "KotlinxCoroutinesJdk8-1.8.x", + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x", + "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x", "software.amazon.awssdk.crt:aws-crt:0.*": "Aws-crt-java-1.0.x" }, "packageHandlingRules": { diff --git a/.changes/bc0b11a8-48ce-4bc0-8b3f-4ee858477647.json b/.changes/bc0b11a8-48ce-4bc0-8b3f-4ee858477647.json new file mode 100644 index 00000000..1d972dc4 --- /dev/null +++ b/.changes/bc0b11a8-48ce-4bc0-8b3f-4ee858477647.json @@ -0,0 +1,5 @@ +{ + "id": "bc0b11a8-48ce-4bc0-8b3f-4ee858477647", + "type": "misc", + "description": "Upgrade to kotlinx.coroutines 1.9.0" +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ca9701e2..31c77e3f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ aws-kotlin-repo-tools-version = "0.4.10" # libs crt-java-version = "0.30.5" -coroutines-version = "1.8.1" +coroutines-version = "1.9.0" # testing junit-version = "5.10.1" From 83832e662c556b6adaffa56083130ac33d531469 Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Wed, 18 Sep 2024 15:27:47 +0000 Subject: [PATCH 19/28] chore: release 0.8.9 --- .changes/bc0b11a8-48ce-4bc0-8b3f-4ee858477647.json | 5 ----- CHANGELOG.md | 5 +++++ gradle.properties | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 .changes/bc0b11a8-48ce-4bc0-8b3f-4ee858477647.json diff --git a/.changes/bc0b11a8-48ce-4bc0-8b3f-4ee858477647.json b/.changes/bc0b11a8-48ce-4bc0-8b3f-4ee858477647.json deleted file mode 100644 index 1d972dc4..00000000 --- a/.changes/bc0b11a8-48ce-4bc0-8b3f-4ee858477647.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "bc0b11a8-48ce-4bc0-8b3f-4ee858477647", - "type": "misc", - "description": "Upgrade to kotlinx.coroutines 1.9.0" -} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d666425..f76774e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [0.8.9] - 09/18/2024 + +### Miscellaneous +* Upgrade to kotlinx.coroutines 1.9.0 + ## [0.8.8] - 08/06/2024 ### Miscellaneous diff --git a/gradle.properties b/gradle.properties index 1999aee1..58e82ce6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.9-SNAPSHOT +sdkVersion=0.8.9 # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From 2cbd075ca41ac426b7fd30159e1310e0ede40c55 Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Wed, 18 Sep 2024 15:27:48 +0000 Subject: [PATCH 20/28] chore: bump snapshot version to 0.8.10-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 58e82ce6..78236f83 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.9 +sdkVersion=0.8.10-SNAPSHOT # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From 117246f706f07f42a61c792c5304ae371989e905 Mon Sep 17 00:00:00 2001 From: Matas Date: Tue, 15 Oct 2024 11:48:59 -0400 Subject: [PATCH 21/28] misc: Upgrade Kotlin version (#113) --- .changes/49b860c3-3fce-40fa-acf7-e97650f49016.json | 5 +++++ gradle/libs.versions.toml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changes/49b860c3-3fce-40fa-acf7-e97650f49016.json diff --git a/.changes/49b860c3-3fce-40fa-acf7-e97650f49016.json b/.changes/49b860c3-3fce-40fa-acf7-e97650f49016.json new file mode 100644 index 00000000..29fc3d87 --- /dev/null +++ b/.changes/49b860c3-3fce-40fa-acf7-e97650f49016.json @@ -0,0 +1,5 @@ +{ + "id": "49b860c3-3fce-40fa-acf7-e97650f49016", + "type": "misc", + "description": "Upgrade to Kotlin 2.0.21" +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 31c77e3f..71d407a0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kotlin-version = "2.0.10" +kotlin-version = "2.0.21" -aws-kotlin-repo-tools-version = "0.4.10" +aws-kotlin-repo-tools-version = "0.4.12" # libs crt-java-version = "0.30.5" From db6a44a22ff593fd5ec86a1521320ae1c0fcd445 Mon Sep 17 00:00:00 2001 From: Matas Date: Tue, 15 Oct 2024 12:13:16 -0400 Subject: [PATCH 22/28] misc: upgrade aws-crt-java version (#114) --- .changes/963ddb76-2622-44d7-bb41-3439a5f033a5.json | 5 +++++ .../crt/auth/credentials/ProfileCredentialsProviderTest.kt | 2 ++ gradle/libs.versions.toml | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changes/963ddb76-2622-44d7-bb41-3439a5f033a5.json diff --git a/.changes/963ddb76-2622-44d7-bb41-3439a5f033a5.json b/.changes/963ddb76-2622-44d7-bb41-3439a5f033a5.json new file mode 100644 index 00000000..2e5322ab --- /dev/null +++ b/.changes/963ddb76-2622-44d7-bb41-3439a5f033a5.json @@ -0,0 +1,5 @@ +{ + "id": "963ddb76-2622-44d7-bb41-3439a5f033a5", + "type": "misc", + "description": "Upgrade aws-crt-java to 0.31.3" +} \ No newline at end of file diff --git a/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderTest.kt b/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderTest.kt index 3db7b701..64eb9f0b 100644 --- a/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderTest.kt +++ b/aws-crt-kotlin/jvm/test/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderTest.kt @@ -19,6 +19,7 @@ class ProfileCredentialsProviderTest { @Test fun `it should create a provider for a valid profile`() = runBlocking { + val configPath = Files.createTempFile("ProfileCredentialsProviderTest_config", "") val credsPath = Files.createTempFile("ProfileCredentialsProviderTest_creds", "") credsPath.toFile().writeText( """ @@ -30,6 +31,7 @@ class ProfileCredentialsProviderTest { try { val provider = ProfileCredentialsProvider.build { + configFileName = configPath.toString() credentialsFileName = credsPath.toString() } val actual = provider.getCredentials() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 71d407a0..9b6ee867 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ kotlin-version = "2.0.21" aws-kotlin-repo-tools-version = "0.4.12" # libs -crt-java-version = "0.30.5" +crt-java-version = "0.31.3" coroutines-version = "1.9.0" # testing From 0ede180e4d2e136e526491420821f5b269c0cfad Mon Sep 17 00:00:00 2001 From: Matas Date: Wed, 16 Oct 2024 09:40:06 -0400 Subject: [PATCH 23/28] misc: upgrade aws-kotlin-repo-tools version (#115) --- aws-crt-kotlin/build.gradle.kts | 4 ---- gradle/libs.versions.toml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/aws-crt-kotlin/build.gradle.kts b/aws-crt-kotlin/build.gradle.kts index 8deaf68d..ff4aa94e 100644 --- a/aws-crt-kotlin/build.gradle.kts +++ b/aws-crt-kotlin/build.gradle.kts @@ -60,10 +60,6 @@ kotlin { } } - val kotlinVersion: String by project - val coroutinesVersion: String by project - val mockServerVersion: String by project - sourceSets { val commonMain by getting { dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9b6ee867..bb1a2e48 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin-version = "2.0.21" -aws-kotlin-repo-tools-version = "0.4.12" +aws-kotlin-repo-tools-version = "0.4.13" # libs crt-java-version = "0.31.3" From 9705451997a01304ca0fb262b6aaf99731c3f4de Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Wed, 16 Oct 2024 13:43:57 +0000 Subject: [PATCH 24/28] chore: release 0.8.10 --- .changes/49b860c3-3fce-40fa-acf7-e97650f49016.json | 5 ----- .changes/963ddb76-2622-44d7-bb41-3439a5f033a5.json | 5 ----- CHANGELOG.md | 6 ++++++ gradle.properties | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 .changes/49b860c3-3fce-40fa-acf7-e97650f49016.json delete mode 100644 .changes/963ddb76-2622-44d7-bb41-3439a5f033a5.json diff --git a/.changes/49b860c3-3fce-40fa-acf7-e97650f49016.json b/.changes/49b860c3-3fce-40fa-acf7-e97650f49016.json deleted file mode 100644 index 29fc3d87..00000000 --- a/.changes/49b860c3-3fce-40fa-acf7-e97650f49016.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "49b860c3-3fce-40fa-acf7-e97650f49016", - "type": "misc", - "description": "Upgrade to Kotlin 2.0.21" -} \ No newline at end of file diff --git a/.changes/963ddb76-2622-44d7-bb41-3439a5f033a5.json b/.changes/963ddb76-2622-44d7-bb41-3439a5f033a5.json deleted file mode 100644 index 2e5322ab..00000000 --- a/.changes/963ddb76-2622-44d7-bb41-3439a5f033a5.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "963ddb76-2622-44d7-bb41-3439a5f033a5", - "type": "misc", - "description": "Upgrade aws-crt-java to 0.31.3" -} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index f76774e7..4b396189 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [0.8.10] - 10/16/2024 + +### Miscellaneous +* Upgrade to Kotlin 2.0.21 +* Upgrade aws-crt-java to 0.31.3 + ## [0.8.9] - 09/18/2024 ### Miscellaneous diff --git a/gradle.properties b/gradle.properties index 78236f83..9f8bac02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.10-SNAPSHOT +sdkVersion=0.8.10 # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From 4388249f77fc3249f05e1a39d23ea9ca7cc1bd0b Mon Sep 17 00:00:00 2001 From: aws-sdk-kotlin-ci Date: Wed, 16 Oct 2024 13:43:57 +0000 Subject: [PATCH 25/28] chore: bump snapshot version to 0.8.11-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9f8bac02..4d8d7745 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ kotlin.mpp.stability.nowarn=true org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # aws-crt-kotlin -sdkVersion=0.8.10 +sdkVersion=0.8.11-SNAPSHOT # publishing publishGroupName=aws.sdk.kotlin.crt \ No newline at end of file From b9b99f784839688ae8720cc5f2e789ae1477a32a Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Fri, 18 Oct 2024 10:23:51 -0400 Subject: [PATCH 26/28] Fix merge --- .../crt/auth/credentials/StaticCredentialsProviderNative.kt | 6 +++--- .../src/aws/sdk/kotlin/crt/auth/signing/AwsSignerNative.kt | 1 + .../kotlin/crt/http/HttpClientConnectionManagerNative.kt | 4 ++-- .../src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt | 4 ++-- .../src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt | 4 ++-- .../native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt | 4 ++-- .../native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt | 2 +- gradle/libs.versions.toml | 3 +++ 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt index 9d99dd8c..b1d40c39 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt @@ -12,7 +12,7 @@ public actual class StaticCredentialsProvider internal actual constructor(builde private val credentials = Credentials(builder.accessKeyId!!, builder.secretAccessKey!!, builder.sessionToken) public actual companion object {} - override suspend fun getCredentials(): Credentials = credentials - override fun close() { } - override suspend fun waitForShutdown() { } + actual override suspend fun getCredentials(): Credentials = credentials + actual override fun close() { } + actual override suspend fun waitForShutdown() { } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/signing/AwsSignerNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/signing/AwsSignerNative.kt index 8260602b..df7323ca 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/signing/AwsSignerNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/signing/AwsSignerNative.kt @@ -166,6 +166,7 @@ private fun CPointer.getSignature(): ByteArray { private fun AwsSigningAlgorithm.toNativeSigningAlgorithm(): aws_signing_algorithm = when (this) { AwsSigningAlgorithm.SIGV4 -> aws_signing_algorithm.AWS_SIGNING_ALGORITHM_V4 AwsSigningAlgorithm.SIGV4_ASYMMETRIC -> aws_signing_algorithm.AWS_SIGNING_ALGORITHM_V4_ASYMMETRIC + AwsSigningAlgorithm.SIGV4_S3EXPRESS -> aws_signing_algorithm.AWS_SIGNING_ALGORITHM_V4_S3EXPRESS } private fun AwsSignatureType.toNativeSignatureType(): aws_signature_type = when (this) { diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt index f56ebb59..9784bae1 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt @@ -146,11 +146,11 @@ public actual class HttpClientConnectionManager actual constructor( ) { "aws_http_connection_manager_release_connection()" } } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { shutdownComplete.receiveCatching().getOrNull() } - override fun close() { + actual override fun close() { aws_http_connection_manager_release(manager) } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt index 8af99a63..e2044cd1 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt @@ -37,11 +37,11 @@ public actual class ClientBootstrap actual constructor( } } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { shutdownCompleteChannel.receive() } - override fun close() { + actual override fun close() { aws_client_bootstrap_release(ptr) } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt index 89d33383..7d6b4db1 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt @@ -39,11 +39,11 @@ public actual class EventLoopGroup actual constructor(maxThreads: Int) : NativeH } } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { shutdownCompleteChannel.receive() } - override fun close() { + actual override fun close() { aws_event_loop_group_release(ptr) } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt index 305c98a7..fb0ac8c9 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt @@ -40,11 +40,11 @@ public actual class HostResolver actual constructor(elg: EventLoopGroup, maxEntr } } - override suspend fun waitForShutdown() { + actual override suspend fun waitForShutdown() { shutdownCompleteChannel.receive() } - override fun close() { + actual override fun close() { aws_host_resolver_release(ptr) } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt index 00a660cd..db6ddb15 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt @@ -105,7 +105,7 @@ public actual class TlsContext actual constructor(options: TlsContextOptions?) : } } - override fun close() { + actual override fun close() { aws_tls_ctx_release(ptr) aws_tls_ctx_options_clean_up(tlsCtxOpts.ptr) Allocator.Default.free(tlsCtxOpts.rawPtr) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bb1a2e48..3e9d285b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,9 +13,11 @@ kotest-version = "5.8.0" mock-server-version = "5.15.0" # fixme - remove in favor of clikt kotlinx-cli-version = "0.3.6" +kotlinx-io-version = "0.3.1" [libraries] +aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" } crt-java = { module = "software.amazon.awssdk.crt:aws-crt", version.ref = "crt-java-version" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version"} @@ -29,6 +31,7 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines-version" } kotlinx-coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines-version" } kotlinx-cli = { module = "org.jetbrains.kotlinx:kotlinx-cli", version.ref = "kotlinx-cli-version" } +kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io-version"} junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-version" } junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-version" } From 69d9c7d926906c64299bee96230a07fd231624d7 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Tue, 22 Oct 2024 14:38:08 -0400 Subject: [PATCH 27/28] ktlint --- aws-crt-kotlin/build.gradle.kts | 4 +++- .../auth/credentials/CredentialsProviderTest.kt | 4 ++-- aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/CRT.kt | 4 +++- .../src/aws/sdk/kotlin/crt/CrtExceptionUtil.kt | 3 +-- .../native/src/aws/sdk/kotlin/crt/Allocator.kt | 4 +++- .../native/src/aws/sdk/kotlin/crt/CRTNative.kt | 4 +++- .../native/src/aws/sdk/kotlin/crt/Logging.kt | 4 +++- .../kotlin/crt/auth/signing/AwsSignerNative.kt | 4 +++- .../http/HttpClientConnectionManagerNative.kt | 3 ++- .../crt/http/HttpClientConnectionNative.kt | 4 +++- .../aws/sdk/kotlin/crt/http/HttpStreamNative.kt | 5 +++-- .../sdk/kotlin/crt/io/ClientBootstrapNative.kt | 4 +++- .../sdk/kotlin/crt/io/EventLoopGroupNative.kt | 5 ++++- .../aws/sdk/kotlin/crt/io/HostResolverNative.kt | 5 ++++- .../aws/sdk/kotlin/crt/io/TlsContextNative.kt | 4 +++- .../aws/sdk/kotlin/crt/util/hashing/CrcNative.kt | 16 ++++++++++++---- .../aws/sdk/kotlin/crt/util/hashing/ShaNative.kt | 16 ++++++++++++---- 17 files changed, 67 insertions(+), 26 deletions(-) diff --git a/aws-crt-kotlin/build.gradle.kts b/aws-crt-kotlin/build.gradle.kts index 599177e6..8992e056 100644 --- a/aws-crt-kotlin/build.gradle.kts +++ b/aws-crt-kotlin/build.gradle.kts @@ -199,7 +199,9 @@ kotlin { } tasks.withType().configureEach { - if (!HostManager.hostIsMac) { return@configureEach } + if (!HostManager.hostIsMac) { + return@configureEach + } dependsOn("bootIosSimulatorDevice") finalizedBy("shutdownIosSimulatorDevice") diff --git a/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/credentials/CredentialsProviderTest.kt b/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/credentials/CredentialsProviderTest.kt index 02af907e..c54cf9b8 100644 --- a/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/credentials/CredentialsProviderTest.kt +++ b/aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/auth/credentials/CredentialsProviderTest.kt @@ -14,9 +14,9 @@ import kotlin.test.Ignore import kotlin.test.Test import kotlin.test.assertEquals -class CredentialsProviderTest : CrtTest() { - private val EXPECTED_CREDENTIALS = Credentials("access_key_id", "secret_access_key", "session_token") +private val EXPECTED_CREDENTIALS = Credentials("access_key_id", "secret_access_key", "session_token") +class CredentialsProviderTest : CrtTest() { @Ignore // FIXME Enable when Kotlin/Native implementation is complete @Test fun testStaticProvider() = runTest { diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/CRT.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/CRT.kt index 243ec3fa..899409ec 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/CRT.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/CRT.kt @@ -18,7 +18,9 @@ public actual object CRT { private val initializerMu = Mutex() // protects `initialized` public actual fun initRuntime(block: Config.() -> Unit) { - if (initialized) { return } + if (initialized) { + return + } runBlocking { initializerMu.withLock { diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/CrtExceptionUtil.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/CrtExceptionUtil.kt index 9fc6951b..bf337cee 100644 --- a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/CrtExceptionUtil.kt +++ b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/CrtExceptionUtil.kt @@ -6,8 +6,7 @@ package aws.sdk.kotlin.crt import software.amazon.awssdk.crt.CrtRuntimeException as CrtRuntimeExceptionJni -private class CrtJniExceptionWrapper(wrapped: CrtRuntimeExceptionJni) : - CrtRuntimeException(wrapped.message, wrapped, wrapped.errorCode) +private class CrtJniExceptionWrapper(wrapped: CrtRuntimeExceptionJni) : CrtRuntimeException(wrapped.message, wrapped, wrapped.errorCode) /** * Wrap any CRT JNI call exception that happens in [block] into an instance of the kotlin equivalent diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/Allocator.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/Allocator.kt index 19f65243..1a04f40f 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/Allocator.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/Allocator.kt @@ -12,7 +12,9 @@ internal object Allocator { } @OptIn(ExperimentalForeignApi::class) -internal class AwsAllocator : NativeFreeablePlacement, CValuesRef() { +internal class AwsAllocator : + CValuesRef(), + NativeFreeablePlacement { internal val allocator: CPointer = s_crt_kotlin_allocator ?: throw CrtRuntimeException("CRT allocator is not initialized, ensure CRT.initRuntime() was called.") diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/CRTNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/CRTNative.kt index 633c8255..2ec4d3c5 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/CRTNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/CRTNative.kt @@ -23,7 +23,9 @@ public actual object CRT { */ public actual fun initRuntime(block: Config.() -> Unit): Unit = runBlocking { initializerMu.withLock { - if (initialized) { return@runBlocking } + if (initialized) { + return@runBlocking + } val config = Config().apply(block) diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/Logging.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/Logging.kt index b6a08f7d..69ba4c51 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/Logging.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/Logging.kt @@ -17,7 +17,9 @@ internal object Logging { private val initializerMu = Mutex() // protects `initialized` internal fun initialize(config: Config) { - if (initialized) { return } + if (initialized) { + return + } runBlocking { initializerMu.withLock { diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/signing/AwsSignerNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/signing/AwsSignerNative.kt index df7323ca..03040c4b 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/signing/AwsSignerNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/signing/AwsSignerNative.kt @@ -221,7 +221,9 @@ private fun AwsSigningConfig.toNativeSigningConfig(): CPointer Boolean private fun nativeShouldSignHeaderFn(headerName: CPointer?, userData: COpaquePointer?): Boolean { checkNotNull(headerName) { "aws_should_sign_header_fn expected non-null header name" } - if (userData == null) { return true } + if (userData == null) { + return true + } val kShouldSignHeaderFn = userData.asStableRef().get() val kHeaderName = headerName.pointed.toKString() diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt index 9784bae1..b4b84daa 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt @@ -23,7 +23,8 @@ import kotlin.coroutines.suspendCoroutine public actual class HttpClientConnectionManager actual constructor( public actual val options: HttpClientConnectionManagerOptions, -) : Closeable, AsyncShutdown { +) : Closeable, + AsyncShutdown { public actual val managerMetrics: HttpManagerMetrics get() = memScoped { val metrics = alloc() diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionNative.kt index ac2b8d66..e36615e9 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionNative.kt @@ -21,7 +21,9 @@ import platform.posix.size_t internal class HttpClientConnectionNative( private val manager: HttpClientConnectionManager, override val ptr: CPointer, -) : Closeable, HttpClientConnection, NativeHandle { +) : Closeable, + HttpClientConnection, + NativeHandle { override val id: String = ptr.rawValue.toString() override fun makeRequest(httpReq: HttpRequest, handler: HttpStreamResponseHandler): HttpStream { diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpStreamNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpStreamNative.kt index 549921c9..897da883 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpStreamNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpStreamNative.kt @@ -18,7 +18,8 @@ import kotlin.coroutines.suspendCoroutine internal class HttpStreamNative( override val ptr: CPointer, -) : HttpStream, NativeHandle { +) : HttpStream, + NativeHandle { override val responseStatusCode: Int get() { @@ -78,7 +79,7 @@ internal class HttpStreamNative( } if (isFinalChunk) { - val chunkOpts = cValue() { + val chunkOpts = cValue { chunk_data_size = 0.convert() } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt index e2044cd1..fdd3e576 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt @@ -19,7 +19,9 @@ import libcrt.aws_client_bootstrap_release public actual class ClientBootstrap actual constructor( elg: EventLoopGroup, hr: HostResolver, -) : NativeHandle, Closeable, AsyncShutdown { +) : NativeHandle, + Closeable, + AsyncShutdown { private val shutdownCompleteChannel = shutdownChannel() private val channelStableRef = StableRef.create(shutdownCompleteChannel) override val ptr: CPointer diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt index 7d6b4db1..86a79ff6 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt @@ -21,7 +21,10 @@ import libcrt.* * @throws [aws.sdk.kotlin.crt.CrtRuntimeException] If the system is unable to allocate space for a native event loop group */ @OptIn(ExperimentalForeignApi::class) -public actual class EventLoopGroup actual constructor(maxThreads: Int) : NativeHandle, Closeable, AsyncShutdown { +public actual class EventLoopGroup actual constructor(maxThreads: Int) : + NativeHandle, + Closeable, + AsyncShutdown { override val ptr: CPointer diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt index fb0ac8c9..aa40c0de 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt @@ -13,7 +13,10 @@ import kotlinx.cinterop.* import libcrt.* @OptIn(ExperimentalForeignApi::class) -public actual class HostResolver actual constructor(elg: EventLoopGroup, maxEntries: Int) : NativeHandle, Closeable, AsyncShutdown { +public actual class HostResolver actual constructor(elg: EventLoopGroup, maxEntries: Int) : + NativeHandle, + Closeable, + AsyncShutdown { public actual constructor(elg: EventLoopGroup) : this(elg, DEFAULT_MAX_ENTRIES) override val ptr: CPointer diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt index db6ddb15..d5c60b43 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt @@ -14,7 +14,9 @@ import aws.sdk.kotlin.crt.util.toAwsString import kotlinx.cinterop.* import libcrt.* -public actual class TlsContext actual constructor(options: TlsContextOptions?) : NativeHandle, Closeable { +public actual class TlsContext actual constructor(options: TlsContextOptions?) : + NativeHandle, + Closeable { private val tlsCtxOpts: aws_tls_ctx_options = Allocator.Default.alloc() public actual companion object {} diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/util/hashing/CrcNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/util/hashing/CrcNative.kt index 6d36a7a5..fd671e39 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/util/hashing/CrcNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/util/hashing/CrcNative.kt @@ -44,9 +44,13 @@ internal class Crc(val checksumFn: AwsChecksumsCrcFunction) : HashFunction { */ public class Crc32 : HashFunction { private val crc32 = Crc(::aws_checksums_crc32) - override fun update(input: ByteArray, offset: Int, length: Int) { crc32.update(input, offset, length) } + override fun update(input: ByteArray, offset: Int, length: Int) { + crc32.update(input, offset, length) + } override fun digest(): ByteArray = crc32.digest() - override fun reset() { crc32.reset() } + override fun reset() { + crc32.reset() + } } /** @@ -54,7 +58,11 @@ public class Crc32 : HashFunction { */ public class Crc32c : HashFunction { private val crc32c = Crc(::aws_checksums_crc32c) - override fun update(input: ByteArray, offset: Int, length: Int) { crc32c.update(input, offset, length) } + override fun update(input: ByteArray, offset: Int, length: Int) { + crc32c.update(input, offset, length) + } override fun digest(): ByteArray = crc32c.digest() - override fun reset() { crc32c.reset() } + override fun reset() { + crc32c.reset() + } } diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/util/hashing/ShaNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/util/hashing/ShaNative.kt index 9f85f934..c8db8f9e 100644 --- a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/util/hashing/ShaNative.kt +++ b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/util/hashing/ShaNative.kt @@ -19,9 +19,13 @@ internal typealias InitializeHashFn = ( */ public class Sha1 : HashFunction { private val sha1 = Sha(::aws_sha1_new) - override fun update(input: ByteArray, offset: Int, length: Int) { sha1.update(input, offset, length) } + override fun update(input: ByteArray, offset: Int, length: Int) { + sha1.update(input, offset, length) + } override fun digest(): ByteArray = sha1.digest() - override fun reset() { sha1.reset() } + override fun reset() { + sha1.reset() + } } /** @@ -29,9 +33,13 @@ public class Sha1 : HashFunction { */ public class Sha256 : HashFunction { private val sha256 = Sha(::aws_sha256_new) - override fun update(input: ByteArray, offset: Int, length: Int) { sha256.update(input, offset, length) } + override fun update(input: ByteArray, offset: Int, length: Int) { + sha256.update(input, offset, length) + } override fun digest(): ByteArray = sha256.digest() - override fun reset() { sha256.reset() } + override fun reset() { + sha256.reset() + } } internal class Sha(val initializeFn: InitializeHashFn) : HashFunction { From d2540848ed1f88e3fdceb7aa748a18d1e742807d Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Tue, 22 Oct 2024 15:53:27 -0400 Subject: [PATCH 28/28] git submodule update --- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-compression | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-mqtt | 2 +- crt/aws-c-sdkutils | 2 +- crt/aws-checksums | 2 +- crt/aws-lc | 2 +- crt/s2n | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 0d2aa00a..48d647bf 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 0d2aa00ae70c699fcb14d0338c1b07a58b9eb24b +Subproject commit 48d647bf43f8872e4dc5ec6343b0c5974195fbdd diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 314fc555..2cb1d2ea 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 314fc555846ac7bf2cc68a117c99a6af26f7043e +Subproject commit 2cb1d2eac925e2dbc45025eb89af82bd790c23a0 diff --git a/crt/aws-c-common b/crt/aws-c-common index 42119c5a..faa6c0f0 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 42119c5a1c191f397e3ad770cd900104e050ee34 +Subproject commit faa6c0f00802fc861e7252404f65fb1e0617ca8e diff --git a/crt/aws-c-compression b/crt/aws-c-compression index ea1d421a..f36d0167 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit ea1d421a421ad83a540309a94c38d50b6a5d836b +Subproject commit f36d01672d61e49d96a777870d456f66fa391cd4 diff --git a/crt/aws-c-http b/crt/aws-c-http index 98ec73ad..ffa68051 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 98ec73ad0c18b78ba08d40b4e60d97abf794f24d +Subproject commit ffa68051dc3ef5a81181451b9779a7f3a26202a6 diff --git a/crt/aws-c-io b/crt/aws-c-io index 5afc9443..e3637404 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 5afc94435cc0c0b3dc33279dd62552ea15bbea0c +Subproject commit e36374047beadc72a0eb6df14ce3cbc822a789a3 diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt index 74da9cad..77d6f00e 160000 --- a/crt/aws-c-mqtt +++ b/crt/aws-c-mqtt @@ -1 +1 @@ -Subproject commit 74da9cadfa9dfd2179479fdc445617f5da3261ba +Subproject commit 77d6f00e89b10e3263d8a17576ec8e91c45b4606 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index 638fdd65..4658412a 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit 638fdd6548df85c599f82db7ea70fd9e44917ef5 +Subproject commit 4658412a61ad5749db92a8d1e0717cb5e76ada1c diff --git a/crt/aws-checksums b/crt/aws-checksums index aac442a2..ce04ab00 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit aac442a2dbbb5e72d0a3eca8313cf65e7e1cac2f +Subproject commit ce04ab00b3ecc41912f478bfedca39f8e1919d6b diff --git a/crt/aws-lc b/crt/aws-lc index 6d9a7675..81283801 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 6d9a7675d1f7c2f159b76e4ade309220d54d96f4 +Subproject commit 81283801a7efc1076ab91c2ccc3616b3d6f00828 diff --git a/crt/s2n b/crt/s2n index d9169425..9cd117f3 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit d9169425b7db7aa28c52a6efb8c087c68d1dbd16 +Subproject commit 9cd117f3d9a94912d5e8f2a61ffbfd31f11d2946