codegen: Fixup event stream (un)marshal event name to match model (#4261

) Updates SDK's code generation for even stream event names to match the member's modeled name. Fixes the SDK not using the right case or name if the modeled name is not Go exportable name.
aws · Jan 27, 2022 · fdd6541 · fdd6541
1 parent 5bcaccb
commit fdd6541
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/private/model/api/codegentest/models/restjson/0000-00-00/api-2.json b/private/model/api/codegentest/models/restjson/0000-00-00/api-2.json
@@ -67,13 +67,13 @@
       "type":"structure",
       "members":{
         "Headers":{"shape":"HeaderOnlyEvent"},
-        "ImplicitPayload":{"shape":"ImplicitPayloadEvent"},
+        "implicitPayload":{"shape":"ImplicitPayloadEvent"},
         "ExplicitPayload":{"shape":"ExplicitPayloadEvent"},
-        "PayloadOnly":{"shape":"PayloadOnlyEvent"},
+        "payloadOnly":{"shape":"PayloadOnlyEvent"},
         "PayloadOnlyBlob":{"shape":"PayloadOnlyBlobEvent"},
-        "PayloadOnlyString":{"shape":"PayloadOnlyStringEvent"},
+        "payloadOnlyString":{"shape":"PayloadOnlyStringEvent"},
         "Empty":{"shape":"EmptyEvent"},
-        "Exception":{"shape":"ExceptionEvent"},
+        "exception":{"shape":"ExceptionEvent"},
         "Exception2":{"shape":"ExceptionEvent2"}
       },
       "eventstream":true

diff --git a/private/model/api/codegentest/service/restjsonservice/api.go b/private/model/api/codegentest/service/restjsonservice/api.go
diff --git a/private/model/api/codegentest/service/restjsonservice/eventstream_test.go b/private/model/api/codegentest/service/restjsonservice/eventstream_test.go
diff --git a/private/model/api/eventstream.go b/private/model/api/eventstream.go
@@ -285,10 +285,15 @@ func setupEventStream(s *Shape) *EventStream {
 		}
 		eventRef.Shape.EventFor[eventStream.Name] = eventStream
 
+		eventName := eventRefName
+		if v := eventRef.LocationName; v != "" {
+			eventName = v
+		}
+
 		// Exceptions and events are two different lists to allow the SDK
 		// to easily generate code with the two handled differently.
 		event := &Event{
-			Name:  eventRefName,
+			Name:  eventName,
 			Shape: eventRef.Shape,
 			For:   eventStream,
 		}