fix: fix incorrect x-amz-content-sha256 header (#1326)

* fix: fix incorrect x-amz-content-sha256 header * chore: codegen fixing incorrect x-amz-sha256 * test(client-lex-runtime-service): add functional test * test(client-mediastore-data): add functional test
aws · Jul 6, 2020 · 68f9315 · 68f9315
1 parent e75fe71
commit 68f9315
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 10 deletions.
diff --git a/clients/client-lex-runtime-service/LexRuntimeService.spec.ts b/clients/client-lex-runtime-service/LexRuntimeService.spec.ts
@@ -0,0 +1,34 @@
+/// <reference types="mocha" />
+import { expect } from "chai";
+import { LexRuntimeService } from "./LexRuntimeService";
+import { SerializeMiddleware } from "@aws-sdk/types";
+import { HttpRequest } from "@aws-sdk/protocol-http";
+
+describe("@aws-sdk/client-lex-runtime-service", () => {
+  describe("PostContent", () => {
+    it("should contain correct x-amz-content-sha256 header", async () => {
+      const validator: SerializeMiddleware<any, any> = next => args => {
+        // middleware intercept the request and return it early
+        const request = args.request as HttpRequest;
+        expect(request.headers).to.have.property(
+          "x-amz-content-sha256",
+          "UNSIGNED-PAYLOAD"
+        );
+        return Promise.resolve({ output: {} as any, response: {} as any });
+      };
+      const client = new LexRuntimeService({});
+      client.middlewareStack.add(validator, {
+        step: "serialize",
+        name: "endpointValidator",
+        priority: "low"
+      });
+      return await client.postContent({
+        botAlias: "alias",
+        botName: "bot",
+        userId: "user",
+        contentType: "text/plain; charset=utf-8",
+        inputStream: "hello world!"
+      });
+    });
+  });
+});
diff --git a/clients/client-lex-runtime-service/package.json b/clients/client-lex-runtime-service/package.json
@@ -12,7 +12,8 @@
     "remove-documentation": "rimraf ./docs",
     "remove-js": "rimraf *.js && rimraf ./commands/*.js && rimraf ./models/*.js && rimraf ./protocols/*.js",
     "remove-maps": "rimraf *.js.map && rimraf ./commands/*.js.map && rimraf ./models/*.js.map && rimraf ./protocols/*.js.map",
-    "test": "exit 0",
+    "test:unit": "mocha **/cjs/**/*.spec.js",
+    "test": "yarn test:unit",
     "build:es": "tsc -p tsconfig.es.json",
     "build": "yarn pretest && yarn build:es"
   },
