Skip to content

Commit ad61ecc

Browse files
lauzadislauzadis
committed
Merge branch 'main' of github.com:awslabs/aws-sdk-kotlin into kn-main-merge
2 parents 9c7d2c4 + 41170fc commit ad61ecc

File tree

10 files changed

+526
-182
lines changed

10 files changed

+526
-182
lines changed

‎.github/workflows/codebuild-ci.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ jobs:
4343
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
4444
runs-on: ubuntu-latest
4545
steps:
46+
- name: Set start timestamp
47+
id: start
48+
run: printf 'timestamp=%(%s)T\n' >> "$GITHUB_OUTPUT"
4649
- name: Verify PRs are not running malicious code
4750
if: ${{ (inputs.aws-sdk-kotlin-pr != '' || inputs.smithy-kotlin-pr != '') && inputs.check-pr == false }}
4851
run: |
@@ -53,6 +56,8 @@ jobs:
5356
with:
5457
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
5558
aws-region: us-west-2
59+
- name: Setup kat
60+
uses: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
5661
- name: Run E2E Tests
5762
id: e2e-tests
5863
uses: aws-actions/aws-codebuild-run-build@v1
@@ -68,11 +73,33 @@ jobs:
6873
echo "cancelling in-progress build: id=$BUILD_ID"
6974
aws codebuild stop-build --id $BUILD_ID
7075
fi
76+
- name: Calculate duration
77+
id: end
78+
if: always()
79+
run: |
80+
printf -v now '%(%s)T'
81+
duration=$(( now - ${{ steps.start.outputs.timestamp }} ))
82+
echo "duration=$duration" >> "$GITHUB_OUTPUT"
83+
- name: Emit metrics
84+
if: always() # run this step even if previous steps failed or the job is canceled
85+
uses: aws/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
86+
with:
87+
namespace: CI Metrics
88+
dimensions: |
89+
Product=aws-sdk-kotlin
90+
JobName=${{ github.job }}
91+
Branch=${{ github.base_ref || github.ref_name }}
92+
metrics: |
93+
WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
94+
WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds
7195
7296
service-check-batch-and-artifact-size-metrics:
7397
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
7498
runs-on: ubuntu-latest
7599
steps:
100+
- name: Set start timestamp
101+
id: start
102+
run: printf 'timestamp=%(%s)T\n' >> "$GITHUB_OUTPUT"
76103
- name: Verify PRs are not running malicious code
77104
if: ${{ (inputs.aws-sdk-kotlin-pr != '' || inputs.smithy-kotlin-pr != '') && inputs.check-pr == false }}
78105
run: |
@@ -85,6 +112,8 @@ jobs:
85112
with:
86113
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
87114
aws-region: us-west-2
115+
- name: Setup kat
116+
uses: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
88117
- name: Configure Gradle
89118
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
90119
- name: Run Service Check Batch and Calculate Artifact Size Metrics
@@ -155,6 +184,25 @@ jobs:
155184
echo If this is expected please add the 'acknowledge-artifact-size-increase' label to this pull request.
156185
exit 1
157186
}
187+
- name: Calculate duration
188+
id: end
189+
if: always()
190+
run: |
191+
printf -v now '%(%s)T'
192+
duration=$(( now - ${{ steps.start.outputs.timestamp }} ))
193+
echo "duration=$duration" >> "$GITHUB_OUTPUT"
194+
- name: Emit metrics
195+
if: always() # run this step even if previous steps failed or the job is canceled
196+
uses: aws/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
197+
with:
198+
namespace: CI Metrics
199+
dimensions: |
200+
Product=aws-sdk-kotlin
201+
JobName=${{ github.job }}
202+
Branch=${{ github.base_ref || github.ref_name }}
203+
metrics: |
204+
WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
205+
WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds
158206
159207
release-artifact-size-metrics:
160208
if: github.event_name == 'release'

‎.github/workflows/continuous-integration.yml‎

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ on:
44
pull_request:
55
workflow_dispatch:
66

