Merge branch 'master' into fixed_lerna_versioning

Author: seebees

.eslintrc.js

@@ -36,7 +36,7 @@ module.exports = {
     '@typescript-eslint/no-misused-promises': 'error',
     // I disagree with these rules.
     // Humans read from less specific to more specific.
-    // No on puts the outline at the end of the book.
+    // No one puts the outline at the end of the book.
     // Since the exported functions should be composed
     // of lower level functions,
     // it is good for understanding

.github/ISSUE_TEMPLATE/aws-encryption-sdk-issue.md

@@ -0,0 +1,26 @@
+---
+name: AWS Encryption SDK Issue
+about: AWS Encryption SDK Issue
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Security issue notifications
+
+If you discover a potential security issue in the AWS Encryption SDK we ask that you notify AWS Security via our [vulnerability reporting page](https://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.
+
+### Problem:
+
+A short description of what the problem is and why we need to fix it. Add reproduction steps if necessary.
+
+### Solution:
+
+A description of the possible solution in terms of Encryption SDK architecture.
+
+### Out of scope:
+
+Is there anything the solution will intentionally NOT address?
+
+[//]: #  (NOTE: If you believe this might be a security issue, please email aws-security@amazon.com instead of creating a GitHub issue. For more details, see the AWS Vulnerability Reporting Guide: https://aws.amazon.com/security/vulnerability-reporting/ )

.github/workflows/repo-sync.yml

@@ -0,0 +1,25 @@
+name: Repo Sync
+
+on:
+  workflow_dispatch:     # allows triggering this manually through the Actions UI
+
+jobs:
+  repo-sync:
+    name: Repo Sync
+    environment: repo-sync
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: repo-sync/github-sync@v2
+      name: Sync repo to branch
+      with:
+        source_repo: ${{ secrets.SOURCE_REPO }}
+        source_branch: master
+        destination_branch: ${{ secrets.INTERMEDIATE_BRANCH }}
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: repo-sync/pull-request@v2
+      name: Create pull request
+      with:
+        source_branch: ${{ secrets.INTERMEDIATE_BRANCH }}
+        destination_branch: master
+        github_token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -15,6 +15,9 @@ package.json.decrypt
 .vscode
 .history
 
+# JetBrains
+.idea
+
 # nyc/code coverage
 .nyc_output
 .karma_output

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "aws-encryption-sdk-test-vectors"]
 	path = aws-encryption-sdk-test-vectors
-	url = https://github.com/awslabs/aws-encryption-sdk-test-vectors.git
+	url = https://github.com/awslabs/private-aws-encryption-sdk-test-vectors-staging.git
+	branch = known-invalid-test-vectors

README.md

@@ -63,7 +63,7 @@ A multi keyring can be used to compose keyrings together.
 ### Wrapping Keys
 
 Wrapping keys are used to protect data keys.
-An example of a wrapping key is a `KMS customer master key (CMK)`_.
+An example of a wrapping key is a `KMS customer master key (CMK)`.
 
 ### Data Keys
 

aws-encryption-sdk-test-vectors

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/cache-material@2.1.0...@aws-crypto/cache-material@2.2.0) (2021-05-27)
+
+**Note:** Version bump only for package @aws-crypto/cache-material
+
+
+
+
+
+# [2.1.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/@aws-crypto/cache-material@2.0.0...@aws-crypto/cache-material@2.1.0) (2021-02-04)
+
+**Note:** Version bump only for package @aws-crypto/cache-material
+
+
+
+
+
 # [2.0.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/cache-material@1.7.0...@aws-crypto/cache-material@2.0.0) (2020-09-25)
 
 **Note:** Version bump only for package @aws-crypto/cache-material

modules/cache-material/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/cache-material",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json",
@@ -22,7 +22,7 @@
     "@aws-crypto/serialize": "file:../serialize",
     "@types/lru-cache": "^5.1.0",
     "lru-cache": "^6.0.0",
-    "tslib": "^1.11.1"
+    "tslib": "^2.2.0"
   },
   "sideEffects": false,
   "main": "./build/main/index.js",

