From bd8d9700ffdc629aa998879d7ae3104b7bcc5e9d Mon Sep 17 00:00:00 2001 From: Chase Coalwell Date: Wed, 11 Dec 2019 14:37:34 -0800 Subject: [PATCH] feat: shared Glacier plugin with accountIdDefaultMiddleware (#548) * feat: add and apply accountIdDefaultMiddleware * feat: remove middleware-input-default * feat: shared plugin * fix: remove second glacier plugin --- .../typescript/codegen/AddBuiltinPlugins.java | 4 +- .../aws/typescript/codegen/AwsDependency.java | 2 +- packages/middleware-input-default/.gitignore | 8 - packages/middleware-input-default/.npmignore | 13 -- .../middleware-input-default/CHANGELOG.md | 144 ------------- packages/middleware-input-default/LICENSE | 201 ------------------ packages/middleware-input-default/README.md | 4 - .../middleware-input-default/jest.config.js | 5 - .../middleware-input-default/package.json | 25 --- .../src/index.spec.ts | 75 ------- .../middleware-input-default/src/index.ts | 26 --- .../middleware-input-default/tsconfig.json | 22 -- .../tsconfig.test.json | 11 - .../src/account-id-default.spec.ts | 39 ++++ .../src/account-id-default.ts | 29 +++ .../src/add-glacier-api-version.spec.ts | 9 +- .../src/add-glacier-api-version.ts | 25 +-- .../src/configurations.ts | 42 ++++ .../middleware-sdk-glacier/src/index.spec.ts | 19 +- packages/middleware-sdk-glacier/src/index.ts | 2 + 20 files changed, 146 insertions(+), 559 deletions(-) delete mode 100644 packages/middleware-input-default/.gitignore delete mode 100644 packages/middleware-input-default/.npmignore delete mode 100644 packages/middleware-input-default/CHANGELOG.md delete mode 100644 packages/middleware-input-default/LICENSE delete mode 100644 packages/middleware-input-default/README.md delete mode 100644 packages/middleware-input-default/jest.config.js delete mode 100644 packages/middleware-input-default/package.json delete mode 100644 packages/middleware-input-default/src/index.spec.ts delete mode 100644 packages/middleware-input-default/src/index.ts delete mode 100644 packages/middleware-input-default/tsconfig.json delete mode 100644 packages/middleware-input-default/tsconfig.test.json create mode 100644 packages/middleware-sdk-glacier/src/account-id-default.spec.ts create mode 100644 packages/middleware-sdk-glacier/src/account-id-default.ts create mode 100644 packages/middleware-sdk-glacier/src/configurations.ts diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java index 5bf4fcba803a..bcc9c9abe9c0 100644 --- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java +++ b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java @@ -89,8 +89,8 @@ public List getClientPlugins() { .servicePredicate((m, s) -> testServiceId(s, "S3")) .build(), RuntimeClientPlugin.builder() - .withConventions(AwsDependency.ADD_GLACIER_API_VERSION.dependency, - "AddGlacierApiVersion", HAS_MIDDLEWARE) + .withConventions(AwsDependency.GLACIER_MIDDLEWARE.dependency, + "Glacier", HAS_MIDDLEWARE) .servicePredicate((m, s) -> testServiceId(s, "Glacier")) .build(), RuntimeClientPlugin.builder() diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java index e57c06e5eb20..d3e2481c67a3 100644 --- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java +++ b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java @@ -34,7 +34,7 @@ public enum AwsDependency implements SymbolDependencyContainer { ACCEPTS_HEADER(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-api-gateway", "^0.1.0-preview.5"), VALIDATE_BUCKET_NAME(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-s3", "^0.1.0-preview.2"), ADD_EXPECT_CONTINUE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-expect-continue", "^0.1.0-preview.5"), - ADD_GLACIER_API_VERSION(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-glacier", "^0.1.0-preview.7"), + GLACIER_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-glacier", "^0.1.0-preview.7"), SSEC_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-ssec", "^0.1.0-preview.5"), LOCATION_CONSTRAINT(NORMAL_DEPENDENCY, "@aws-sdk/middleware-location-constraint", "^0.1.0-preview.5"), MD5_BROWSER(NORMAL_DEPENDENCY, "@aws-sdk/md5-js", "^0.1.0-preview.8"), diff --git a/packages/middleware-input-default/.gitignore b/packages/middleware-input-default/.gitignore deleted file mode 100644 index 3d1714c9806e..000000000000 --- a/packages/middleware-input-default/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/node_modules/ -/build/ -/coverage/ -/docs/ -*.tsbuildinfo -*.tgz -*.log -package-lock.json diff --git a/packages/middleware-input-default/.npmignore b/packages/middleware-input-default/.npmignore deleted file mode 100644 index 4b9fe3abf33a..000000000000 --- a/packages/middleware-input-default/.npmignore +++ /dev/null @@ -1,13 +0,0 @@ -/src/ -/coverage/ -/docs/ -tsconfig.test.json -*.tsbuildinfo - -*.spec.js -*.spec.d.ts -*.spec.js.map - -*.fixture.js -*.fixture.d.ts -*.fixture.js.map diff --git a/packages/middleware-input-default/CHANGELOG.md b/packages/middleware-input-default/CHANGELOG.md deleted file mode 100644 index 3fc66c96486f..000000000000 --- a/packages/middleware-input-default/CHANGELOG.md +++ /dev/null @@ -1,144 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.1.0-preview.8](https://github.com/aws/aws-sdk-js-v3/compare/@aws-sdk/middleware-input-default@0.1.0-preview.2...@aws-sdk/middleware-input-default@0.1.0-preview.8) (2019-11-19) - - - -# 0.6.0 (2019-10-30) - - - -# 0.3.0 (2019-09-09) - - -### Features - -* commit all clients ([#324](https://github.com/aws/aws-sdk-js-v3/issues/324)) ([cb268ed](https://github.com/aws/aws-sdk-js-v3/commit/cb268ed)) - - - -# 0.2.0 (2019-07-12) - - -### Features - -* add npm badges for individual packages ([#251](https://github.com/aws/aws-sdk-js-v3/issues/251)) ([8adc10c](https://github.com/aws/aws-sdk-js-v3/commit/8adc10c)) -* update jest v20 to v24 ([#243](https://github.com/aws/aws-sdk-js-v3/issues/243)) ([1e156ab](https://github.com/aws/aws-sdk-js-v3/commit/1e156ab)) - - - -# 0.1.0 (2019-04-19) - - - - - -# [0.1.0-preview.7](https://github.com/aws/aws-sdk-js-v3/compare/@aws-sdk/middleware-input-default@0.1.0-preview.2...@aws-sdk/middleware-input-default@0.1.0-preview.7) (2019-10-30) - - - -# 0.3.0 (2019-09-09) - - -### Features - -* commit all clients ([#324](https://github.com/aws/aws-sdk-js-v3/issues/324)) ([cb268ed](https://github.com/aws/aws-sdk-js-v3/commit/cb268ed)) - - - -# 0.2.0 (2019-07-12) - - -### Features - -* add npm badges for individual packages ([#251](https://github.com/aws/aws-sdk-js-v3/issues/251)) ([8adc10c](https://github.com/aws/aws-sdk-js-v3/commit/8adc10c)) -* update jest v20 to v24 ([#243](https://github.com/aws/aws-sdk-js-v3/issues/243)) ([1e156ab](https://github.com/aws/aws-sdk-js-v3/commit/1e156ab)) - - - -# 0.1.0 (2019-04-19) - - - - - -# [0.1.0-preview.6](https://github.com/aws/aws-sdk-js-v3/compare/@aws-sdk/middleware-input-default@0.1.0-preview.2...@aws-sdk/middleware-input-default@0.1.0-preview.6) (2019-10-29) - - - -# 0.3.0 (2019-09-09) - - -### Features - -* commit all clients ([#324](https://github.com/aws/aws-sdk-js-v3/issues/324)) ([cb268ed](https://github.com/aws/aws-sdk-js-v3/commit/cb268ed)) - - - -# 0.2.0 (2019-07-12) - - -### Features - -* add npm badges for individual packages ([#251](https://github.com/aws/aws-sdk-js-v3/issues/251)) ([8adc10c](https://github.com/aws/aws-sdk-js-v3/commit/8adc10c)) -* update jest v20 to v24 ([#243](https://github.com/aws/aws-sdk-js-v3/issues/243)) ([1e156ab](https://github.com/aws/aws-sdk-js-v3/commit/1e156ab)) - - - -# 0.1.0 (2019-04-19) - - - - - -# [0.1.0-preview.5](https://github.com/aws/aws-sdk-js-v3/compare/@aws-sdk/middleware-input-default@0.1.0-preview.2...@aws-sdk/middleware-input-default@0.1.0-preview.5) (2019-09-09) - - -### Features - -* commit all clients ([#324](https://github.com/aws/aws-sdk-js-v3/issues/324)) ([cb268ed](https://github.com/aws/aws-sdk-js-v3/commit/cb268ed)) - - - -# 0.2.0 (2019-07-12) - - -### Features - -* add npm badges for individual packages ([#251](https://github.com/aws/aws-sdk-js-v3/issues/251)) ([8adc10c](https://github.com/aws/aws-sdk-js-v3/commit/8adc10c)) -* update jest v20 to v24 ([#243](https://github.com/aws/aws-sdk-js-v3/issues/243)) ([1e156ab](https://github.com/aws/aws-sdk-js-v3/commit/1e156ab)) - - - -# 0.1.0 (2019-04-19) - - - - - -# [0.1.0-preview.4](https://github.com/aws/aws-sdk-js-v3/compare/@aws-sdk/middleware-input-default@0.1.0-preview.2...@aws-sdk/middleware-input-default@0.1.0-preview.4) (2019-07-12) - - -### Features - -* add npm badges for individual packages ([#251](https://github.com/aws/aws-sdk-js-v3/issues/251)) ([8adc10c](https://github.com/aws/aws-sdk-js-v3/commit/8adc10c)) -* update jest v20 to v24 ([#243](https://github.com/aws/aws-sdk-js-v3/issues/243)) ([1e156ab](https://github.com/aws/aws-sdk-js-v3/commit/1e156ab)) - - - -# 0.1.0 (2019-04-19) - - - - - -# [0.1.0-preview.3](https://github.com/aws/aws-sdk-js-v3/compare/@aws-sdk/middleware-input-default@0.1.0-preview.2...@aws-sdk/middleware-input-default@0.1.0-preview.3) (2019-04-19) - -**Note:** Version bump only for package @aws-sdk/middleware-input-default - -# [0.1.0-preview.2](https://github.com/aws/aws-sdk-js-v3/compare/@aws-sdk/middleware-input-default@0.1.0-preview.1...@aws-sdk/middleware-input-default@0.1.0-preview.2) (2019-03-27) - -**Note:** Version bump only for package @aws-sdk/middleware-input-default diff --git a/packages/middleware-input-default/LICENSE b/packages/middleware-input-default/LICENSE deleted file mode 100644 index 0861e4dcbce9..000000000000 --- a/packages/middleware-input-default/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/packages/middleware-input-default/README.md b/packages/middleware-input-default/README.md deleted file mode 100644 index 43f694f8471a..000000000000 --- a/packages/middleware-input-default/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# @aws-sdk/middleware-input-default - -[![NPM version](https://img.shields.io/npm/v/@aws-sdk/middleware-input-default/preview.svg)](https://www.npmjs.com/package/@aws-sdk/middleware-input-default) -[![NPM downloads](https://img.shields.io/npm/dm/@aws-sdk/middleware-input-default.svg)](https://www.npmjs.com/package/@aws-sdk/middleware-input-default) diff --git a/packages/middleware-input-default/jest.config.js b/packages/middleware-input-default/jest.config.js deleted file mode 100644 index 498ea8304467..000000000000 --- a/packages/middleware-input-default/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const base = require("../../jest.config.base.js"); - -module.exports = { - ...base -}; diff --git a/packages/middleware-input-default/package.json b/packages/middleware-input-default/package.json deleted file mode 100644 index abd42c60e5ac..000000000000 --- a/packages/middleware-input-default/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "@aws-sdk/middleware-input-default", - "version": "0.1.0-preview.8", - "scripts": { - "prepublishOnly": "tsc", - "pretest": "tsc -p tsconfig.test.json", - "test": "jest" - }, - "main": "./build/index.js", - "types": "./build/index.d.ts", - "author": { - "name": "AWS SDK for JavaScript Team", - "url": "https://aws.amazon.com/javascript/" - }, - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "^0.1.0-preview.7", - "tslib": "^1.8.0" - }, - "devDependencies": { - "@types/jest": "^24.0.12", - "jest": "^24.7.1", - "typescript": "~3.4.0" - } -} diff --git a/packages/middleware-input-default/src/index.spec.ts b/packages/middleware-input-default/src/index.spec.ts deleted file mode 100644 index fec7f60194a2..000000000000 --- a/packages/middleware-input-default/src/index.spec.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { inputDefault } from "./index"; - -interface MockInput { - foo?: string; - bar?: "bizz" | "buzz"; - x: number; -} - -describe("inputDefault", () => { - const mockNextHandler = jest.fn(); - - beforeEach(() => { - jest.clearAllMocks(); - }); - - it("should set default input fields when not provided", async () => { - const middleware = inputDefault({ - foo: "test" - }); - const handler = middleware(mockNextHandler, {} as any); - - await handler({ - input: { - x: 3.14 - } - }); - - // ensure the next handler was called - expect(mockNextHandler.mock.calls.length).toBe(1); - const { input } = mockNextHandler.mock.calls[0][0]; - expect(input["foo"]).toBe("test"); - expect(input["x"]).toBe(3.14); - }); - - it("should not override user-supplied parameters", async () => { - const middleware = inputDefault({ - foo: "test" - }); - const handler = middleware(mockNextHandler, {} as any); - - await handler({ - input: { - foo: "fantastic", - x: 3.14 - } - }); - - // ensure the next handler was called - expect(mockNextHandler.mock.calls.length).toBe(1); - const { input } = mockNextHandler.mock.calls[0][0]; - expect(input["foo"]).toBe("fantastic"); - expect(input["x"]).toBe(3.14); - }); - - it("should not mutate user input", async () => { - const middleware = inputDefault({ - foo: "test" - }); - const handler = middleware(mockNextHandler, {} as any); - const userInput: MockInput = { - x: 4 - }; - await handler({ - input: userInput - }); - - // ensure the next handler was called - expect(mockNextHandler.mock.calls.length).toBe(1); - const { input } = mockNextHandler.mock.calls[0][0]; - expect(input["foo"]).toBe("test"); - expect(input["x"]).toBe(4); - expect(userInput["x"]).toBe(4); - expect(Object.keys(userInput).length).toBe(1); - }); -}); diff --git a/packages/middleware-input-default/src/index.ts b/packages/middleware-input-default/src/index.ts deleted file mode 100644 index d21652bc594b..000000000000 --- a/packages/middleware-input-default/src/index.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { Handler, HandlerArguments, Middleware } from "@aws-sdk/types"; - -export type InputDefaultArgs = { - [field in keyof Input]?: Input[field]; -}; - -export function inputDefault( - inputBag: InputDefaultArgs -): Middleware { - return (next: Handler) => { - return (args: HandlerArguments) => { - const input = { ...args.input }; - - for (const field of Object.keys(inputBag)) { - if (!(field in input)) { - input[field] = inputBag[field as keyof Input]; - } - } - - return next({ - ...args, - input - }); - }; - }; -} diff --git a/packages/middleware-input-default/tsconfig.json b/packages/middleware-input-default/tsconfig.json deleted file mode 100644 index 38b94cda274e..000000000000 --- a/packages/middleware-input-default/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compilerOptions": { - "target": "es5", - "module": "commonjs", - "declaration": true, - "strict": true, - "sourceMap": true, - "downlevelIteration": true, - "importHelpers": true, - "noEmitHelpers": true, - "lib": [ - "es5", - "es2015.promise", - "es2015.collection", - "es2015.iterable", - "es2015.symbol.wellknown" - ], - "rootDir": "./src", - "outDir": "./build", - "incremental": true - } -} diff --git a/packages/middleware-input-default/tsconfig.test.json b/packages/middleware-input-default/tsconfig.test.json deleted file mode 100644 index 17d0f1b7321f..000000000000 --- a/packages/middleware-input-default/tsconfig.test.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "sourceMap": false, - "inlineSourceMap": true, - "inlineSources": true, - "rootDir": "./src", - "outDir": "./build", - "incremental": true - } -} diff --git a/packages/middleware-sdk-glacier/src/account-id-default.spec.ts b/packages/middleware-sdk-glacier/src/account-id-default.spec.ts new file mode 100644 index 000000000000..4b6696153d44 --- /dev/null +++ b/packages/middleware-sdk-glacier/src/account-id-default.spec.ts @@ -0,0 +1,39 @@ +import { accountIdDefaultMiddleware } from "./account-id-default"; + +describe("accountIdDefaultMiddleware", () => { + const next = jest.fn(); + + beforeEach(() => { + jest.clearAllMocks(); + }); + + it("adds default accountId if not set on input", async () => { + const handler = accountIdDefaultMiddleware()(next, {} as any); + await handler({ + input: {} + }); + + expect(next.mock.calls.length).toBe(1); + expect(next).toHaveBeenCalledWith({ + input: { + accountId: "-" + } + }); + }); + + it("does not change accountId input if set previously", async () => { + const handler = accountIdDefaultMiddleware()(next, {} as any); + await handler({ + input: { + accountId: "1234" + } + }); + + expect(next.mock.calls.length).toBe(1); + expect(next).toHaveBeenCalledWith({ + input: { + accountId: "1234" + } + }); + }); +}); diff --git a/packages/middleware-sdk-glacier/src/account-id-default.ts b/packages/middleware-sdk-glacier/src/account-id-default.ts new file mode 100644 index 000000000000..8791771b08d9 --- /dev/null +++ b/packages/middleware-sdk-glacier/src/account-id-default.ts @@ -0,0 +1,29 @@ +import { + InitializeHandler, + InitializeHandlerArguments, + InitializeHandlerOptions, + InitializeHandlerOutput, + InitializeMiddleware, + MetadataBearer, + Pluggable +} from "@aws-sdk/types"; + +export function accountIdDefaultMiddleware(): InitializeMiddleware { + return ( + next: InitializeHandler + ): InitializeHandler => async ( + args: InitializeHandlerArguments + ): Promise> => { + const { input } = args; + if (input.accountId === undefined) { + input.accountId = "-"; + } + return next({ ...args, input }); + }; +} + +export const accountIdDefaultMiddlewareOptions: InitializeHandlerOptions = { + step: "initialize", + tags: ["ACCOUNT_ID_DEFAULT"], + name: "accountIdDefaultMiddleware" +}; diff --git a/packages/middleware-sdk-glacier/src/add-glacier-api-version.spec.ts b/packages/middleware-sdk-glacier/src/add-glacier-api-version.spec.ts index 85dfd6a6c46c..a06cb915baf3 100644 --- a/packages/middleware-sdk-glacier/src/add-glacier-api-version.spec.ts +++ b/packages/middleware-sdk-glacier/src/add-glacier-api-version.spec.ts @@ -9,10 +9,9 @@ describe("addGlacierApiVersion", () => { }); it("sets the x-amz-glacier-version header", async () => { - const handler = addGlacierApiVersionMiddleware()( - mockNextHandler, - {} as any - ); + const handler = addGlacierApiVersionMiddleware({ + apiVersion: "1970-01-01" + })(mockNextHandler, {} as any); await handler({ input: {}, @@ -24,6 +23,6 @@ describe("addGlacierApiVersion", () => { // ensure the next handler was called expect(mockNextHandler.mock.calls.length).toBe(1); const { request } = mockNextHandler.mock.calls[0][0]; - expect(request.headers["x-amz-glacier-version"]).toBe("2012-06-01"); + expect(request.headers["x-amz-glacier-version"]).toBe("1970-01-01"); }); }); diff --git a/packages/middleware-sdk-glacier/src/add-glacier-api-version.ts b/packages/middleware-sdk-glacier/src/add-glacier-api-version.ts index 2eec605bdf5a..188b3583740c 100644 --- a/packages/middleware-sdk-glacier/src/add-glacier-api-version.ts +++ b/packages/middleware-sdk-glacier/src/add-glacier-api-version.ts @@ -1,15 +1,17 @@ +import { ResolvedGlacierMiddlewareConfig } from "./configurations"; import { BuildHandler, BuildHandlerArguments, BuildHandlerOptions, BuildHandlerOutput, BuildMiddleware, - MetadataBearer, - Pluggable + MetadataBearer } from "@aws-sdk/types"; import { HttpRequest } from "@aws-sdk/protocol-http"; -export function addGlacierApiVersionMiddleware(): BuildMiddleware { +export function addGlacierApiVersionMiddleware( + options: ResolvedGlacierMiddlewareConfig +): BuildMiddleware { return ( next: BuildHandler ): BuildHandler => async ( @@ -17,7 +19,7 @@ export function addGlacierApiVersionMiddleware(): BuildMiddleware { ): Promise> => { let request = args.request; if (HttpRequest.isInstance(request)) { - request.headers["x-amz-glacier-version"] = "2012-06-01"; + request.headers["x-amz-glacier-version"] = options.apiVersion; } return next({ @@ -27,17 +29,8 @@ export function addGlacierApiVersionMiddleware(): BuildMiddleware { }; } -export const addGlacierApiVersionOptions: BuildHandlerOptions = { +export const addGlacierApiVersionMiddlewareOptions: BuildHandlerOptions = { step: "build", - tags: ["SET_CONTENT_LENGTH", "CONTENT_LENGTH"], - name: "contentLengthMiddleware" + tags: ["SET_GLACIER_VERSION"], + name: "addGlacierApiVersionMiddleware" }; - -export const getAddGlacierApiVersionPlugin = (): Pluggable => ({ - applyToStack: clientStack => { - clientStack.add( - addGlacierApiVersionMiddleware(), - addGlacierApiVersionOptions - ); - } -}); diff --git a/packages/middleware-sdk-glacier/src/configurations.ts b/packages/middleware-sdk-glacier/src/configurations.ts new file mode 100644 index 000000000000..ee74be92ec42 --- /dev/null +++ b/packages/middleware-sdk-glacier/src/configurations.ts @@ -0,0 +1,42 @@ +import { + accountIdDefaultMiddleware, + accountIdDefaultMiddlewareOptions +} from "./account-id-default"; +import { + addGlacierApiVersionMiddleware, + addGlacierApiVersionMiddlewareOptions +} from "./add-glacier-api-version"; +import { Pluggable } from "@aws-sdk/types"; + +export interface GlacierMiddlewareInputConfig {} + +interface PreviouslyResolved { + apiVersion: string; +} + +export interface ResolvedGlacierMiddlewareConfig { + apiVersion: string; +} + +export function resolveGlacierMiddlewareConfig( + input: T & PreviouslyResolved & GlacierMiddlewareInputConfig +): T & ResolvedGlacierMiddlewareConfig { + return { + ...input + }; +} + +export const getGlacierPlugin = ( + config: PreviouslyResolved +): Pluggable => ({ + applyToStack: clientStack => { + clientStack.add( + accountIdDefaultMiddleware(), + accountIdDefaultMiddlewareOptions + ); + clientStack.add( + addGlacierApiVersionMiddleware(config), + addGlacierApiVersionMiddlewareOptions + ); + } +}); diff --git a/packages/middleware-sdk-glacier/src/index.spec.ts b/packages/middleware-sdk-glacier/src/index.spec.ts index d97c86e15c1d..33fcc3383ecf 100644 --- a/packages/middleware-sdk-glacier/src/index.spec.ts +++ b/packages/middleware-sdk-glacier/src/index.spec.ts @@ -1,7 +1,24 @@ -import { addGlacierApiVersionMiddleware } from "./index"; +import { + accountIdDefaultMiddleware, + addGlacierApiVersionMiddleware, + getGlacierPlugin, + resolveGlacierMiddlewareConfig +} from "./index"; describe("middleware-sdk-glacier package exports", () => { it("addGlacierApiVersionMiddleware", () => { expect(typeof addGlacierApiVersionMiddleware).toBe("function"); }); + + it("accountIdDefaultMiddleware", () => { + expect(typeof accountIdDefaultMiddleware).toBe("function"); + }); + + it("getGlacierPlugin", () => { + expect(typeof getGlacierPlugin).toBe("function"); + }); + + it("resolveGlacierMiddlewareConfig", () => { + expect(typeof resolveGlacierMiddlewareConfig).toBe("function"); + }); }); diff --git a/packages/middleware-sdk-glacier/src/index.ts b/packages/middleware-sdk-glacier/src/index.ts index 842cb2fcfc21..459e9cfa5cdc 100644 --- a/packages/middleware-sdk-glacier/src/index.ts +++ b/packages/middleware-sdk-glacier/src/index.ts @@ -1 +1,3 @@ export * from "./add-glacier-api-version"; +export * from "./account-id-default"; +export * from "./configurations";