7-
permissions: { }
8-
7+
permissions:
8+
id-token: write
9+
contents: read
910
# Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
1011
concurrency:
1112
group: ci-pr-${{ github.ref }}
@@ -29,6 +30,9 @@ jobs:
2930
- 17
3031
- 21
3132
steps:
33+
- name: Set start timestamp
34+
id: start
35+
run: printf 'timestamp=%(%s)T\n' >> "$GITHUB_OUTPUT"
3236
- name: Checkout sources
3337
uses: actions/checkout@v4
3438
with:
@@ -39,13 +43,39 @@ jobs:
3943
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
4044
with:
4145
working-directory: ./aws-sdk-kotlin
46+
- name: Configure AWS Credentials
47+
uses: aws-actions/configure-aws-credentials@v4
48+
with:
49+
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
50+
aws-region: us-west-2
51+
- name: Setup kat
52+
uses: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
4253
- name: Test
4354
working-directory: ./aws-sdk-kotlin
4455
shell: bash
4556
run: |
4657
pwd
4758
ls -lsa
4859
./gradlew -Ptest.java.version=${{ matrix.java-version }} jvmTest --stacktrace
60+
- name: Calculate duration
61+
id: end
62+
if: always()
63+
run: |
64+
printf -v now '%(%s)T'
65+
duration=$(( now - ${{ steps.start.outputs.timestamp }} ))
66+
echo "duration=$duration" >> "$GITHUB_OUTPUT"
67+
- name: Emit metrics
68+
if: always() # run this step even if previous steps failed or the job is canceled
69+
uses: aws/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
70+
with:
71+
namespace: CI Metrics
72+
dimensions: |
73+
Product=aws-sdk-kotlin
74+
JobName=${{ github.job }}(${{ matrix.java-version }})
75+
Branch=${{ github.base_ref || github.ref_name }}
76+
metrics: |
77+
WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
78+
WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds
4979
- name: Save Test Reports
5080
if: failure()
5181
uses: actions/upload-artifact@v4
@@ -60,6 +90,10 @@ jobs:
6090
matrix:
6191
os: [ ubuntu-latest, macos-latest, windows-latest ]
6292
steps:
93+
- name: Set start timestamp
94+
id: start
95+
shell: bash
96+
run: echo "timestamp=$(date +%s)" >> "$GITHUB_OUTPUT"
6397
- name: Checkout sources
6498
uses: actions/checkout@v4
6599
with:
@@ -68,6 +102,13 @@ jobs:
68102
- name: Setup Build
69103
uses: ./aws-sdk-kotlin/.github/actions/setup-build
70104

105+
- name: Configure AWS Credentials
106+
uses: aws-actions/configure-aws-credentials@v4
107+
with:
108+
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
109+
aws-region: us-west-2
110+
- name: Setup kat
111+
uses: aws/aws-kotlin-repo-tools/.github/actions/setup-kat@main
71112
- name: Configure Gradle - smithy-kotlin
72113
uses: aws/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
73114
with:
@@ -106,6 +147,26 @@ jobs:
106147
./gradlew test jvmTest
107148
./gradlew testAllProtocols
108149
150+
- name: Calculate duration
151+
id: end
152+
if: always()
153+
shell: bash
154+
run: |
155+
now=$(date +%s)
156+
duration=$(( now - ${{ steps.start.outputs.timestamp }} ))
157+
echo "duration=$duration" >> "$GITHUB_OUTPUT"
158+
- name: Emit metrics
159+
if: always() # run this step even if previous steps failed or the job is canceled
160+
uses: aws/aws-kotlin-repo-tools/.github/actions/emit-metrics@main
161+
with:
162+
namespace: CI Metrics
163+
dimensions: |
164+
Product=aws-sdk-kotlin
165+
JobName=${{ github.job }}(${{ matrix.os }})
166+
Branch=${{ github.base_ref || github.ref_name }}
167+
metrics: |
168+
WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
169+
WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds
109170
- name: Save Test Reports
110171
if: failure()
111172
uses: actions/upload-artifact@v4

‎CHANGELOG.md‎

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

3+
## [1.5.50] - 09/29/2025
4+
5+
### Features
6+
* (**bedrock**) Release for fixing GetFoundationModel API behavior. Imported and custom models have their own exclusive API and GetFM should not accept those ARNS as input
7+
* (**bedrockruntime**) New stop reason for Converse and ConverseStream
8+
* (**imagebuilder**) This release introduces several new features and improvements to enhance pipeline management, logging, and resource configuration.
9+
* (**vpclattice**) Adds support for specifying the number of IPv4 addresses in each ENI for the resource gateway for VPC Lattice.
10+
311
## [1.5.49] - 09/26/2025
412