modules/cache-material/package.json

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/caching-materials-manager-browser@2.1.0...@aws-crypto/caching-materials-manager-browser@2.2.0) (2021-05-27)
+
+**Note:** Version bump only for package @aws-crypto/caching-materials-manager-browser
+
+
+
+
+
+# [2.1.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/@aws-crypto/caching-materials-manager-browser@2.0.0...@aws-crypto/caching-materials-manager-browser@2.1.0) (2021-02-04)
+
+**Note:** Version bump only for package @aws-crypto/caching-materials-manager-browser
+
+
+
+
+
 # [2.0.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/caching-materials-manager-browser@1.7.0...@aws-crypto/caching-materials-manager-browser@2.0.0) (2020-09-25)
 
 **Note:** Version bump only for package @aws-crypto/caching-materials-manager-browser

modules/caching-materials-manager-browser/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/caching-materials-manager-browser",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json",
@@ -23,8 +23,8 @@
     "@aws-crypto/serialize": "file:../serialize",
     "@aws-crypto/web-crypto-backend": "file:../web-crypto-backend",
     "@aws-sdk/util-base64-browser": "3.1.0",
-    "@aws-sdk/util-utf8-browser": "3.1.0",
-    "tslib": "^1.11.1"
+    "@aws-sdk/util-utf8-browser": "3.13.1",
+    "tslib": "^2.2.0"
   },
   "sideEffects": false,
   "main": "./build/main/index.js",

modules/caching-materials-manager-browser/package.json

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/caching-materials-manager-node@2.1.0...@aws-crypto/caching-materials-manager-node@2.2.0) (2021-05-27)
+
+**Note:** Version bump only for package @aws-crypto/caching-materials-manager-node
+
+
+
+
+
+# [2.1.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/@aws-crypto/caching-materials-manager-node@2.0.0...@aws-crypto/caching-materials-manager-node@2.1.0) (2021-02-04)
+
+**Note:** Version bump only for package @aws-crypto/caching-materials-manager-node
+
+
+
+
+
 # [2.0.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/caching-materials-manager-node@1.7.0...@aws-crypto/caching-materials-manager-node@2.0.0) (2020-09-25)
 
 **Note:** Version bump only for package @aws-crypto/caching-materials-manager-node

modules/caching-materials-manager-node/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/caching-materials-manager-node",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@aws-crypto/cache-material": "file:../cache-material",
     "@aws-crypto/material-management-node": "file:../material-management-node",
-    "tslib": "^1.11.1"
+    "tslib": "^2.2.0"
   },
   "sideEffects": false,
   "main": "./build/main/index.js",

modules/caching-materials-manager-node/package.json

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/client-browser@2.1.0...@aws-crypto/client-browser@2.2.0) (2021-05-27)
+
+**Note:** Version bump only for package @aws-crypto/client-browser
+
+
+
+
+
+# [2.1.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/@aws-crypto/client-browser@2.0.0...@aws-crypto/client-browser@2.1.0) (2021-02-04)
+
+**Note:** Version bump only for package @aws-crypto/client-browser
+
+
+
+
+
 # [2.0.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/client-browser@1.7.0...@aws-crypto/client-browser@2.0.0) (2020-09-25)
 
 

modules/client-browser/CHANGELOG.md

@@ -9,7 +9,7 @@
     "CSE",
     "aws"
   ],
-  "version": "2.0.0",
+  "version": "2.2.0",
   "scripts": {
     "build": "tsc -b tsconfig.json",
     "lint": "run-s lint-*",
@@ -31,7 +31,7 @@
     "@aws-crypto/raw-aes-keyring-browser": "file:../raw-aes-keyring-browser",
     "@aws-crypto/raw-rsa-keyring-browser": "file:../raw-rsa-keyring-browser",
     "@aws-crypto/web-crypto-backend": "file:../web-crypto-backend",
-    "tslib": "^1.11.1"
+    "tslib": "^2.2.0"
   },
   "sideEffects": false,
   "main": "./build/main/index.js",

modules/client-browser/package.json

@@ -10,16 +10,19 @@ export * from '@aws-crypto/raw-aes-keyring-browser'
 export * from '@aws-crypto/raw-rsa-keyring-browser'
 export * from '@aws-crypto/web-crypto-backend'
 
-import { CommitmentPolicy } from '@aws-crypto/material-management-browser'
+import {
+  CommitmentPolicy,
+  ClientOptions,
+} from '@aws-crypto/material-management-browser'
 
 import { buildEncrypt } from '@aws-crypto/encrypt-browser'
 import { buildDecrypt } from '@aws-crypto/decrypt-browser'
 
 export function buildClient(
-  commitmentPolicy: CommitmentPolicy = CommitmentPolicy.REQUIRE_ENCRYPT_REQUIRE_DECRYPT
+  options?: CommitmentPolicy | ClientOptions
 ): ReturnType<typeof buildEncrypt> & ReturnType<typeof buildDecrypt> {
   return {
-    ...buildEncrypt(commitmentPolicy),
-    ...buildDecrypt(commitmentPolicy),
+    ...buildEncrypt(options),
+    ...buildDecrypt(options),
   }
 }

