private/model/api: Add EventStream over RPC support #1998
Conversation
jasdel
force-pushed
the
feature/EventStreamRPC
branch
2 times, most recently
from
445ad54 to
eebb93a
Compare
|
Change to RESTXML not complete, fails for S3 |
jasdel
force-pushed
the
feature/EventStreamRPC
branch
from
eebb93a to
35c328d
Compare
|
fixed RESTXML's handling of unnamed implicit payload marshaling. |
jasdel
force-pushed
the
feature/EventStreamRPC
branch
3 times, most recently
from
c462eea to
348b582
Compare
| @@ -103,7 +107,15 @@ func (b *xmlBuilder) buildStruct(value reflect.Value, current *XMLNode, tag refl | |||
| } | |||
| } | |||
|
|
|||
| child := NewXMLElement(xml.Name{Local: tag.Get("locationName")}) | |||
There was a problem hiding this comment.
Move to code gen locationName for event stream shapes.
private/model/api/eventstream.go
Outdated
| @@ -444,6 +466,11 @@ func (r *read{{ $.ShapeName }}) readEventStream() { | |||
| return | |||
| } | |||
|
|
|||
| if err, ok := event.(awserr.Error); ok { | |||
There was a problem hiding this comment.
Cast to error instead of awserr.Error
private/model/api/eventstream.go
Outdated
| @@ -516,22 +622,443 @@ func (s *{{ $.ShapeName }}) UnmarshalEvent( | |||
| ) error { | |||
| {{- range $fieldIdx, $fieldName := $.MemberNames }} | |||
There was a problem hiding this comment.
No need for $fieldIdx. Just use range which already sorts, which is what fieldIdx was used for.
private/model/api/eventstream.go
Outdated
| if err := payloadUnmarshaler.UnmarshalPayload( | ||
| bytes.NewReader(msg.Payload), s, | ||
| ); err != nil { | ||
| return fmt.Errorf("failed to unmarshal payload, %v", err) |
There was a problem hiding this comment.
Serialization error should be used here.
private/model/api/eventstream.go
Outdated
| } | ||
| {{- end }} | ||
| {{- end }} | ||
| expectEvents = expectEvents[1:] |
There was a problem hiding this comment.
Comment on why we are chopping off first element
| sess := unit.Session | ||
| svc := New(sess, &aws.Config{ | ||
| Endpoint: aws.String("https://example.com"), | ||
| DisableParamValidation: aws.Bool(true), |
There was a problem hiding this comment.
Why is this disabled for benchmarks but not unit tests?
There was a problem hiding this comment.
Forgot tests do actually disable the parameter validation in the eventstreamtest.SetupEventStreamSession helper.
private/model/api/operation.go
Outdated
| @@ -253,8 +258,11 @@ func (o *Operation) GoCode() string { | |||
|
|
|||
| if len(o.OutputRef.Shape.EventStreamsMemberName) != 0 { | |||
| // TODO need better was of updating protocol unmarshalers | |||
| o.API.imports["fmt"] = true | |||
There was a problem hiding this comment.
Can go away with removal of fmt.Errorf
There was a problem hiding this comment.
Moved to eventstream template generation, needed for a few error messages there.
| sess, cleanupFn, err := eventstreamtest.SetupEventStreamSession(t, | ||
| eventstreamtest.ServeEventStream{ | ||
| T: t, | ||
| Events: eventMsgs, | ||
| }, | ||
| false, | ||
| true, |
There was a problem hiding this comment.
See if the operation is HTTP/2 and if it is able to be determined.
There was a problem hiding this comment.
Doesn't look like it.
private/model/api/eventstream.go
Outdated
| {{ end }} | ||
|
|
||
| {{ define "set event message header" }} | ||
| {{- if $.memRef.IsEventHeader }} | ||
| {{/* Parms: *Shape */}} |
|
|
||
| {{- $offsetIdx := OptionalAddInt (eq $.Operation.API.Metadata.Protocol "json") 0 1 }} | ||
| {{- $exception := index $.Inbound.Exceptions 0 }} | ||
| {{- template "set event message" Map "idx" $offsetIdx "parentShape" $exception.Shape "eventName" $exception.Name }} |
There was a problem hiding this comment.
This template will not generate event message as an exception type.
* Use code generation for XML implicit payload location name * swaps awserr.Error for error in event stream reader. * cleanup template iteration. * cleanup typos * Fix test making sure events chan is closed.
jasdel
force-pushed
the
feature/EventStreamRPC
branch
from
e4d4661 to
dd76c95
Compare
Adds support for EventStream over JSON PRC protocol. This adds support for the EventStream's initial-response event, EventStream headers, and EventStream modeled exceptions. Also replaces the hand written tests with generated tests for EventStream usage.
diehlaws
added
the
needs-review
Adds support for EventStream over JSON PRC protocol. This adds support for the EventStream's
initial-responseevent, EventStream headers, and EventStream modeled exceptions.Also replaces the hand written tests with generated tests for EventStream usage.