513
## [1.5.48] - 09/26/2025

‎codegen/aws-sdk-codegen/src/main/resources/aws/sdk/kotlin/codegen/endpoints.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18967,6 +18967,7 @@
1896718967
},
1896818968
"hostname" : "portal.sso.ap-southeast-5.amazonaws.com"
1896918969
},
18970+
"ap-southeast-7" : { },
1897018971
"ca-central-1" : {
1897118972
"credentialScope" : {
1897218973
"region" : "ca-central-1"
@@ -19045,6 +19046,7 @@
1904519046
},
1904619047
"hostname" : "portal.sso.me-south-1.amazonaws.com"
1904719048
},
19049+
"mx-central-1" : { },
1904819050
"sa-east-1" : {
1904919051
"credentialScope" : {
1905019052
"region" : "sa-east-1"

‎codegen/sdk/aws-models/bedrock-runtime.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,9 @@
730730
{
731731
"target": "com.amazonaws.bedrockruntime#ServiceQuotaExceededException"
732732
},
733+
{
734+
"target": "com.amazonaws.bedrockruntime#ServiceUnavailableException"
735+
},
733736
{
734737
"target": "com.amazonaws.bedrockruntime#ThrottlingException"
735738
},
@@ -6048,6 +6051,12 @@
60486051
"traits": {
60496052
"smithy.api#enumValue": "content_filtered"
60506053
}
6054+
},
6055+
"MODEL_CONTEXT_WINDOW_EXCEEDED": {
6056+
"target": "smithy.api#Unit",
6057+
"traits": {
6058+
"smithy.api#enumValue": "model_context_window_exceeded"
6059+
}
60516060
}
60526061
}
60536062
},

‎codegen/sdk/aws-models/bedrock.json‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6237,7 +6237,7 @@
62376237
"min": 20,
62386238
"max": 1011
62396239
},
6240-
"smithy.api#pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:custom-model/(imported|[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2})/[a-z0-9]{12}$"
6240+
"smithy.api#pattern": "^arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:[a-z0-9-]{1,20}:[0-9]{12}:custom-model/(imported|[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2})/[a-z0-9]{12}$"
62416241
}
62426242
},
62436243
"com.amazonaws.bedrock#CustomModelDeploymentArn": {
@@ -10111,11 +10111,21 @@
1011110111
"smithy.api#output": {}
1011210112
}
1011310113
},
10114+
"com.amazonaws.bedrock#GetFoundationModelIdentifier": {
10115+
"type": "string",
10116+
"traits": {
10117+
"smithy.api#length": {
10118+
"min": 1,
10119+
"max": 2048
10120+
},
10121+
"smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/[a-z0-9-]{1,63}[.]{1}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2})|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})$"
10122+
}
10123+
},
1011410124
"com.amazonaws.bedrock#GetFoundationModelRequest": {
1011510125
"type": "structure",
1011610126
"members": {
1011710127
"modelIdentifier": {
10118-
"target": "com.amazonaws.bedrock#ModelIdentifier",
10128+
"target": "com.amazonaws.bedrock#GetFoundationModelIdentifier",
1011910129
"traits": {
1012010130
"smithy.api#documentation": "<p>The model identifier. </p>",
1012110131
"smithy.api#httpLabel": {},
@@ -13811,7 +13821,7 @@
1381113821
"min": 1,
1381213822
"max": 256
1381313823
},
13814-
"smithy.api#pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9])*$"
13824+
"smithy.api#pattern": "^[a-zA-Z0-9]([-a-zA-Z0-9]{0,254}[a-zA-Z0-9])?$"
1381513825
}
1381613826
},
1381713827
"com.amazonaws.bedrock#Identifier": {
@@ -19017,7 +19027,6 @@
1901719027
"com.amazonaws.bedrock#RoleArn": {
1901819028
"type": "string",
1901919029
"traits": {
19020-
"smithy.api#documentation": "ARN of a IAM role",
1902119030
"smithy.api#length": {
1902219031
"max": 2048
1902319032
},

0 commit comments

Comments
 (0)