Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

missing RuntimeConfig node should behave the same as {} #1678

Merged
merged 4 commits into from
Aug 26, 2022
Merged

missing RuntimeConfig node should behave the same as {} #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2847278
test: missing RuntimeConfig node should behave the same as `{}`
weihanglo Aug 26, 2022
549d21f
missing RuntimeConfig node should behave the same as `{}`
weihanglo Aug 26, 2022
caa7abd
use `maybe` prefix for Optional type
weihanglo Aug 26, 2022
93d0a53
Merge branch 'main' into weihanglo/runtimeconfig-missing
weihanglo Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/RuntimeTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,18 @@ data class RuntimeConfig(
/**
* Load a `RuntimeConfig` from an [ObjectNode] (JSON)
*/
fun fromNode(node: Optional<ObjectNode>): RuntimeConfig {
return if (node.isPresent) {
val crateVersionMap = node.get().getObjectMember("versions").orElse(Node.objectNode()).members.entries.let { members ->
val map = members.associate { it.key.toString() to it.value.expectStringNode().value }
CrateVersionMap(map)
}
val path = node.get().getStringMember("relativePath").orNull()?.value
val runtimeCrateLocation = RuntimeCrateLocation(path = path, versions = crateVersionMap)
RuntimeConfig(
node.get().getStringMemberOrDefault("cratePrefix", "aws-smithy"),
runtimeCrateLocation = runtimeCrateLocation,
)
} else {
RuntimeConfig()
fun fromNode(maybeNode: Optional<ObjectNode>): RuntimeConfig {
val node = maybeNode.orElse(Node.objectNode())
val crateVersionMap = node.getObjectMember("versions").orElse(Node.objectNode()).members.entries.let { members ->
val map = members.associate { it.key.toString() to it.value.expectStringNode().value }
CrateVersionMap(map)
}
val path = node.getStringMember("relativePath").orNull()?.value
val runtimeCrateLocation = RuntimeCrateLocation(path = path, versions = crateVersionMap)
return RuntimeConfig(
node.getStringMemberOrDefault("cratePrefix", "aws-smithy"),
runtimeCrateLocation = runtimeCrateLocation,
)
}
}

Expand Down
9 changes: 9 additions & 0 deletions codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/RuntimeTypesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
package software.amazon.smithy.rust.codegen.smithy

import io.kotest.matchers.shouldBe
import org.junit.jupiter.api.Test
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.Arguments
import org.junit.jupiter.params.provider.MethodSource
import software.amazon.smithy.model.node.Node
import software.amazon.smithy.rust.codegen.rustlang.CratesIo
import software.amazon.smithy.rust.codegen.rustlang.DependencyLocation
import software.amazon.smithy.rust.codegen.rustlang.Local
import java.util.Optional

class RuntimeTypesTest {
@ParameterizedTest
Expand All @@ -26,6 +28,13 @@ class RuntimeTypesTest {
cfg.runtimeCrateLocation shouldBe expectedCrateLocation
}

@Test
fun `succeeded to provide a default runtime config if missing`() {
// This default config should share the same behaviour with `{}` empty object.
val cfg = RuntimeConfig.fromNode(Optional.empty())
cfg.runtimeCrateLocation shouldBe RuntimeCrateLocation(null, CrateVersionMap(mapOf()))
}

@ParameterizedTest
@MethodSource("runtimeCrateLocationProvider")
fun `runtimeCrateLocation provides dependency location`(
Expand Down