Skip to content

Commit e425de3

Browse files
authored
kn: merge from main, upgrade to latest version of aws-kotlin-repo-tools (#1371)
1 parent 7257283 commit e425de3

File tree

99 files changed

+1925
-1229
lines changed

Some content is hidden

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

99 files changed

+1925
-1229
lines changed

.brazil.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55

66
"com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",
77
"com.squareup.okhttp3:okhttp:5.*": "OkHttp3-5.x",
8+
"com.squareup.okhttp3:okhttp-jvm:5.*": "OkHttp3-5.x",
89
"com.squareup.okio:okio-jvm:3.*": "OkioJvm-3.x",
910
"io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
1011
"io.opentelemetry:opentelemetry-extension-kotlin:1.*": "Maven-io-opentelemetry_opentelemetry-extension-kotlin-1.x",
1112
"org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
13+
"aws.sdk.kotlin.crt:aws-crt-kotlin:0.10.*": "AwsCrtKotlin-0.10.x",
1214
"aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
1315
"aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
1416
"com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x",

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: gradle
4+
directory: /
5+
schedule:
6+
interval: daily # means every _weekday_ (Monday through Friday)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Artifact Size Metrics
22
on:
3-
pull_request:
3+
pull_request_target:
44
types: [ opened, synchronize, reopened, labeled, unlabeled ]
55
branches:
66
- main
@@ -40,7 +40,7 @@ jobs:
4040
- name: Put Artifact Size Metrics in CloudWatch
4141
run: ./gradlew putArtifactSizeMetricsInCloudWatch -Prelease=${{ github.event.release.tag_name }}
4242
size-check:
43-
if: github.event_name == 'pull_request'
43+
if: github.event_name == 'pull_request_target'
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Checkout Sources
@@ -70,10 +70,10 @@ jobs:
7070
- name: Analyze Artifact Size Metrics
7171
run: ./gradlew analyzeArtifactSizeMetrics
7272
working-directory: smithy-kotlin
73+
7374
- name: Show Results
7475
uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/show-results@main
75-
with:
76-
working-directory: smithy-kotlin
76+
7777
- name: Evaluate
7878
if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-artifact-size-increase') }}
7979
working-directory: smithy-kotlin

.github/workflows/changelog-verification.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ permissions:
44
id-token: write
55

66
on:
7-
pull_request:
7+
pull_request_target:
88
types: [ opened, synchronize, reopened, labeled, unlabeled ]
99
branches:
1010
- main
@@ -13,6 +13,7 @@ on:
1313
jobs:
1414
changelog-verification:
1515
runs-on: ubuntu-latest
16+
if: github.event.pull_request.user.login != 'dependabot[bot]' # no changelogs for Dependabot version bumps
1617
steps:
1718
- name: Configure AWS Credentials
1819
uses: aws-actions/configure-aws-credentials@v4

.github/workflows/continuous-integration.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ jobs:
4545
distribution: 'corretto'
4646
java-version: 17
4747
cache: 'gradle'
48+
- name: Configure Gradle
49+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
50+
with:
51+
working-directory: 'smithy-kotlin'
4852

4953
- name: Build and Test on JVM
5054
working-directory: ./smithy-kotlin

.github/workflows/kat-transform.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Kat Transform
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
types: [ opened, synchronize, reopened, labeled, unlabeled ]
66
branches:
77
- main

.github/workflows/merge-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
1313
with:
1414
ci-user-pat: ${{ secrets.CI_USER_PAT }}
15-
exempt-branches: # Add any if required
15+
exempt-branches: # Add any if required

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
# Changelog
22

3+
## [1.5.3] - 07/28/2025
4+
5+
### Features
6+
* [#1320](https://github.com/smithy-lang/smithy-kotlin/issues/1320) Enable configuration of timeouts for calls and attempt
7+
8+
## [1.5.2] - 07/24/2025
9+
10+
### Miscellaneous
11+
* [#1339](https://github.com/smithy-lang/smithy-kotlin/issues/1339) Add documentation for OkHttp4Engine when using Android with R8 / ProGuard
12+
13+
## [1.5.1] - 07/17/2025
14+
15+
## [1.5.0] - 07/17/2025
16+
17+
### Features
18+
* Upgrade to Kotlin 2.2.0
19+
* [#1413](https://github.com/awslabs/aws-sdk-kotlin/issues/1413) ⚠️ **IMPORTANT**: Refactor endpoint discoverer classes into interfaces so custom implementations may be provided
20+
21+
### Fixes
22+
* [#1311](https://github.com/smithy-lang/smithy-kotlin/issues/1311) Reimplement idle connection monitoring using `okhttp3.EventListener` instead of now-internal `okhttp3.ConnectionListener`
23+
* [#1608](https://github.com/awslabs/aws-sdk-kotlin/issues/1608) Switch to always serialize defaults in requests. Previously fields were not serialized in requests if they weren't `@required` and hadn't been changed from the default value.
24+
* [#1413](https://github.com/awslabs/aws-sdk-kotlin/issues/1413) Favor `endpointUrl` instead of endpoint discovery if both are provided
25+
26+
### Miscellaneous
27+
* Add telemetry provider configuration to `DefaultAwsSigner`
28+
329
## [1.4.23] - 07/15/2025
430

531
## [1.4.22] - 07/02/2025

build.gradle.kts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5+
import aws.sdk.kotlin.gradle.dsl.configureJReleaser
56
import aws.sdk.kotlin.gradle.dsl.configureLinting
6-
import aws.sdk.kotlin.gradle.dsl.configureNexus
77
import aws.sdk.kotlin.gradle.util.typedProp
88

99
buildscript {
@@ -14,6 +14,12 @@ buildscript {
1414
classpath(libs.kotlinx.atomicfu.plugin)
1515
// Add our custom gradle build logic to buildscript classpath
1616
classpath(libs.aws.kotlin.repo.tools.build.support)
17+
/*
18+
Enforce jackson to a version supported both by dokka and jreleaser:
19+
https://github.com/Kotlin/dokka/issues/3472#issuecomment-1929712374
20+
https://github.com/Kotlin/dokka/issues/3194#issuecomment-1929382630
21+
*/
22+
classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.19.2"))
1723
}
1824
}
1925

@@ -79,7 +85,7 @@ dependencies {
7985
}
8086

8187
// Publishing
82-
configureNexus()
88+
configureJReleaser()
8389

8490
// Code Style
8591
val lintPaths = listOf(

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupport.kt

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,27 @@ class RegionSupport : KotlinIntegration {
4040
name = "region"
4141
symbol = KotlinTypes.String.toBuilder().nullable().build()
4242
documentation = """
43-
The region to sign with and make requests to.
43+
The AWS region to sign with and make requests to. When specified, this static region configuration
44+
takes precedence over other region resolution methods.
45+
46+
The region resolution order is:
47+
1. Static region (if specified)
48+
2. Custom region provider (if configured)
49+
3. Default region provider chain
50+
""".trimIndent()
51+
}
52+
53+
val RegionProviderProp: ConfigProperty = ConfigProperty {
54+
name = "regionProvider"
55+
symbol = RuntimeTypes.SmithyClient.Region.RegionProvider
56+
documentation = """
57+
An optional region provider that determines the AWS region for client operations. When specified, this provider
58+
takes precedence over the default region provider chain, unless a static region is explicitly configured.
59+
60+
The region resolution order is:
61+
1. Static region (if specified)
62+
2. Custom region provider (if configured)
63+
3. Default region provider chain
4464
""".trimIndent()
4565
}
4666
}
@@ -57,7 +77,7 @@ class RegionSupport : KotlinIntegration {
5777
return supportsSigv4 || hasRegionBuiltin || isAwsSdk
5878
}
5979

60-
override fun additionalServiceConfigProps(ctx: CodegenContext): List<ConfigProperty> = listOf(RegionProp)
80+
override fun additionalServiceConfigProps(ctx: CodegenContext): List<ConfigProperty> = listOf(RegionProp, RegionProviderProp)
6181

6282
override fun customizeEndpointResolution(ctx: ProtocolGenerator.GenerationContext): EndpointCustomization =
6383
object : EndpointCustomization {

0 commit comments

Comments
 (0)