Partial HTTP protocol implementation #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kggilmer
approved these changes
Oct 29, 2020
| } | ||
| } else { | ||
| this.block(outerField) | ||
| } | ||
| } | ||
|
|
||
| fun ListForEach(target: Shape, outerField: String, block: CodeWriter.(field: String, target: ShapeId) -> Unit) { |
| return if (nullableIndex.isNullable(shape) && !shape.hasTrait(HttpLabelTrait::class.java)) { | ||
| private fun handleOptionality(symbol: Symbol, member: MemberShape, container: Shape): Symbol { | ||
| val httpLabeledInput = container.hasTrait(SyntheticInput::class.java) && member.hasTrait(HttpLabelTrait::class.java) | ||
| return if (nullableIndex.isNullable(member) && !httpLabeledInput) { | ||
| val builder = Symbol.builder() | ||
| val rustType = RustType.Option(symbol.rustType()) |
There was a problem hiding this comment.
One syntatic niceity is with(builder) {} allows you to remove redundant type names when accessing properties/functions on the same instance line over line. (FYI)
| @@ -91,6 +92,7 @@ class SymbolVisitor( | |||
| ) : SymbolProvider, | |||
| ShapeVisitor<Symbol> { | |||
| private val nullableIndex = NullableIndex(model) | |||
| private val bottomUpIndex = BottomUpIndex(model) | |||
|
|
||
| fun Symbol.Builder.rustType(rustType: RustType): Symbol.Builder { | ||
| return this.putProperty(RUST_TYPE_KEY, rustType) | ||
| } | ||
|
|
||
| fun Symbol.rename(newName: String): Symbol { | ||
| assert(this.rustType() is RustType.Opaque) |
| import software.amazon.smithy.rust.codegen.smithy.RuntimeConfig | ||
| import software.amazon.smithy.rust.codegen.smithy.RuntimeType | ||
|
|
||
| data class ProtocolConfig( |
| val memberType = model.expectShape(memberShape.target) | ||
| val memberSymbol = symbolProvider.toSymbol(memberShape) | ||
| val memberName = symbolProvider.toMemberName(memberShape) | ||
| OptionForEach(memberSymbol, "&self.$memberName") { field -> |
There was a problem hiding this comment.
nit: case of these functions seems off
| @@ -22,7 +24,7 @@ fun String.runCommand(workdir: Path? = null): String? { | |||
| proc.waitFor(60, TimeUnit.MINUTES) | |||
| if (proc.exitValue() != 0) { | |||
| val output = proc.errorStream.bufferedReader().readText() | |||
| throw AssertionError("Command Failed\n$output") | |||
| throw CommandFailed("Command Failed\n$output") | |||
There was a problem hiding this comment.
you could also just do error("Command Failed...") here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
This diff adds extremely limited support for
AwsJson1.0andRestJson1. Along the way it fixes lots of bugs & does assorted refactorings to clean up abstractions. It's not really a 10k line diff: 9,150 of the lines are from adding Dynamo and EBS as integration tests.Currently, the protocol implementations are inside of Smithy—we may decide that that needs to be refactored later, but TBD.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.