Skip to content

Commit 31412d2

Browse files
authored
kn: enable many @IgnoreNative tests (#1233)
1 parent ae80656 commit 31412d2

File tree

76 files changed

+419
-560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+419
-560
lines changed

.brazil.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"dependencies": {
33
"org.jetbrains.kotlin:kotlin-stdlib:2.*": "KotlinStdlib-2.x",
44
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
5-
65
"com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",
76
"com.squareup.okhttp3:okhttp:5.*": "OkHttp3-5.x",
87
"com.squareup.okio:okio-jvm:3.*": "OkioJvm-3.x",
98
"io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
109
"org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
1110
"aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
1211
"aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
13-
"com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x"
12+
"com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x",
13+
"org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.*": "KotlinxDatetimeJvm-0.x"
1414
},
1515
"packageHandlingRules": {
1616
"versioning": {
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "4820850c-8916-47f5-a7e1-8880e6a00d22",
3+
"type": "bugfix",
4+
"description": "Fix errors in equality checks for `CaseInsensitiveMap` which affect `Headers` and `ValuesMap` implementations"
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "c0040355-ffdc-4813-80e9-baf859ef02b9",
3+
"type": "bugfix",
4+
"description": "fix: correct hash code calculation for case-insensitive map entries"
5+
}

.github/workflows/artifact-size-metrics.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
with:
3232
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
3333
aws-region: us-west-2
34+
- name: Configure Gradle
35+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
3436
- name: Generate Artifact Size Metrics
3537
run: ./gradlew artifactSizeMetrics
3638
- name: Save Artifact Size Metrics
@@ -54,6 +56,8 @@ jobs:
5456
with:
5557
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
5658
aws-region: us-west-2
59+
- name: Configure Gradle
60+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
5761
- name: Generate Artifact Size Metrics
5862
run: ./gradlew -Paws.kotlin.native=false artifactSizeMetrics
5963
- name: Analyze Artifact Size Metrics

.github/workflows/continuous-integration.yml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ jobs:
8989
with:
9090
path: 'smithy-kotlin'
9191

92+
- name: Configure Gradle
93+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
94+
with:
95+
working-directory: 'smithy-kotlin'
96+
9297
- name: Setup build
9398
uses: ./smithy-kotlin/.github/actions/setup-build
9499

@@ -152,12 +157,10 @@ jobs:
152157
- name: Setup build
153158
uses: ./smithy-kotlin/.github/actions/setup-build
154159

155-
- name: Configure JDK
156-
uses: actions/setup-java@v3
160+
- name: Configure Gradle
161+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
157162
with:
158-
distribution: 'corretto'
159-
java-version: 17
160-
cache: 'gradle'
163+
working-directory: 'smithy-kotlin'
161164

162165
- name: Test
163166
working-directory: ./smithy-kotlin
@@ -186,6 +189,11 @@ jobs:
186189
- name: Setup build
187190
uses: ./smithy-kotlin/.github/actions/setup-build
188191

192+
- name: Configure Gradle
193+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
194+
with:
195+
working-directory: 'smithy-kotlin'
196+
189197
- name: Test
190198
working-directory: ./smithy-kotlin
191199
shell: bash
@@ -211,6 +219,16 @@ jobs:
211219
path: 'aws-sdk-kotlin'
212220
repository: 'awslabs/aws-sdk-kotlin'
213221

222+
- name: Configure Gradle - smithy-kotlin
223+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
224+
with:
225+
working-directory: ./smithy-kotlin
226+
227+
- name: Configure Gradle - aws-sdk-kotlin
228+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
229+
with:
230+
working-directory: ./aws-sdk-kotlin
231+
214232
- name: Build and Test aws-sdk-kotlin downstream
215233
working-directory: ./smithy-kotlin
216234
run: |

.github/workflows/kat-transform.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ jobs:
3838
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
3939
aws-region: us-west-2
4040

41+
- name: Configure Gradle
42+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
43+
with:
44+
working-directory: ./smithy-kotlin
45+
4146
- name: Setup kat
4247
uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
4348

.github/workflows/lint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
steps:
2222
- name: Checkout sources
2323
uses: actions/checkout@v2
24+
- name: Configure Gradle
25+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
2426
- name: Lint ${{ env.PACKAGE_NAME }}
2527
run: |
2628
./gradlew ktlint
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
3+
distributionUrl=https://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

runtime/auth/aws-credentials/common/test/aws/smithy/kotlin/runtime/auth/awscredentials/CachedCredentialsProviderTest.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package aws.smithy.kotlin.runtime.auth.awscredentials
77

8-
import aws.smithy.kotlin.runtime.IgnoreNative
98
import aws.smithy.kotlin.runtime.collections.Attributes
109
import aws.smithy.kotlin.runtime.time.Instant
1110
import aws.smithy.kotlin.runtime.time.ManualClock
@@ -37,7 +36,6 @@ class CachedCredentialsProviderTest {
3736
}
3837
}
3938

40-
@IgnoreNative // FIXME Re-enable after Kotlin/Native Implementation
4139
@Test
4240
fun testLoadFirstCall() = runTest {
4341
// explicit expiration
@@ -52,7 +50,6 @@ class CachedCredentialsProviderTest {
5250
assertEquals(1, source.callCount)
5351
}
5452

55-
@IgnoreNative // FIXME Re-enable after Kotlin/Native Implementation
5653
@Test
5754
fun testDefaultExpiration() = runTest {
5855
// expiration should come from the cached provider
@@ -65,7 +62,6 @@ class CachedCredentialsProviderTest {
6562
assertEquals(1, source.callCount)
6663
}
6764

68-
@IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
6965
@Test
7066
fun testReloadExpiredCredentials() = runTest {
7167
val source = TestCredentialsProvider(expiration = testExpiration)
@@ -81,7 +77,6 @@ class CachedCredentialsProviderTest {
8177
assertEquals(2, source.callCount)
8278
}
8379

84-
@IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
8580
@Test
8681
fun testRefreshBufferWindow() = runTest {
8782
val source = TestCredentialsProvider(expiration = testExpiration)
@@ -103,7 +98,6 @@ class CachedCredentialsProviderTest {
10398
assertEquals(2, source.callCount)
10499
}
105100

106-
@IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
107101
@Test
108102
fun testLoadFailed() = runTest {
109103
val source = object : CredentialsProvider {
@@ -126,7 +120,6 @@ class CachedCredentialsProviderTest {
126120
provider.resolve()
127121
}
128122

129-
@IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
130123
@Test
131124
fun testItThrowsOnGetCredentialsAfterClose() = runTest {
132125
val source = TestCredentialsProvider(expiration = testExpiration)
@@ -144,7 +137,6 @@ class CachedCredentialsProviderTest {
144137
assertEquals(1, source.callCount)
145138
}
146139

147-
@IgnoreNative // FIXME Re-enable after Kotlin/Native implementation
148140
@Test
149141
fun testCachedConvenienceFunction() = runTest {
150142
val source = TestCredentialsProvider(expiration = testExpiration)

runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/PresignerTest.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55
package aws.smithy.kotlin.runtime.auth.awssigning
66

7-
import aws.smithy.kotlin.runtime.IgnoreNative
87
import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
98
import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
109
import aws.smithy.kotlin.runtime.client.endpoints.Endpoint
@@ -25,14 +24,12 @@ import kotlin.test.assertTrue
2524
class PresignerTest {
2625
// Verify that custom endpoint URL schemes aren't changed.
2726
// See https://github.com/awslabs/aws-sdk-kotlin/issues/938
28-
@IgnoreNative // FIXME Re-enable after Kotlin/Native Implementation
2927
@Test
3028
fun testSignedUrlAllowsHttp() = testSigningUrl("http://localhost:8080/path/to/resource?foo=bar")
3129

3230
// Verify that custom endpoint URL schemes aren't changed.
3331
// See https://github.com/awslabs/aws-sdk-kotlin/issues/938
3432
@Test
35-
@IgnoreNative // FIXME Re-enable after Kotlin/Native Implementation
3633
fun testSignedUrlAllowsHttps() = testSigningUrl("https://localhost:8088/path/to/resource?bar=foo")
3734

3835
private fun testSigningUrl(url: String) = runTest {

0 commit comments

Comments
 (0)