Skip to content

Commit 499ec87

Browse files
committed
Merge branch 'main' of github.com:smithy-lang/smithy-kotlin into s3-tm-dev
2 parents d51e9a8 + 8db23bd commit 499ec87

File tree

28 files changed

+348
-66
lines changed

28 files changed

+348
-66
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "15fd2749-fec2-4e7a-9639-3683fa5e94ed",
3+
"type": "bugfix",
4+
"description": "Preserve logging context for streaming payload signing"
5+
}

.github/workflows/continuous-integration.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,35 @@ jobs:
141141
linux:
142142
runs-on: ubuntu-latest
143143
steps:
144+
- name: Remove unnecessary tools
145+
run: |
146+
# Remove .NET SDKs
147+
sudo rm -rf /usr/share/dotnet
148+
149+
# Remove Swift toolchain
150+
sudo rm -rf /usr/share/swift
151+
152+
# Remove Haskell (GHC)
153+
sudo rm -rf /usr/local/.ghcup
154+
155+
# Remove Julia
156+
sudo rm -rf /usr/local/julia*
157+
158+
# Remove Android SDKs
159+
sudo rm -rf /usr/local/lib/android
160+
161+
# Remove Chromium
162+
sudo rm -rf /usr/local/share/chromium
163+
164+
# Remove Microsoft/Edge and Google Chrome builds
165+
sudo rm -rf /opt/microsoft /opt/google
166+
167+
# Remove Azure CLI
168+
sudo rm -rf /opt/az
169+
170+
# Remove PowerShell
171+
sudo rm -rf /usr/local/share/powershell
172+
144173
- name: Checkout sources
145174
uses: actions/checkout@v4
146175
with:

CHANGELOG.md

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