modules/client-browser/src/index.ts

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/client-node@2.1.0...@aws-crypto/client-node@2.2.0) (2021-05-27)
+
+**Note:** Version bump only for package @aws-crypto/client-node
+
+
+
+
+
+# [2.1.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/@aws-crypto/client-node@2.0.0...@aws-crypto/client-node@2.1.0) (2021-02-04)
+
+**Note:** Version bump only for package @aws-crypto/client-node
+
+
+
+
+
 # [2.0.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/client-node@1.7.0...@aws-crypto/client-node@2.0.0) (2020-09-25)
 
 

modules/client-node/CHANGELOG.md

@@ -9,7 +9,7 @@
     "CSE",
     "aws"
   ],
-  "version": "2.0.0",
+  "version": "2.2.0",
   "scripts": {
     "build": "tsc -b tsconfig.json",
     "lint": "run-s lint-*",
@@ -30,7 +30,7 @@
     "@aws-crypto/material-management-node": "file:../material-management-node",
     "@aws-crypto/raw-aes-keyring-node": "file:../raw-aes-keyring-node",
     "@aws-crypto/raw-rsa-keyring-node": "file:../raw-rsa-keyring-node",
-    "tslib": "^1.11.1"
+    "tslib": "^2.2.0"
   },
   "sideEffects": false,
   "main": "./build/main/index.js",

modules/client-node/package.json

@@ -9,16 +9,19 @@ export * from '@aws-crypto/kms-keyring-node'
 export * from '@aws-crypto/raw-aes-keyring-node'
 export * from '@aws-crypto/raw-rsa-keyring-node'
 
-import { CommitmentPolicy } from '@aws-crypto/material-management-node'
+import {
+  CommitmentPolicy,
+  ClientOptions,
+} from '@aws-crypto/material-management-node'
 
 import { buildEncrypt } from '@aws-crypto/encrypt-node'
 import { buildDecrypt } from '@aws-crypto/decrypt-node'
 
 export function buildClient(
-  commitmentPolicy: CommitmentPolicy = CommitmentPolicy.REQUIRE_ENCRYPT_REQUIRE_DECRYPT
+  options?: CommitmentPolicy | ClientOptions
 ): ReturnType<typeof buildEncrypt> & ReturnType<typeof buildDecrypt> {
   return {
-    ...buildEncrypt(commitmentPolicy),
-    ...buildDecrypt(commitmentPolicy),
+    ...buildEncrypt(options),
+    ...buildDecrypt(options),
   }
 }

modules/client-node/src/index.ts

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/decrypt-browser@2.1.0...@aws-crypto/decrypt-browser@2.2.0) (2021-05-27)
+
+**Note:** Version bump only for package @aws-crypto/decrypt-browser
+
+
+
+
+
+# [2.1.0](https://github.com/aws/aws-encryption-sdk-javascript/compare/@aws-crypto/decrypt-browser@2.0.0...@aws-crypto/decrypt-browser@2.1.0) (2021-02-04)
+
+**Note:** Version bump only for package @aws-crypto/decrypt-browser
+
+
+
+
+
 # [2.0.0](https://github.com/aws/private-aws-encryption-sdk-javascript-staging/compare/@aws-crypto/decrypt-browser@1.7.0...@aws-crypto/decrypt-browser@2.0.0) (2020-09-25)
 
 

modules/decrypt-browser/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@aws-crypto/decrypt-browser",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "scripts": {
     "prepublishOnly": "tsc -p tsconfig.json && tsc -p tsconfig.module.json",
     "lint": "run-s lint-*",
@@ -19,8 +19,8 @@
   "dependencies": {
     "@aws-crypto/material-management-browser": "file:../material-management-browser",
     "@aws-crypto/serialize": "file:../serialize",
-    "@aws-sdk/util-utf8-browser": "3.1.0",
-    "tslib": "^1.11.1"
+    "@aws-sdk/util-utf8-browser": "3.13.1",
+    "tslib": "^2.2.0"
   },
   "sideEffects": false,
   "main": "./build/main/index.js",