Skip to content

Commit 828adaa

Browse files
authored
Merge branch 'main' into flexible-checksums
2 parents 40bb298 + 394eb3b commit 828adaa

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

CHANGELOG.md

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

3+
## [1.3.28] - 12/03/2024
4+
5+
## [1.3.27] - 12/02/2024
6+
37
## [1.3.26] - 11/22/2024
48

59
### Fixes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# <img alt="Smithy" src="https://github.com/smithy-lang/smithy/blob/main/docs/_static/favicon.png?raw=true" width="28"> Smithy Kotlin
1+
# <img alt="Smithy" src="https://github.com/smithy-lang/smithy/blob/main/docs/_static/smithy-anvil.svg?raw=true" width="32"> Smithy Kotlin
22

33
[Smithy](https://smithy.io/2.0/index.html) code generators for [Kotlin](https://kotlinlang.org/).
44

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsIntegration.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import software.amazon.smithy.kotlin.codegen.core.CodegenContext
55
import software.amazon.smithy.kotlin.codegen.core.DEFAULT_TEST_SOURCE_SET_ROOT
66
import software.amazon.smithy.kotlin.codegen.core.KotlinDelegator
77
import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
8-
import software.amazon.smithy.kotlin.codegen.model.hasTrait
9-
import software.amazon.smithy.kotlin.codegen.utils.topDownOperations
108
import software.amazon.smithy.model.Model
119
import software.amazon.smithy.smoketests.traits.SmokeTestsTrait
1210

@@ -15,7 +13,9 @@ import software.amazon.smithy.smoketests.traits.SmokeTestsTrait
1513
*/
1614
class SmokeTestsIntegration : KotlinIntegration {
1715
override fun enabledForService(model: Model, settings: KotlinSettings): Boolean =
18-
model.topDownOperations(settings.service).any { it.hasTrait<SmokeTestsTrait>() }
16+
false
17+
// FIXME: Enable smoke tests again
18+
// model.topDownOperations(settings.service).any { it.hasTrait<SmokeTestsTrait>() }
1919

2020
override fun writeAdditionalFiles(ctx: CodegenContext, delegator: KotlinDelegator) =
2121
delegator.useFileWriter(

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
1313
org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
1414

1515
# SDK
16-
sdkVersion=1.3.27-SNAPSHOT
16+
sdkVersion=1.3.29-SNAPSHOT
1717

1818
# codegen
19-
codegenVersion=0.33.27-SNAPSHOT
19+
codegenVersion=0.33.29-SNAPSHOT

runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtilsTest.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package aws.smithy.kotlin.runtime.businessmetrics
77
import aws.smithy.kotlin.runtime.collections.get
88
import aws.smithy.kotlin.runtime.operation.ExecutionContext
99
import kotlin.test.Test
10+
import kotlin.test.assertEquals
1011
import kotlin.test.assertFalse
1112
import kotlin.test.assertTrue
1213

@@ -55,4 +56,12 @@ class BusinessMetricsUtilsTest {
5556
executionContext.removeBusinessMetric(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION)
5657
assertFalse(executionContext.containsBusinessMetric(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION))
5758
}
59+
60+
@Test
61+
fun businessMetricToString() {
62+
val businessMetricToString = SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION.toString()
63+
val businessMetricIdentifier = SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION.identifier
64+
65+
assertEquals(businessMetricIdentifier, businessMetricToString)
66+
}
5867
}

0 commit comments

Comments
 (0)