Add support for endpoints.json #468
Conversation
|
|
||
| /// Endpoint metadata | ||
| /// | ||
| /// T & P exist to support optional vs. non optional values for Protocol and URI template during |
| // We use a stripped down version of the regex crate without unicode support | ||
| // To support `\d` and `\w`, we need to explicitly opt into the ascii-only version. | ||
| let ascii_only = regex | ||
| .replace("\\d", "(?-u:\\d)") |
There was a problem hiding this comment.
Any reason not to do this replacement at Kotlin codegen time?
There was a problem hiding this comment.
I considered it, but it's more of a Rust implementation detail, so I wanted to allow Kotlin to just send the raw regexes. I could be convinced though.
| val comparePartitions = object : Comparator<PartitionNode> { | ||
| override fun compare(x: PartitionNode, y: PartitionNode): Int { | ||
| // always sort standard aws partition first | ||
| if (x.id == "aws") return -1 | ||
| return x.id.compareTo(y.id) | ||
| } | ||
| } | ||
|
|
||
| val partitions = partitionsData.map { | ||
| PartitionNode(endpointPrefix, it) | ||
| }.sortedWith(comparePartitions) |
There was a problem hiding this comment.
There is Kotlin syntax to allow passing in the Comparator with lambda syntax:
.sortedWith(Comparator { x, y ->
...
})
| val rest = partitions.drop(1) | ||
| val fnName = "endpoint_resolver" | ||
| return RuntimeType.forInlineFun(fnName, "aws_endpoint") { | ||
| it.rustBlock("pub fn $fnName() -> impl #T", awsEndpoint.member("ResolveAwsEndpoint")) { |
There was a problem hiding this comment.
Nit: I think these will be more readable if you just use rustBlockTemplate, name the types, and pass in *codegenScope.
| @@ -41,6 +41,7 @@ class FluentClientDecorator : RustCodegenDecorator { | |||
| override val order: Byte = 0 | |||
|
|
|||
| override fun extras(protocolConfig: ProtocolConfig, rustCrate: RustCrate) { | |||
| protocolConfig.symbolProvider.config().codegenConfig | |||
There was a problem hiding this comment.
Does this have a side effect?
| return template.replace(Regex("""#\{([a-zA-Z_0-9]+)\}""")) { matchResult -> | ||
| val keyName = matchResult.groupValues[1] | ||
| if (!scope.toMap().keys.contains(keyName)) { | ||
| throw CodegenException( |
| @@ -346,7 +346,7 @@ class XmlBindingTraitParserGenerator( | |||
| *codegenScope, "Shape" to symbol | |||
| ) { | |||
| val members = shape.members() | |||
| rustTemplate("let mut base: Option<#{Shape}> = None;", *codegenScope) | |||
| rustTemplate("let mut base: Option<#{Shape}> = None;", *codegenScope, "Shape" to symbol) | |||
There was a problem hiding this comment.
Wait, how did this ever work?
There was a problem hiding this comment.
because rustBlockTemplate actually applies the codegen scope to the entire block, but now it fails because of the new assert
Issue #, if available: #459
Description of changes: Add support for endpoint.json based endpoint resolution. This takes a slightly different approach to previous work. Rather than resolving endpoint merging at runtime in Rust, endpoint merging is handled at the code generation level. This enables keeping the Rust code simple (and since the Kotlin side already needed to support endpoint merging, this doesn't increase complexity there either)
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.