From 1ba24abd0c3f9e809bbfc08fceff73cdfbdde469 Mon Sep 17 00:00:00 2001 From: seebees Date: Tue, 5 Mar 2019 19:55:49 -0800 Subject: [PATCH 01/11] kms-keyring-node initial comit --- modules/kms-keyring-node/.gitignore | 3 + modules/kms-keyring-node/.npmignore | 3 + modules/kms-keyring-node/LICENSE | 202 ++++++++++++++++++ modules/kms-keyring-node/NOTICE | 2 + modules/kms-keyring-node/package.json | 48 +++++ modules/kms-keyring-node/src/index.ts | 43 ++++ modules/kms-keyring-node/tsconfig.json | 13 ++ modules/kms-keyring-node/tsconfig.module.json | 12 ++ 8 files changed, 326 insertions(+) create mode 100644 modules/kms-keyring-node/.gitignore create mode 100644 modules/kms-keyring-node/.npmignore create mode 100644 modules/kms-keyring-node/LICENSE create mode 100644 modules/kms-keyring-node/NOTICE create mode 100644 modules/kms-keyring-node/package.json create mode 100644 modules/kms-keyring-node/src/index.ts create mode 100644 modules/kms-keyring-node/tsconfig.json create mode 100644 modules/kms-keyring-node/tsconfig.module.json diff --git a/modules/kms-keyring-node/.gitignore b/modules/kms-keyring-node/.gitignore new file mode 100644 index 000000000..6498d2c9d --- /dev/null +++ b/modules/kms-keyring-node/.gitignore @@ -0,0 +1,3 @@ +/node_modules/ +/build/ +/.nyc_output \ No newline at end of file diff --git a/modules/kms-keyring-node/.npmignore b/modules/kms-keyring-node/.npmignore new file mode 100644 index 000000000..f39dee960 --- /dev/null +++ b/modules/kms-keyring-node/.npmignore @@ -0,0 +1,3 @@ +/src/ +/coverage/ +/test/ \ No newline at end of file diff --git a/modules/kms-keyring-node/LICENSE b/modules/kms-keyring-node/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/modules/kms-keyring-node/LICENSE @@ -0,0 +1,202 @@ + + 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 [yyyy] [name of copyright owner] + + 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/modules/kms-keyring-node/NOTICE b/modules/kms-keyring-node/NOTICE new file mode 100644 index 000000000..a95284f35 --- /dev/null +++ b/modules/kms-keyring-node/NOTICE @@ -0,0 +1,2 @@ +AWS Encryption SDK for Javascript +Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/modules/kms-keyring-node/package.json b/modules/kms-keyring-node/package.json new file mode 100644 index 000000000..4d29b8ec5 --- /dev/null +++ b/modules/kms-keyring-node/package.json @@ -0,0 +1,48 @@ +{ + "name": "@aws-crypto/kms-keyring-node", + "private": true, + "version": "0.0.1", + "scripts": { + "prepublishOnly": "tsc -p tsconfig.json && tsc -p tsconfig.module.json", + "lint": "standard src/*.ts test/**/*.ts", + "mocha": "mocha --require ts-node/register test/**/*test.ts", + "test": "npm run lint && npm run coverage", + "coverage": "nyc -e .ts npm run mocha" + }, + "author": { + "name": "AWS Crypto Tools Team", + "email": "aws-crypto-tools-team@amazon.com", + "url": "https://github.com/awslabs/aws-encryption-sdk-javascript" + }, + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/material-management-node": "^0.0.1", + "@aws-crypto/kms-keyring": "^0.0.1", + "@aws-sdk/types": "0.1.0-preview.1", + "tslib": "^1.9.3" + }, + "devDependencies": { + "@types/chai": "^4.1.4", + "@types/mocha": "^5.2.5", + "@types/node": "^8.10.40", + "@typescript-eslint/eslint-plugin": "^1.4.2", + "@typescript-eslint/parser": "^1.4.2", + "aws-sdk": "^2.412.0", + "chai": "^4.1.2", + "mocha": "^5.2.0", + "nyc": "^12.0.2", + "standard": "^12.0.1", + "ts-node": "^7.0.1", + "typescript": "^3.2.0" + }, + "sideEffects": false, + "main": "./build/main/index.js", + "module": "./build/module/index.js", + "types": "./build/main/index.d.ts", + "standard": { + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ] + } +} diff --git a/modules/kms-keyring-node/src/index.ts b/modules/kms-keyring-node/src/index.ts new file mode 100644 index 000000000..ef50cbd40 --- /dev/null +++ b/modules/kms-keyring-node/src/index.ts @@ -0,0 +1,43 @@ +/* + * 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. A copy of the License is + * located at + * + * http://aws.amazon.com/apache2.0/ + * + * or in the "license" file accompanying this file. This file 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. + */ + +import { + KmsKeyring, + KmsKeyringInput, + KMSConstructible, + KmsClientSupplier, + getClient, + limitRegions, + excludeRegions, + cacheClients +} from '@aws-crypto/kms-keyring' +import { + NodeAlgorithmSuite, + immutableClass +} from '@aws-crypto/material-management-node' +import {KMS, KMSConfiguration} from '@aws-sdk/client-kms-node' + +export type KmsKeyringNodeInput = KmsKeyringInput +export type KMSNodeConstructible = KMSConstructible +export type KmsNodeClientSupplier = KmsClientSupplier + +export class KmsKeyringNode extends KmsKeyring { + constructor(input: KmsKeyringNodeInput){ + super(input) + } +} +immutableClass(KmsKeyringNode) + +export {getClient, limitRegions, excludeRegions, cacheClients} diff --git a/modules/kms-keyring-node/tsconfig.json b/modules/kms-keyring-node/tsconfig.json new file mode 100644 index 000000000..2a68f6e8f --- /dev/null +++ b/modules/kms-keyring-node/tsconfig.json @@ -0,0 +1,13 @@ +{ + "extends": "../tsconfig.settings.json", + "compilerOptions": { + "outDir": "build/main", + "rootDir": "./src" + }, + "include": ["src/**/*.ts"], + "exclude": ["node_modules/**"], + "references": [ + { "path": "../material-management" }, + { "path": "../kms-keyring" } + ] +} \ No newline at end of file diff --git a/modules/kms-keyring-node/tsconfig.module.json b/modules/kms-keyring-node/tsconfig.module.json new file mode 100644 index 000000000..50bf04db4 --- /dev/null +++ b/modules/kms-keyring-node/tsconfig.module.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "target": "esnext", + "outDir": "build/module", + "module": "esnext", + "allowSyntheticDefaultImports": true + }, + "exclude": [ + "node_modules/**" + ] +} \ No newline at end of file From a6bc5d6b224cd883cb5432701be0cfd802878c4a Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 21 Mar 2019 21:26:09 -0700 Subject: [PATCH 02/11] kms-keyring-node types and needs update --- modules/kms-keyring-node/package.json | 5 +++-- modules/kms-keyring-node/src/index.ts | 19 ++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/modules/kms-keyring-node/package.json b/modules/kms-keyring-node/package.json index 4d29b8ec5..99f20e62a 100644 --- a/modules/kms-keyring-node/package.json +++ b/modules/kms-keyring-node/package.json @@ -3,7 +3,8 @@ "private": true, "version": "0.0.1", "scripts": { - "prepublishOnly": "tsc -p tsconfig.json && tsc -p tsconfig.module.json", + "prepublishOnly": "npm run build", + "build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json", "lint": "standard src/*.ts test/**/*.ts", "mocha": "mocha --require ts-node/register test/**/*test.ts", "test": "npm run lint && npm run coverage", @@ -24,7 +25,7 @@ "devDependencies": { "@types/chai": "^4.1.4", "@types/mocha": "^5.2.5", - "@types/node": "^8.10.40", + "@types/node": "^11.11.4", "@typescript-eslint/eslint-plugin": "^1.4.2", "@typescript-eslint/parser": "^1.4.2", "aws-sdk": "^2.412.0", diff --git a/modules/kms-keyring-node/src/index.ts b/modules/kms-keyring-node/src/index.ts index ef50cbd40..4829835aa 100644 --- a/modules/kms-keyring-node/src/index.ts +++ b/modules/kms-keyring-node/src/index.ts @@ -15,29 +15,26 @@ import { KmsKeyring, - KmsKeyringInput, - KMSConstructible, - KmsClientSupplier, + KmsKeyringInput, // eslint-disable-line no-unused-vars + KMSConstructible, // eslint-disable-line no-unused-vars + KmsClientSupplier, // eslint-disable-line no-unused-vars getClient, limitRegions, excludeRegions, cacheClients } from '@aws-crypto/kms-keyring' import { - NodeAlgorithmSuite, + NodeAlgorithmSuite, // eslint-disable-line no-unused-vars immutableClass } from '@aws-crypto/material-management-node' -import {KMS, KMSConfiguration} from '@aws-sdk/client-kms-node' +import { KMS, KMSConfiguration } from '@aws-sdk/client-kms-node' // eslint-disable-line no-unused-vars export type KmsKeyringNodeInput = KmsKeyringInput export type KMSNodeConstructible = KMSConstructible export type KmsNodeClientSupplier = KmsClientSupplier -export class KmsKeyringNode extends KmsKeyring { - constructor(input: KmsKeyringNodeInput){ - super(input) - } -} +export class KmsKeyringNode extends KmsKeyring {} immutableClass(KmsKeyringNode) -export {getClient, limitRegions, excludeRegions, cacheClients} +const getKmsClient = getClient(KMS) +export { getKmsClient, limitRegions, excludeRegions, cacheClients } From 54a7a60174e90cd80556b68095f956c1c638abcb Mon Sep 17 00:00:00 2001 From: seebees Date: Fri, 22 Mar 2019 06:44:23 -0700 Subject: [PATCH 03/11] default the client provider --- modules/kms-keyring-node/src/index.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/kms-keyring-node/src/index.ts b/modules/kms-keyring-node/src/index.ts index 4829835aa..76a969622 100644 --- a/modules/kms-keyring-node/src/index.ts +++ b/modules/kms-keyring-node/src/index.ts @@ -28,13 +28,22 @@ import { immutableClass } from '@aws-crypto/material-management-node' import { KMS, KMSConfiguration } from '@aws-sdk/client-kms-node' // eslint-disable-line no-unused-vars +const getKmsClient = getClient(KMS) export type KmsKeyringNodeInput = KmsKeyringInput export type KMSNodeConstructible = KMSConstructible export type KmsNodeClientSupplier = KmsClientSupplier -export class KmsKeyringNode extends KmsKeyring {} +export class KmsKeyringNode extends KmsKeyring { + constructor({ + clientProvider = getKmsClient, + kmsKeys, + generatorKmsKey, + grantTokens + }) { + super({clientProvider, kmsKeys, generatorKmsKey, grantTokens}) + } +} immutableClass(KmsKeyringNode) -const getKmsClient = getClient(KMS) export { getKmsClient, limitRegions, excludeRegions, cacheClients } From 796d94c9ed6d072f611a4cb338ae1038824cbeb6 Mon Sep 17 00:00:00 2001 From: seebees Date: Sat, 23 Mar 2019 15:11:21 -0700 Subject: [PATCH 04/11] kms-keyring-node wallaby code coverage cache client default kms-keyring-node --- modules/kms-keyring-node/src/index.ts | 35 +------------ .../kms-keyring-node/src/kms_keyring_node.ts | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+), 34 deletions(-) create mode 100644 modules/kms-keyring-node/src/kms_keyring_node.ts diff --git a/modules/kms-keyring-node/src/index.ts b/modules/kms-keyring-node/src/index.ts index 76a969622..61bc8960f 100644 --- a/modules/kms-keyring-node/src/index.ts +++ b/modules/kms-keyring-node/src/index.ts @@ -13,37 +13,4 @@ * limitations under the License. */ -import { - KmsKeyring, - KmsKeyringInput, // eslint-disable-line no-unused-vars - KMSConstructible, // eslint-disable-line no-unused-vars - KmsClientSupplier, // eslint-disable-line no-unused-vars - getClient, - limitRegions, - excludeRegions, - cacheClients -} from '@aws-crypto/kms-keyring' -import { - NodeAlgorithmSuite, // eslint-disable-line no-unused-vars - immutableClass -} from '@aws-crypto/material-management-node' -import { KMS, KMSConfiguration } from '@aws-sdk/client-kms-node' // eslint-disable-line no-unused-vars -const getKmsClient = getClient(KMS) - -export type KmsKeyringNodeInput = KmsKeyringInput -export type KMSNodeConstructible = KMSConstructible -export type KmsNodeClientSupplier = KmsClientSupplier - -export class KmsKeyringNode extends KmsKeyring { - constructor({ - clientProvider = getKmsClient, - kmsKeys, - generatorKmsKey, - grantTokens - }) { - super({clientProvider, kmsKeys, generatorKmsKey, grantTokens}) - } -} -immutableClass(KmsKeyringNode) - -export { getKmsClient, limitRegions, excludeRegions, cacheClients } +export * from './kms_keyring_node' diff --git a/modules/kms-keyring-node/src/kms_keyring_node.ts b/modules/kms-keyring-node/src/kms_keyring_node.ts new file mode 100644 index 000000000..ff86e1c3f --- /dev/null +++ b/modules/kms-keyring-node/src/kms_keyring_node.ts @@ -0,0 +1,50 @@ +/* + * 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. A copy of the License is + * located at + * + * http://aws.amazon.com/apache2.0/ + * + * or in the "license" file accompanying this file. This file 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. + */ + +import { + KmsKeyring, + KmsKeyringInput, // eslint-disable-line no-unused-vars + KMSConstructible, // eslint-disable-line no-unused-vars + KmsClientSupplier, // eslint-disable-line no-unused-vars + getClient, + limitRegions, + excludeRegions, + cacheClients +} from '@aws-crypto/kms-keyring' +import { + NodeAlgorithmSuite, // eslint-disable-line no-unused-vars + immutableClass +} from '@aws-crypto/material-management-node' +import { KMS, KMSConfiguration } from '@aws-sdk/client-kms-node' // eslint-disable-line no-unused-vars +const getKmsClient = getClient(KMS) +const cacheKmsClients = cacheClients(getKmsClient) + +export type KmsKeyringNodeInput = Partial> +export type KMSNodeConstructible = KMSConstructible +export type KmsNodeClientSupplier = KmsClientSupplier + +export class KmsKeyringNode extends KmsKeyring { + constructor ({ + clientProvider = cacheKmsClients, + kmsKeys, + generatorKmsKey, + grantTokens + }: KmsKeyringNodeInput) { + super({ clientProvider, kmsKeys, generatorKmsKey, grantTokens }) + } +} +immutableClass(KmsKeyringNode) + +export { getKmsClient, cacheKmsClients, limitRegions, excludeRegions, cacheClients } From da21b8057420645f07021bc12f69b7170ec72891 Mon Sep 17 00:00:00 2001 From: seebees Date: Wed, 27 Mar 2019 06:47:43 -0700 Subject: [PATCH 05/11] kms-keyring-node --- .../kms-keyring-node/src/kms_keyring_node.ts | 9 ++++-- .../test/kms_keyring_node.test.ts | 28 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 modules/kms-keyring-node/test/kms_keyring_node.test.ts diff --git a/modules/kms-keyring-node/src/kms_keyring_node.ts b/modules/kms-keyring-node/src/kms_keyring_node.ts index ff86e1c3f..6146cd392 100644 --- a/modules/kms-keyring-node/src/kms_keyring_node.ts +++ b/modules/kms-keyring-node/src/kms_keyring_node.ts @@ -25,7 +25,7 @@ import { } from '@aws-crypto/kms-keyring' import { NodeAlgorithmSuite, // eslint-disable-line no-unused-vars - immutableClass + immutableClass, NodeKeyring } from '@aws-crypto/material-management-node' import { KMS, KMSConfiguration } from '@aws-sdk/client-kms-node' // eslint-disable-line no-unused-vars const getKmsClient = getClient(KMS) @@ -41,9 +41,14 @@ export class KmsKeyringNode extends KmsKeyring { kmsKeys, generatorKmsKey, grantTokens - }: KmsKeyringNodeInput) { + }: KmsKeyringNodeInput = {}) { super({ clientProvider, kmsKeys, generatorKmsKey, grantTokens }) } + + [Symbol.hasInstance] (obj: any) { + return obj instanceof NodeKeyring || + Function.prototype[Symbol.hasInstance].call(this, obj) + } } immutableClass(KmsKeyringNode) diff --git a/modules/kms-keyring-node/test/kms_keyring_node.test.ts b/modules/kms-keyring-node/test/kms_keyring_node.test.ts new file mode 100644 index 000000000..8ae791c97 --- /dev/null +++ b/modules/kms-keyring-node/test/kms_keyring_node.test.ts @@ -0,0 +1,28 @@ +/* + * 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. A copy of the License is + * located at + * + * http://aws.amazon.com/apache2.0/ + * + * or in the "license" file accompanying this file. This file 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. + */ + +/* eslint-env mocha */ + +import { expect } from 'chai' +import 'mocha' +import { KmsKeyringNode } from '../src/kms_keyring_node' +import { NodeKeyring } from '@aws-crypto/material-management-node' + +describe('KmsKeyringNode', () => { + it('instanceof NodeKeyring', () => { + const test = new KmsKeyringNode() + expect(test instanceof NodeKeyring).to.equal(true) + }) +}) From 542cc0faa493f43ac69e0cca8646b4bb3bfd1e88 Mon Sep 17 00:00:00 2001 From: seebees Date: Wed, 27 Mar 2019 14:22:55 -0700 Subject: [PATCH 06/11] kms-keyring-node kms cleint --- modules/kms-keyring-node/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/kms-keyring-node/package.json b/modules/kms-keyring-node/package.json index 99f20e62a..df5750c5b 100644 --- a/modules/kms-keyring-node/package.json +++ b/modules/kms-keyring-node/package.json @@ -19,6 +19,7 @@ "dependencies": { "@aws-crypto/material-management-node": "^0.0.1", "@aws-crypto/kms-keyring": "^0.0.1", + "@aws-sdk/client-kms-node": "^0.1.0-preview.2", "@aws-sdk/types": "0.1.0-preview.1", "tslib": "^1.9.3" }, From 0af18e92450d103e00f839e19ca236fa9d600e5b Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 28 Mar 2019 14:11:45 -0700 Subject: [PATCH 07/11] kms-keyring-node --- .../kms-keyring-node/src/kms_keyring_node.ts | 18 +++++++----------- .../test/kms_keyring_node.test.ts | 4 ++-- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/modules/kms-keyring-node/src/kms_keyring_node.ts b/modules/kms-keyring-node/src/kms_keyring_node.ts index 6146cd392..762ecc3b4 100644 --- a/modules/kms-keyring-node/src/kms_keyring_node.ts +++ b/modules/kms-keyring-node/src/kms_keyring_node.ts @@ -14,7 +14,8 @@ */ import { - KmsKeyring, + KmsKeyringClass, + KeyRingConstructible, // eslint-disable-line no-unused-vars KmsKeyringInput, // eslint-disable-line no-unused-vars KMSConstructible, // eslint-disable-line no-unused-vars KmsClientSupplier, // eslint-disable-line no-unused-vars @@ -25,7 +26,7 @@ import { } from '@aws-crypto/kms-keyring' import { NodeAlgorithmSuite, // eslint-disable-line no-unused-vars - immutableClass, NodeKeyring + immutableClass, KeyringNode } from '@aws-crypto/material-management-node' import { KMS, KMSConfiguration } from '@aws-sdk/client-kms-node' // eslint-disable-line no-unused-vars const getKmsClient = getClient(KMS) @@ -35,19 +36,14 @@ export type KmsKeyringNodeInput = Partial> export type KMSNodeConstructible = KMSConstructible export type KmsNodeClientSupplier = KmsClientSupplier -export class KmsKeyringNode extends KmsKeyring { +export class KmsKeyringNode extends KmsKeyringClass(KeyringNode as KeyRingConstructible) { constructor ({ clientProvider = cacheKmsClients, - kmsKeys, - generatorKmsKey, + keyIds, + generatorKeyId, grantTokens }: KmsKeyringNodeInput = {}) { - super({ clientProvider, kmsKeys, generatorKmsKey, grantTokens }) - } - - [Symbol.hasInstance] (obj: any) { - return obj instanceof NodeKeyring || - Function.prototype[Symbol.hasInstance].call(this, obj) + super({ clientProvider, keyIds, generatorKeyId, grantTokens }) } } immutableClass(KmsKeyringNode) diff --git a/modules/kms-keyring-node/test/kms_keyring_node.test.ts b/modules/kms-keyring-node/test/kms_keyring_node.test.ts index 8ae791c97..0b1af7c51 100644 --- a/modules/kms-keyring-node/test/kms_keyring_node.test.ts +++ b/modules/kms-keyring-node/test/kms_keyring_node.test.ts @@ -18,11 +18,11 @@ import { expect } from 'chai' import 'mocha' import { KmsKeyringNode } from '../src/kms_keyring_node' -import { NodeKeyring } from '@aws-crypto/material-management-node' +import { KeyringNode } from '@aws-crypto/material-management-node' describe('KmsKeyringNode', () => { it('instanceof NodeKeyring', () => { const test = new KmsKeyringNode() - expect(test instanceof NodeKeyring).to.equal(true) + expect(test instanceof KeyringNode).to.equal(true) }) }) From da0b287b1916e0d33695486ff1c899bc9a85aa07 Mon Sep 17 00:00:00 2001 From: seebees Date: Fri, 29 Mar 2019 07:36:39 -0700 Subject: [PATCH 08/11] housekeeping --- NOTICE | 2 +- modules/kms-keyring-node/.npmignore | 3 --- modules/kms-keyring-node/NOTICE | 2 +- modules/kms-keyring-node/package.json | 1 + modules/kms-keyring-node/src/index.ts | 2 +- modules/kms-keyring-node/src/kms_keyring_node.ts | 2 +- modules/kms-keyring-node/test/kms_keyring_node.test.ts | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 modules/kms-keyring-node/.npmignore diff --git a/NOTICE b/NOTICE index a95284f35..88f7bea1e 100644 --- a/NOTICE +++ b/NOTICE @@ -1,2 +1,2 @@ AWS Encryption SDK for Javascript -Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/modules/kms-keyring-node/.npmignore b/modules/kms-keyring-node/.npmignore deleted file mode 100644 index f39dee960..000000000 --- a/modules/kms-keyring-node/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -/src/ -/coverage/ -/test/ \ No newline at end of file diff --git a/modules/kms-keyring-node/NOTICE b/modules/kms-keyring-node/NOTICE index a95284f35..88f7bea1e 100644 --- a/modules/kms-keyring-node/NOTICE +++ b/modules/kms-keyring-node/NOTICE @@ -1,2 +1,2 @@ AWS Encryption SDK for Javascript -Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/modules/kms-keyring-node/package.json b/modules/kms-keyring-node/package.json index df5750c5b..33a5e0986 100644 --- a/modules/kms-keyring-node/package.json +++ b/modules/kms-keyring-node/package.json @@ -41,6 +41,7 @@ "main": "./build/main/index.js", "module": "./build/module/index.js", "types": "./build/main/index.d.ts", + "files": ["./build/**/*"], "standard": { "parser": "@typescript-eslint/parser", "plugins": [ diff --git a/modules/kms-keyring-node/src/index.ts b/modules/kms-keyring-node/src/index.ts index 61bc8960f..a7ae2e1ad 100644 --- a/modules/kms-keyring-node/src/index.ts +++ b/modules/kms-keyring-node/src/index.ts @@ -1,5 +1,5 @@ /* - * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2019 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. A copy of the License is diff --git a/modules/kms-keyring-node/src/kms_keyring_node.ts b/modules/kms-keyring-node/src/kms_keyring_node.ts index 762ecc3b4..71efa32ca 100644 --- a/modules/kms-keyring-node/src/kms_keyring_node.ts +++ b/modules/kms-keyring-node/src/kms_keyring_node.ts @@ -1,5 +1,5 @@ /* - * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2019 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. A copy of the License is diff --git a/modules/kms-keyring-node/test/kms_keyring_node.test.ts b/modules/kms-keyring-node/test/kms_keyring_node.test.ts index 0b1af7c51..1b1d5d113 100644 --- a/modules/kms-keyring-node/test/kms_keyring_node.test.ts +++ b/modules/kms-keyring-node/test/kms_keyring_node.test.ts @@ -1,5 +1,5 @@ /* - * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2019 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. A copy of the License is From 7627ce472c20543d7e2bc7648514fd601995e534 Mon Sep 17 00:00:00 2001 From: seebees Date: Fri, 29 Mar 2019 15:19:25 -0700 Subject: [PATCH 09/11] kms-keyring-node --- modules/kms-keyring-node/src/kms_keyring_node.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/kms-keyring-node/src/kms_keyring_node.ts b/modules/kms-keyring-node/src/kms_keyring_node.ts index 71efa32ca..bfbb0773b 100644 --- a/modules/kms-keyring-node/src/kms_keyring_node.ts +++ b/modules/kms-keyring-node/src/kms_keyring_node.ts @@ -41,9 +41,10 @@ export class KmsKeyringNode extends KmsKeyringClass(KeyringNode as KeyRingConstr clientProvider = cacheKmsClients, keyIds, generatorKeyId, - grantTokens + grantTokens, + discovery }: KmsKeyringNodeInput = {}) { - super({ clientProvider, keyIds, generatorKeyId, grantTokens }) + super({ clientProvider, keyIds, generatorKeyId, grantTokens, discovery }) } } immutableClass(KmsKeyringNode) From 52b57b1475e824161f7b593c9a5f6ffb96ef1b7d Mon Sep 17 00:00:00 2001 From: seebees Date: Sat, 30 Mar 2019 17:27:01 -0700 Subject: [PATCH 10/11] kms-keyring-node --- modules/kms-keyring-node/test/kms_keyring_node.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/kms-keyring-node/test/kms_keyring_node.test.ts b/modules/kms-keyring-node/test/kms_keyring_node.test.ts index 1b1d5d113..345c381d6 100644 --- a/modules/kms-keyring-node/test/kms_keyring_node.test.ts +++ b/modules/kms-keyring-node/test/kms_keyring_node.test.ts @@ -22,7 +22,7 @@ import { KeyringNode } from '@aws-crypto/material-management-node' describe('KmsKeyringNode', () => { it('instanceof NodeKeyring', () => { - const test = new KmsKeyringNode() + const test = new KmsKeyringNode({discovery: true}) expect(test instanceof KeyringNode).to.equal(true) }) }) From 5286e8738617345debcd999b1999e50e8883b0ee Mon Sep 17 00:00:00 2001 From: seebees Date: Tue, 2 Apr 2019 16:40:38 -0700 Subject: [PATCH 11/11] kms-keyring-node --- modules/kms-keyring-node/test/kms_keyring_node.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/kms-keyring-node/test/kms_keyring_node.test.ts b/modules/kms-keyring-node/test/kms_keyring_node.test.ts index 345c381d6..7a192f859 100644 --- a/modules/kms-keyring-node/test/kms_keyring_node.test.ts +++ b/modules/kms-keyring-node/test/kms_keyring_node.test.ts @@ -22,7 +22,7 @@ import { KeyringNode } from '@aws-crypto/material-management-node' describe('KmsKeyringNode', () => { it('instanceof NodeKeyring', () => { - const test = new KmsKeyringNode({discovery: true}) + const test = new KmsKeyringNode({ discovery: true }) expect(test instanceof KeyringNode).to.equal(true) }) })