diff --git a/clients/node/client-rds-data-node/commands/ExecuteStatementCommand.ts b/clients/node/client-rds-data-node/commands/ExecuteStatementCommand.ts index 191f28b7824d..958bb054a3b7 100644 --- a/clients/node/client-rds-data-node/commands/ExecuteStatementCommand.ts +++ b/clients/node/client-rds-data-node/commands/ExecuteStatementCommand.ts @@ -1,6 +1,8 @@ import { Command } from "@aws-sdk/smithy-client"; -import { serializerPlugin } from "@aws-sdk/middleware-serializer"; -import { deserializerPlugin } from "@aws-sdk/middleware-deserializer"; +import { + deserializerPlugin, + serializerPlugin +} from "@aws-sdk/middleware-serde"; import * as __aws_sdk_types from "@aws-sdk/types"; import { RDSDataResolvedConfiguration } from "../RDSDataConfiguration"; import { HttpRequest } from "@aws-sdk/protocol-http"; diff --git a/packages/middleware-deserializer/README.md b/packages/middleware-deserializer/README.md deleted file mode 100644 index 37677f05af42..000000000000 --- a/packages/middleware-deserializer/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# @aws-sdk/@aws-sdk/middleware-deserializer - -[![NPM version](https://img.shields.io/npm/v/@aws-sdk/@aws-sdk/middleware-deserializer/preview.svg)](https://www.npmjs.com/package/@aws-sdk/@aws-sdk/middleware-deserializer) -[![NPM downloads](https://img.shields.io/npm/dm/@aws-sdk/@aws-sdk/middleware-deserializer.svg)](https://www.npmjs.com/package/@aws-sdk/@aws-sdk/middleware-deserializer) diff --git a/packages/middleware-deserializer/.gitignore b/packages/middleware-serde/.gitignore similarity index 100% rename from packages/middleware-deserializer/.gitignore rename to packages/middleware-serde/.gitignore diff --git a/packages/middleware-deserializer/.npmignore b/packages/middleware-serde/.npmignore similarity index 100% rename from packages/middleware-deserializer/.npmignore rename to packages/middleware-serde/.npmignore diff --git a/packages/middleware-deserializer/LICENSE b/packages/middleware-serde/LICENSE similarity index 100% rename from packages/middleware-deserializer/LICENSE rename to packages/middleware-serde/LICENSE diff --git a/packages/middleware-serde/README.md b/packages/middleware-serde/README.md new file mode 100644 index 000000000000..8b46dda59b2e --- /dev/null +++ b/packages/middleware-serde/README.md @@ -0,0 +1,4 @@ +# @aws-sdk/@aws-sdk/middleware-serde + +[![NPM version](https://img.shields.io/npm/v/@aws-sdk/@aws-sdk/middleware-serde/preview.svg)](https://www.npmjs.com/package/@aws-sdk/@aws-sdk/middleware-serde) +[![NPM downloads](https://img.shields.io/npm/dm/@aws-sdk/@aws-sdk/middleware-serde.svg)](https://www.npmjs.com/package/@aws-sdk/@aws-sdk/middleware-serde) diff --git a/packages/middleware-deserializer/package.json b/packages/middleware-serde/package.json similarity index 92% rename from packages/middleware-deserializer/package.json rename to packages/middleware-serde/package.json index 169f0f92f1c0..bf77606c008f 100644 --- a/packages/middleware-deserializer/package.json +++ b/packages/middleware-serde/package.json @@ -1,5 +1,5 @@ { - "name": "@aws-sdk/middleware-deserializer", + "name": "@aws-sdk/middleware-serde", "version": "0.1.0-preview.1", "scripts": { "prepublishOnly": "tsc", diff --git a/packages/middleware-deserializer/src/index.ts b/packages/middleware-serde/src/index.ts similarity index 54% rename from packages/middleware-deserializer/src/index.ts rename to packages/middleware-serde/src/index.ts index deb07eed2e87..05de97d411dc 100644 --- a/packages/middleware-deserializer/src/index.ts +++ b/packages/middleware-serde/src/index.ts @@ -1,10 +1,16 @@ import { + RequestSerializer, + SerializeHandler, + SerializeHandlerArguments, + SerializeMiddleware, + SerializeHandlerOutput, ResponseDeserializer, DeserializeHandler, DeserializeHandlerArguments, DeserializeMiddleware, DeserializeHandlerOutput, Protocol, + SerializerUtils, DeserializerUtils, InjectableMiddleware } from "@aws-sdk/types"; @@ -48,3 +54,38 @@ export function deserializerPlugin( tags: { DESERIALIZER: true } }; } + +export function serializerMiddleware< + Input extends object, + Output extends object +>( + options: SerializerMiddlewareConfig, + serializer: RequestSerializer +): SerializeMiddleware { + return ( + next: SerializeHandler + ): SerializeHandler => async ( + args: SerializeHandlerArguments + ): Promise> => { + const request = options.protocol.serialize(serializer, args.input, options); + return next({ + ...args, + request + }); + }; +} + +export interface SerializerMiddlewareConfig extends SerializerUtils { + protocol: Protocol; +} + +export function serializerPlugin( + config: SerializerMiddlewareConfig, + serializer: RequestSerializer +): InjectableMiddleware { + return { + middleware: serializerMiddleware(config, serializer), + step: "serialize", + tags: { SERIALIZER: true } + }; +} diff --git a/packages/middleware-deserializer/tsconfig.json b/packages/middleware-serde/tsconfig.json similarity index 100% rename from packages/middleware-deserializer/tsconfig.json rename to packages/middleware-serde/tsconfig.json diff --git a/packages/middleware-deserializer/tsconfig.test.json b/packages/middleware-serde/tsconfig.test.json similarity index 100% rename from packages/middleware-deserializer/tsconfig.test.json rename to packages/middleware-serde/tsconfig.test.json diff --git a/packages/middleware-serializer/.gitignore b/packages/middleware-serializer/.gitignore deleted file mode 100644 index 3d1714c9806e..000000000000 --- a/packages/middleware-serializer/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/node_modules/ -/build/ -/coverage/ -/docs/ -*.tsbuildinfo -*.tgz -*.log -package-lock.json diff --git a/packages/middleware-serializer/.npmignore b/packages/middleware-serializer/.npmignore deleted file mode 100644 index 865b056dc2dd..000000000000 --- a/packages/middleware-serializer/.npmignore +++ /dev/null @@ -1,17 +0,0 @@ -/src/ -/coverage/ -/docs/ -tsconfig.test.json -*.tsbuildinfo - -*.spec.js -*.spec.d.ts -*.spec.js.map - -*.mock.js -*.mock.d.ts -*.mock.js.map - -*.fixture.js -*.fixture.d.ts -*.fixture.js.map \ No newline at end of file diff --git a/packages/middleware-serializer/CHANGELOG.md b/packages/middleware-serializer/CHANGELOG.md deleted file mode 100644 index 83a7ef221a09..000000000000 --- a/packages/middleware-serializer/CHANGELOG.md +++ /dev/null @@ -1,111 +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.7](https://github.com/aws/aws-sdk-js-v3/compare/@aws-sdk/middleware-serializer@0.1.0-preview.2...@aws-sdk/middleware-serializer@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-serializer@0.1.0-preview.2...@aws-sdk/middleware-serializer@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-serializer@0.1.0-preview.2...@aws-sdk/middleware-serializer@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-serializer@0.1.0-preview.2...@aws-sdk/middleware-serializer@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-serializer@0.1.0-preview.2...@aws-sdk/middleware-serializer@0.1.0-preview.3) (2019-04-19) - -**Note:** Version bump only for package @aws-sdk/middleware-serializer - -# [0.1.0-preview.2](https://github.com/aws/aws-sdk-js-v3/compare/@aws-sdk/middleware-serializer@0.1.0-preview.1...@aws-sdk/middleware-serializer@0.1.0-preview.2) (2019-03-27) - -**Note:** Version bump only for package @aws-sdk/middleware-serializer diff --git a/packages/middleware-serializer/LICENSE b/packages/middleware-serializer/LICENSE deleted file mode 100644 index a23adae1f987..000000000000 --- a/packages/middleware-serializer/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. \ No newline at end of file diff --git a/packages/middleware-serializer/README.md b/packages/middleware-serializer/README.md deleted file mode 100644 index 94ff99da4799..000000000000 --- a/packages/middleware-serializer/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# @aws-sdk/middleware-serializer - -[![NPM version](https://img.shields.io/npm/v/@aws-sdk/middleware-serializer/preview.svg)](https://www.npmjs.com/package/@aws-sdk/middleware-serializer) -[![NPM downloads](https://img.shields.io/npm/dm/@aws-sdk/middleware-serializer.svg)](https://www.npmjs.com/package/@aws-sdk/middleware-serializer) - -Provides the middleware serializer for the AWS SDK diff --git a/packages/middleware-serializer/jest.config.js b/packages/middleware-serializer/jest.config.js deleted file mode 100644 index 498ea8304467..000000000000 --- a/packages/middleware-serializer/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const base = require("../../jest.config.base.js"); - -module.exports = { - ...base -}; diff --git a/packages/middleware-serializer/package.json b/packages/middleware-serializer/package.json deleted file mode 100644 index 46bad0f5d046..000000000000 --- a/packages/middleware-serializer/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "@aws-sdk/middleware-serializer", - "description": "Provides the middleware serializer for the AWS SDK", - "version": "0.1.0-preview.7", - "scripts": { - "prepublishOnly": "tsc", - "pretest": "tsc -p tsconfig.test.json", - "test": "jest" - }, - "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" - }, - "main": "./build/index.js", - "types": "./build/index.d.ts", - "author": { - "name": "AWS SDK for JavaScript Team", - "email": "", - "url": "https://aws.amazon.com/javascript/" - }, - "license": "Apache-2.0" -} diff --git a/packages/middleware-serializer/src/index.ts b/packages/middleware-serializer/src/index.ts deleted file mode 100644 index b8361cc7baa1..000000000000 --- a/packages/middleware-serializer/src/index.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { - RequestSerializer, - SerializeHandler, - SerializeHandlerArguments, - SerializeMiddleware, - SerializeHandlerOutput, - Protocol, - SerializerUtils, - InjectableMiddleware -} from "@aws-sdk/types"; - -export function serializerMiddleware< - Input extends object, - Output extends object ->( - options: SerializerMiddlewareConfig, - serializer: RequestSerializer -): SerializeMiddleware { - return ( - next: SerializeHandler - ): SerializeHandler => async ( - args: SerializeHandlerArguments - ): Promise> => { - const request = options.protocol.serialize(serializer, args.input, options); - return next({ - ...args, - request - }); - }; -} - -export interface SerializerMiddlewareConfig extends SerializerUtils { - protocol: Protocol; -} - -export function serializerPlugin( - config: SerializerMiddlewareConfig, - serializer: RequestSerializer -): InjectableMiddleware { - return { - middleware: serializerMiddleware(config, serializer), - step: "serialize", - tags: { SERIALIZER: true } - }; -} diff --git a/packages/middleware-serializer/tsconfig.json b/packages/middleware-serializer/tsconfig.json deleted file mode 100644 index ea8af8858555..000000000000 --- a/packages/middleware-serializer/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compilerOptions": { - "target": "es5", - "module": "commonjs", - "declaration": true, - "strict": true, - "sourceMap": true, - "downlevelIteration": true, - "lib": [ - "es5", - "es2015.promise", - "es2015.collection", - "es2015.iterable", - "es2015.symbol.wellknown" - ], - "rootDir": "./src", - "outDir": "./build", - "importHelpers": true, - "noEmitHelpers": true, - "incremental": true - } -} diff --git a/packages/middleware-serializer/tsconfig.test.json b/packages/middleware-serializer/tsconfig.test.json deleted file mode 100644 index 17d0f1b7321f..000000000000 --- a/packages/middleware-serializer/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 - } -}