Allow accept to be the default document content type

smithy-lang · Aug 11, 2021 · 9cfa328 · 9cfa328
1 parent 768d9dd
commit 9cfa328
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 30 deletions.
diff --git a/smithy-aws-protocol-tests/model/restJson1/empty-input-output.smithy b/smithy-aws-protocol-tests/model/restJson1/empty-input-output.smithy
@@ -28,6 +28,20 @@ apply NoInputAndNoOutput @httpRequestTests([
         method: "POST",
         uri: "/NoInputAndNoOutput",
         body: ""
+    },
+    {
+        id: "RestJsonNoInputAllowsAccept",
+        documentation: """
+                Servers should allow the accept header to be set to the
+                default content-type.""",
+        protocol: restJson1,
+        method: "POST",
+        uri: "/NoInputAndNoOutput",
+        body: "",
+        headers: {
+            "Accept": "application/json"
+        },
+       appliesTo: "server",
     }
 ])
 
@@ -63,7 +77,10 @@ apply NoInputAndOutput @httpRequestTests([
         protocol: restJson1,
         method: "POST",
         uri: "/NoInputAndOutputOutput",
-        body: ""
+        body: "",
+        headers: {
+            "Accept": "application/json"
+        },
     }
 ])
 

diff --git a/smithy-aws-protocol-tests/model/restJson1/http-payload.smithy b/smithy-aws-protocol-tests/model/restJson1/http-payload.smithy
@@ -87,7 +87,45 @@ apply HttpPayloadTraits @httpResponseTests([
         params: {
             foo: "Foo"
         }
-    }
+    },
+    {
+        id: "RestJsonHttpPayloadTraitsWithBlobAcceptsAllContentTypes",
+        documentation: """
+            Servers must accept any content type for blob inputs
+            without the media type trait.""",
+        protocol: restJson1,
+        code: 200,
+        body: "This is definitely a jpeg",
+        bodyMediaType: "application/octet-stream",
+        headers: {
+            "X-Foo": "Foo",
+            "Content-Type": "image/jpeg"
+        },
+        params: {
+            foo: "Foo",
+            blob: "This is definitely a jpeg"
+        },
+        appliesTo: "server",
+    },
+    {
+        id: "RestJsonHttpPayloadTraitsWithBlobAcceptsAllAccepts",
+        documentation: """
+            Servers must accept any accept header for blob inputs
+            without the media type trait.""",
+        protocol: restJson1,
+        code: 200,
+        body: "This is definitely a jpeg",
+        bodyMediaType: "application/octet-stream",
+        headers: {
+            "X-Foo": "Foo",
+            "Accept": "image/jpeg"
+        },
+        params: {
+            foo: "Foo",
+            blob: "This is definitely a jpeg"
+        },
+        appliesTo: "server",
+    },
 ])
 
 structure HttpPayloadTraitsInputOutput {

diff --git a/smithy-aws-protocol-tests/model/restJson1/main.smithy b/smithy-aws-protocol-tests/model/restJson1/main.smithy
@@ -123,7 +123,6 @@ service RestJson {
         MalformedContentTypeWithBody,
         MalformedContentTypeWithPayload,
         MalformedContentTypeWithGenericString,
-        MalformedAcceptWithoutBody,
         MalformedAcceptWithBody,
         MalformedAcceptWithPayload,
         MalformedAcceptWithGenericString,

diff --git a/smithy-aws-protocol-tests/model/restJson1/malformedRequests/malformed-accept.smithy b/smithy-aws-protocol-tests/model/restJson1/malformedRequests/malformed-accept.smithy
@@ -7,30 +7,6 @@ use smithy.test#httpMalformedRequestTests
 use aws.protocoltests.shared#GreetingStruct
 use aws.protocoltests.shared#JpegBlob
 
-apply MalformedAcceptWithoutBody @httpMalformedRequestTests([
-    {
-        id: "RestJsonWithoutBodyExpectsEmptyAccept",
-        documentation: """
-        When there is no modeled output, accept must not be set.""",
-        protocol: restJson1,
-        request: {
-            method: "POST",
-            uri: "/MalformedAcceptWithoutBody",
-            headers: {
-                // this should be omitted
-                "accept": "application/json"
-            }
-        },
-        response: {
-            code: 406,
-            headers: {
-                "x-amzn-errortype": "NotAcceptableException"
-            }
-        },
-        tags: [ "accept" ]
-    }
-])
-
 apply MalformedAcceptWithBody @httpMalformedRequestTests([
     {
         id: "RestJsonWithBodyExpectsApplicationJsonAccept",
@@ -104,9 +80,6 @@ apply MalformedAcceptWithGenericString @httpMalformedRequestTests([
     }
 ])
 
-@http(method: "POST", uri: "/MalformedAcceptWithoutBody")
-operation MalformedAcceptWithoutBody {}
-
 @http(method: "POST", uri: "/MalformedAcceptWithBody")
 operation MalformedAcceptWithBody {
     output: GreetingStruct