3+
## [1.5.20] - 11/10/2025
4+
5+
## [1.5.19] - 11/04/2025
6+
7+
### Features
8+
* Upgrade **aws-crt-kotlin** to [**v0.11.7**](https://github.com/aws/aws-crt-kotlin/releases/tag/v0.11.7) containing a new cipher suite
9+
10+
## [1.5.18] - 10/27/2025
11+
12+
## [1.5.17] - 10/24/2025
13+
14+
### Features
15+
* [#1707](https://github.com/aws/aws-sdk-kotlin/issues/1707) Allow configuring a custom OkHttpClient in OkHttpEngine
16+
317
## [1.5.16] - 10/22/2025
418

519
### Features

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/eventstream/EventStreamSerializerGenerator.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ import software.amazon.smithy.kotlin.codegen.core.*
1111
import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
1212
import software.amazon.smithy.kotlin.codegen.model.*
1313
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
14-
import software.amazon.smithy.kotlin.codegen.rendering.serde.*
14+
import software.amazon.smithy.kotlin.codegen.rendering.serde.StructuredDataSerializerGenerator
15+
import software.amazon.smithy.kotlin.codegen.rendering.serde.bodySerializer
16+
import software.amazon.smithy.kotlin.codegen.rendering.serde.bodySerializerName
17+
import software.amazon.smithy.kotlin.codegen.rendering.serde.serializerName
1518
import software.amazon.smithy.kotlin.codegen.utils.getOrNull
1619
import software.amazon.smithy.model.shapes.*
1720
import software.amazon.smithy.model.traits.EventHeaderTrait
@@ -110,7 +113,7 @@ class EventStreamSerializerGenerator(
110113
}
111114

112115
writer.write("")
113-
writer.write("return messages.#T(context)", RuntimeTypes.AwsEventStream.asEventStreamHttpBody)
116+
writer.write("return messages.#T()", RuntimeTypes.AwsEventStream.asEventStreamHttpBody)
114117
}
115118

116119
private fun encodeEventStreamMessage(

codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/NamingTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class NamingTest {
2727
assertEquals("ElastiCache", clientName("ElastiCache"))
2828
assertEquals("ApiGatewayManagement", clientName("ApiGatewayManagementApi"))
2929
assertEquals("MigrationHubConfig", clientName("MigrationHub Config"))
30-
assertEquals("IotFleetHub", clientName("IoTFleetHub"))
3130
assertEquals("Iot1ClickProjects", clientName("IoT 1Click Projects"))
3231
assertEquals("DynamoDb", clientName("DynamoDB"))
3332

codegen/smithy-kotlin-codegen/src/test/resources/all-names-test-output.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33124,7 +33124,6 @@ LookBackAvailablePeriods,lookBackAvailablePeriods
3312433124
LookBackPeriod,lookBackPeriod
3312533125
LookbackPeriodInDays,lookbackPeriodInDays
3312633126
LookbackWindow,lookbackWindow
33127-
LookoutMetrics,lookoutMetrics
3312833127
LookupAttribute,lookupAttribute
3312933128
LookupAttributes,lookupAttributes
3313033129
LookupDeveloperIdentityInput,lookupDeveloperIdentityInput

codegen/smithy-kotlin-codegen/src/test/resources/all-names.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33124,7 +33124,6 @@ LookBackAvailablePeriods
3312433124
LookBackPeriod
3312533125
LookbackPeriodInDays
3312633126
LookbackWindow
33127-
LookoutMetrics
3312833127
LookupAttribute
3312933128
LookupAttributes
3313033129
LookupDeveloperIdentityInput

codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids-test-output.csv

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ IoT Wireless,IotWireless
163163
IoT,Iot
164164
IoTAnalytics,IotAnalytics
165165
IotDeviceAdvisor,IotDeviceAdvisor
166-
IoTFleetHub,IotFleetHub
167166
IoTFleetWise,IotFleetWise
168167
IoTSecureTunneling,IotSecureTunneling
169168
IoTSiteWise,IotSiteWise
@@ -198,8 +197,6 @@ License Manager,LicenseManager
198197
Lightsail,Lightsail
199198
Location,Location
200199
LookoutEquipment,LookoutEquipment
201-
LookoutMetrics,LookoutMetrics
202-
LookoutVision,LookoutVision
203200
m2,M2
204201
Machine Learning,MachineLearning
205202
Macie,Macie
@@ -260,8 +257,6 @@ Pipes,Pipes
260257
Polly,Polly
261258
Pricing,Pricing
262259
Proton,Proton
263-
QLDB Session,QldbSession
264-
QLDB,Qldb
265260
QuickSight,QuickSight
266261
RAM,Ram
267262
rbin,Rbin
@@ -275,7 +270,6 @@ resiliencehub,Resiliencehub
275270
Resource Explorer 2,ResourceExplorer2
276271
Resource Groups Tagging API,ResourceGroupsTagging
277272
Resource Groups,ResourceGroups
278-
RoboMaker,RoboMaker
279273
RolesAnywhere,RolesAnywhere
280274
Route 53 Domains,Route53Domains
281275
Route 53,Route53

codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ IoT Wireless
163163
IoT
164164
IoTAnalytics
165165
IotDeviceAdvisor
166-
IoTFleetHub
167166
IoTFleetWise
168167
IoTSecureTunneling
169168
IoTSiteWise
@@ -198,8 +197,6 @@ License Manager
198197
Lightsail
199198
Location
200199
LookoutEquipment
201-
LookoutMetrics
202-
LookoutVision
203200
m2
204201
Machine Learning
205202
Macie
@@ -260,8 +257,6 @@ Pipes
260257
Polly
261258
Pricing
262259
Proton
263-
QLDB Session
264-
QLDB
265260
QuickSight
266261
RAM
267262
rbin
@@ -275,7 +270,6 @@ resiliencehub
275270
Resource Explorer 2
276271
Resource Groups Tagging API
277272
Resource Groups
278-
RoboMaker
279273
RolesAnywhere
280274
Route 53 Domains
281275
Route 53

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ kotlinx.atomicfu.enableJvmIrTransformation=false
1111
kotlinx.atomicfu.enableNativeIrTransformation=false
1212

1313
# gradle
14-
org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
14+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G
1515
org.gradle.parallel=true
1616

1717
# SDK
18-
sdkVersion=1.5.17-SNAPSHOT
18+
sdkVersion=1.5.21-SNAPSHOT
1919

2020
# codegen
21-
codegenVersion=0.35.17-SNAPSHOT
21+
codegenVersion=0.35.21-SNAPSHOT
2222

2323
# FIXME Remove after Dokka 2.0 Gradle plugin is stable
2424
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

0 commit comments

Comments
 (0)