Merge pull request #68 from disneystreaming/add-awstest-config

update Smithy model to latest version and update aws test configs
disneystreaming · Feb 28, 2023 · 26903dc · 26903dc
2 parents b7b2fb0 + d09ef18
commit 26903dc
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 54 deletions.
diff --git a/build.sc b/build.sc
@@ -166,7 +166,7 @@ object `protocol-tests` extends BaseJavaModule {
 
 object Deps {
   val smithy = new {
-    val smithyVersion = "1.27.2"
+    val smithyVersion = "1.28.0"
     val model = ivy"software.amazon.smithy:smithy-model:$smithyVersion"
     val awsTraits = ivy"software.amazon.smithy:smithy-aws-traits:$smithyVersion"
     val awsProtocolTestTraits =

diff --git a/modules/openapi/src/software/amazon/smithy/openapi/fromsmithy/protocols/ExampleNode.scala b/modules/openapi/src/software/amazon/smithy/openapi/fromsmithy/protocols/ExampleNode.scala
@@ -59,14 +59,19 @@ object ExampleNode {
       example: Example,
       memberName: String
   ): ExampleNode =
-    ExampleNode(example, example.getOutput.getMember(memberName).asScala)
+    ExampleNode(
+      example,
+      example.getOutput.asScala.flatMap(_.getMember(memberName).asScala)
+    )
 
   private[protocols] def forOutputMembers(
       example: Example,
       memberNames: List[String]
   ): ExampleNode = {
     val members: List[(String, Node)] = memberNames.flatMap(name =>
-      example.getOutput.getMember(name).asScala.map(name -> _)
+      example.getOutput.asScala.flatMap(
+        _.getMember(name).asScala.map(name -> _)
+      )
     )
     ExampleNode(example, members)
   }

diff --git a/modules/protocol-tests/resources/META-INF/smithy/test-config.json b/modules/protocol-tests/resources/META-INF/smithy/test-config.json
@@ -325,21 +325,11 @@
         "appliesTo": "client",
         "description": "request"
       },
-      {
-        "id": "RestJsonJsonBlobs",
-        "appliesTo": "client",
-        "description": "request"
-      },
       {
         "id": "DocumentInputWithString",
         "appliesTo": "client",
         "description": "request"
       },
-      {
-        "id": "RestJsonJsonBlobs",
-        "appliesTo": "client",
-        "description": "response"
-      },
       {
         "id": "DocumentInputWithNumber",
         "appliesTo": "client",
@@ -515,11 +505,6 @@
         "appliesTo": "client",
         "description": "request"
       },
-      {
-        "id": "RestJsonHttpWithHeadersButNoPayload",
-        "appliesTo": "client",
-        "description": "request"
-      },
       {
         "id": "RestJsonTestBodyStructure",
         "appliesTo": "client",
@@ -535,11 +520,6 @@
         "appliesTo": "client",
         "description": "request"
       },
-      {
-        "id": "RestJsonHttpWithEmptyStructurePayload",
-        "appliesTo": "client",
-        "description": "request"
-      },
       {
         "id": "RestJsonHttpWithEmptyBody",
         "appliesTo": "client",
@@ -735,11 +715,6 @@
         "appliesTo": "server",
         "description": "response"
       },
-      {
-        "id": "RestJsonHttpPrefixHeadersAreNotPresent",
-        "appliesTo": "server",
-        "description": "request"
-      },
       {
         "id": "RestJsonHttpPrefixHeadersArePresent",
         "appliesTo": "server",
@@ -900,11 +875,6 @@
         "appliesTo": "server",
         "description": "request"
       },
-      {
-        "id": "RestJsonJsonBlobs",
-        "appliesTo": "server",
-        "description": "response"
-      },
       {
         "id": "RestJsonJsonMaps",
         "appliesTo": "server",
@@ -965,11 +935,6 @@
         "appliesTo": "server",
         "description": "request"
       },
-      {
-        "id": "RestJsonJsonBlobs",
-        "appliesTo": "server",
-        "description": "request"
-      },
       {
         "id": "DocumentTypeInputWithObject",
         "appliesTo": "server",
@@ -1130,21 +1095,11 @@
         "appliesTo": "server",
         "description": "request"
       },
-      {
-        "id": "RestJsonHttpWithHeadersButNoPayload",
-        "appliesTo": "server",
-        "description": "request"
-      },
       {
         "id": "RestJsonTestPayloadStructure",
         "appliesTo": "server",
         "description": "request"
       },
-      {
-        "id": "RestJsonHttpWithEmptyStructurePayload",
-        "appliesTo": "server",
-        "description": "request"
-      },
       {
         "id": "RestJsonHttpWithEmptyBody",
         "appliesTo": "server",
@@ -1216,30 +1171,111 @@
         "description": "request"
       },
       {
-        "id": "RestJsonHttpPrefixHeadersAreNotPresent",
+        "id": "RestJsonHttpChecksumRequired",
         "appliesTo": "server",
         "description": "request"
       },
       {
-        "id": "RestJsonHttpChecksumRequired",
+        "id": "RestJsonSerializeRenamedStructureUnionValue",
         "appliesTo": "server",
         "description": "request"
       },
       {
-        "id": "RestJsonSerializeRenamedStructureUnionValue",
+        "id": "RestJsonStreamingTraitsWithNoBlobBody",
         "appliesTo": "server",
+        "description": "response"
+      },
+      {
+        "id": "RestJsonSerializeBlobUnionValue",
+        "appliesTo": "client",
         "description": "request"
       },
       {
-        "id": "RestJsonStreamingTraitsWithNoBlobBody",
+        "id": "JsonUnions",
+        "appliesTo": "client",
+        "description": "request"
+      },
+      {
+        "id": "JsonUnions",
+        "appliesTo": "client",
+        "description": "response"
+      },
+      {
+        "id": "RestJsonGreetingWithErrors",
         "appliesTo": "server",
         "description": "response"
       },
       {
-        "id": "RestJsonStreamingTraitsWithNoBlobBody",
+        "id": "RestJsonSerializeTimestampUnionValue",
+        "appliesTo": "server",
+        "description": "request"
+      },
+      {
+        "id": "RestJsonDeserializeBlobUnionValue",
+        "appliesTo": "server",
+        "description": "response"
+      },
+      {
+        "id": "RestJsonDeserializeTimestampUnionValue",
+        "appliesTo": "server",
+        "description": "response"
+      },
+      {
+        "id": "RestJsonJsonTimestamps",
         "appliesTo": "server",
+        "description": "response"
+      },
+      {
+        "id": "RestJsonJsonTimestamps",
+        "appliesTo": "server",
+        "description": "request"
+      },
+      {
+        "id": "RestJsonDeserializeTimestampUnionValue",
+        "appliesTo": "client",
         "description": "request"
+      },
+      {
+        "id": "RestJsonDeserializeTimestampUnionValue",
+        "appliesTo": "client",
+        "description": "response"
+      },
+      {
+        "id": "RestJsonJsonTimestamps",
+        "appliesTo": "client",
+        "description": "request"
+      },
+      {
+        "id": "RestJsonJsonTimestamps",
+        "appliesTo": "client",
+        "description": "response"
+      },
+      {
+        "id": "StringPayloadRequest",
+        "appliesTo": "client",
+        "description": "request"
+      },
+      {
+        "id": "EnumPayloadRequest",
+        "appliesTo": "client",
+        "description": "request"
+      },
+      {
+        "id": "RestJsonSerializeTimestampUnionValue",
+        "appliesTo": "client",
+        "description": "request"
+      },
+      {
+        "id": "RestJsonDateTimeWithFractionalSeconds",
+        "appliesTo": "client",
+        "description": "response"
+      },
+      {
+        "id": "RestJsonHttpDateWithFractionalSeconds",
+        "appliesTo": "client",
+        "description": "response"
       }
     ]
   }
-}
+}
+