Add an accept header in JSON request to help 3rd party services like localstack (#1721)

Author: jderusse

src/Generator/InputGenerator.php

@@ -389,9 +389,9 @@ private function inputClassRequestGetters(StructureShape $inputShape, ClassBuild
         $serializer = $this->serializer->get($operation->getService());
 
         if ((null !== $payloadProperty = $inputShape->getPayload()) && $inputShape->getMember($payloadProperty)->isStreaming()) {
-            $body['header'] = '$headers = [];' . "\n";
+            $body['header'] = '$headers = ' . $serializer->getHeaders($operation, false) . ';' . "\n";
         } else {
-            $body['header'] = '$headers = ' . $serializer->getHeaders($operation) . ';' . "\n";
+            $body['header'] = '$headers = ' . $serializer->getHeaders($operation, true) . ';' . "\n";
         }
 
         $body['querystring'] = '$query = [];' . "\n";

src/Generator/RequestSerializer/JsonRpcSerializer.php

@@ -15,18 +15,19 @@
  */
 class JsonRpcSerializer extends RestJsonSerializer
 {
-    public function getHeaders(Operation $operation): string
+    public function getHeaders(Operation $operation, bool $withPayload): string
     {
-        return strtr(<<<PHP
-[
-    'Content-Type' => 'application/x-amz-json-VERSION',
-    'X-Amz-Target' => 'TARGET',
-];
+        if (!$withPayload) {
+            return "['Accept' => 'application/json']";
+        }
 
-PHP
-            , [
-                'VERSION' => number_format($operation->getService()->getJsonVersion(), 1),
-                'TARGET' => sprintf('%s.%s', $operation->getService()->getTargetPrefix(), $operation->getName()),
-            ]);
+        return strtr("[
+            'Content-Type' => 'application/x-amz-json-VERSION',
+            'X-Amz-Target' => 'TARGET',
+            'Accept' => 'application/json',
+        ]", [
+            'VERSION' => number_format($operation->getService()->getJsonVersion(), 1),
+            'TARGET' => sprintf('%s.%s', $operation->getService()->getTargetPrefix(), $operation->getName()),
+        ]);
     }
 }

src/Generator/RequestSerializer/QuerySerializer.php

@@ -43,9 +43,13 @@ public function __construct(NamespaceRegistry $namespaceRegistry, RequirementsRe
         $this->requirementsRegistry = $requirementsRegistry;
     }
 
-    public function getHeaders(Operation $operation): string
+    public function getHeaders(Operation $operation, bool $withPayload): string
     {
-        return '["content-type" => "application/x-www-form-urlencoded"]';
+        if (!$withPayload) {
+            return '[]';
+        }
+
+        return "['content-type' => 'application/x-www-form-urlencoded']";
     }
 
     public function generateRequestBody(Operation $operation, StructureShape $shape): SerializerResultBody

src/Generator/RequestSerializer/RestJsonSerializer.php

@@ -43,9 +43,16 @@ public function __construct(NamespaceRegistry $namespaceRegistry, RequirementsRe
         $this->requirementsRegistry = $requirementsRegistry;
     }
 
-    public function getHeaders(Operation $operation): string
+    public function getHeaders(Operation $operation, bool $withPayload): string
     {
-        return '["content-type" => "application/json"]';
+        if (!$withPayload) {
+            return "['Accept' => 'application/json']";
+        }
+
+        return "[
+            'Content-Type' => 'application/json',
+            'Accept' => 'application/json',
+        ]";
     }
 
     public function generateRequestBody(Operation $operation, StructureShape $shape): SerializerResultBody

src/Generator/RequestSerializer/RestXmlSerializer.php

@@ -40,9 +40,13 @@ public function __construct(NamespaceRegistry $namespaceRegistry, RequirementsRe
         $this->requirementsRegistry = $requirementsRegistry;
     }
 
-    public function getHeaders(Operation $operation): string
+    public function getHeaders(Operation $operation, bool $withPayload): string
     {
-        return '["content-type" => "application/xml"]';
+        if (!$withPayload) {
+            return '[]';
+        }
+
+        return "['content-type' => 'application/xml']";
     }
 
     public function generateRequestBody(Operation $operation, StructureShape $shape): SerializerResultBody

src/Generator/RequestSerializer/Serializer.php

@@ -27,5 +27,5 @@ public function generateRequestBody(Operation $operation, StructureShape $shape)
      */
     public function generateRequestBuilder(StructureShape $shape, bool $needsChecks): SerializerResultBuilder;
 
-    public function getHeaders(Operation $operation): string;
+    public function getHeaders(Operation $operation, bool $withPayload): string;
 }