@@ -60,8 +61,9 @@
     "tslib": "^1.8.0"
   },
   "devDependencies": {
+    "@types/chai": "^4.2.11",
+    "@types/mocha": "^7.0.2",
     "@types/node": "^12.7.5",
-    "jest": "^25.1.0",
     "rimraf": "^3.0.0",
     "tslib": "^1.8.0",
     "typedoc": "^0.15.0",

diff --git a/clients/client-lex-runtime-service/protocols/Aws_restJson1.ts b/clients/client-lex-runtime-service/protocols/Aws_restJson1.ts
@@ -179,7 +179,7 @@ export const serializeAws_restJson1PostContentCommand = async (
 ): Promise<__HttpRequest> => {
   const headers: any = {
     "Content-Type": "application/octet-stream",
-    "x-amz-content-sha256": "UNSIGNED_PAYLOAD",
+    "x-amz-content-sha256": "UNSIGNED-PAYLOAD",
     ...(isSerializableHeaderValue(input.accept) && { Accept: input.accept! }),
     ...(isSerializableHeaderValue(input.contentType) && {
       "Content-Type": input.contentType!

diff --git a/clients/client-lex-runtime-service/tsconfig.json b/clients/client-lex-runtime-service/tsconfig.json
@@ -12,7 +12,8 @@
     "incremental": true,
     "resolveJsonModule": true,
     "declarationDir": "./types",
-    "outDir": "dist/cjs"
+    "outDir": "dist/cjs",
+    "types": ["mocha", "node"]
   },
   "typedocOptions": {
     "exclude": "**/node_modules/**",

diff --git a/clients/client-mediastore-data/MidiaStoreData.spec.ts b/clients/client-mediastore-data/MidiaStoreData.spec.ts
@@ -0,0 +1,31 @@
+/// <reference types="mocha" />
+import { expect } from "chai";
+import { MediaStoreData } from "./MediaStoreData";
+import { SerializeMiddleware } from "@aws-sdk/types";
+import { HttpRequest } from "@aws-sdk/protocol-http";
+
+describe("@aws-sdk/client-mediastore-data", () => {
+  describe("PutObject", () => {
+    it("should contain correct x-amz-content-sha256 header", async () => {
+      const validator: SerializeMiddleware<any, any> = next => args => {
+        // middleware intercept the request and return it early
+        const request = args.request as HttpRequest;
+        expect(request.headers).to.have.property(
+          "x-amz-content-sha256",
+          "UNSIGNED-PAYLOAD"
+        );
+        return Promise.resolve({ output: {} as any, response: {} as any });
+      };
+      const client = new MediaStoreData({});
+      client.middlewareStack.add(validator, {
+        step: "serialize",
+        name: "endpointValidator",
+        priority: "low"
+      });
+      return await client.putObject({
+        Path: "foo.avi",
+        Body: "binary body"
+      });
+    });
+  });
+});
diff --git a/clients/client-mediastore-data/package.json b/clients/client-mediastore-data/package.json
@@ -12,7 +12,8 @@
     "remove-documentation": "rimraf ./docs",
     "remove-js": "rimraf *.js && rimraf ./commands/*.js && rimraf ./models/*.js && rimraf ./protocols/*.js",
     "remove-maps": "rimraf *.js.map && rimraf ./commands/*.js.map && rimraf ./models/*.js.map && rimraf ./protocols/*.js.map",
-    "test": "exit 0",
+    "test:unit": "mocha **/cjs/**/*.spec.js",
+    "test": "yarn test:unit",
     "build:es": "tsc -p tsconfig.es.json",
     "build": "yarn pretest && yarn build:es"
   },
@@ -60,8 +61,9 @@
     "tslib": "^1.8.0"
   },
   "devDependencies": {
+    "@types/chai": "^4.2.11",
+    "@types/mocha": "^7.0.2",
     "@types/node": "^12.7.5",
-    "jest": "^25.1.0",
     "rimraf": "^3.0.0",
     "tslib": "^1.8.0",
     "typedoc": "^0.15.0",

diff --git a/clients/client-mediastore-data/protocols/Aws_restJson1.ts b/clients/client-mediastore-data/protocols/Aws_restJson1.ts
@@ -184,7 +184,7 @@ export const serializeAws_restJson1PutObjectCommand = async (
 ): Promise<__HttpRequest> => {
   const headers: any = {
     "Content-Type": "application/octet-stream",
-    "x-amz-content-sha256": "UNSIGNED_PAYLOAD",
+    "x-amz-content-sha256": "UNSIGNED-PAYLOAD",
     ...(isSerializableHeaderValue(input.CacheControl) && {
       "Cache-Control": input.CacheControl!
     }),

diff --git a/clients/client-mediastore-data/tsconfig.json b/clients/client-mediastore-data/tsconfig.json
@@ -12,7 +12,8 @@
     "incremental": true,
     "resolveJsonModule": true,
     "declarationDir": "./types",
-    "outDir": "dist/cjs"
+    "outDir": "dist/cjs",
+    "types": ["mocha"]
   },
   "typedocOptions": {
     "exclude": "**/node_modules/**",

diff --git a/...codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java b/...codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
@@ -45,7 +45,7 @@ final class AwsProtocolUtils {
     private AwsProtocolUtils() {}
 
     /**
-     * Writes an {@code 'x-amz-content-sha256' = 'UNSIGNED_PAYLOAD'} header for an
+     * Writes an {@code 'x-amz-content-sha256' = 'UNSIGNED-PAYLOAD'} header for an
      * {@code @aws.api#unsignedPayload} trait that specifies the {@code "aws.v4"} auth scheme.
      *
      * @see <a href=https://awslabs.github.io/smithy/spec/aws-core.html#aws-api-unsignedpayload-trait>@aws.api#unsignedPayload trait</a>
@@ -58,7 +58,7 @@ static void generateUnsignedPayloadSigV4Header(GenerationContext context, Operat
 
         operation.getTrait(UnsignedPayloadTrait.class)
                 .ifPresent(trait -> {
-                    writer.write("'x-amz-content-sha256': 'UNSIGNED_PAYLOAD',");
+                    writer.write("'x-amz-content-sha256': 'UNSIGNED-PAYLOAD',");
                 });
     }