From 367b59b554bdeb9fb7daa3d4b91f86f07ddafddb Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 14 Jul 2023 13:43:53 -0700 Subject: [PATCH 1/7] chore(deps): bump aws-crypto dependencies --- modules/raw-aes-keyring-browser/package.json | 2 +- modules/raw-rsa-keyring-browser/package.json | 2 +- modules/web-crypto-backend/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/raw-aes-keyring-browser/package.json b/modules/raw-aes-keyring-browser/package.json index d85890bab..4aaba922e 100644 --- a/modules/raw-aes-keyring-browser/package.json +++ b/modules/raw-aes-keyring-browser/package.json @@ -19,7 +19,7 @@ "license": "Apache-2.0", "dependencies": { "@aws-crypto/material-management-browser": "file:../material-management-browser", - "@aws-crypto/random-source-browser": "1.0.0", + "@aws-crypto/random-source-browser": "5.0.0", "@aws-crypto/raw-keyring": "file:../raw-keyring", "@aws-crypto/serialize": "file:../serialize", "@aws-crypto/web-crypto-backend": "file:../web-crypto-backend", diff --git a/modules/raw-rsa-keyring-browser/package.json b/modules/raw-rsa-keyring-browser/package.json index 4afa4a937..1f76d3d3a 100644 --- a/modules/raw-rsa-keyring-browser/package.json +++ b/modules/raw-rsa-keyring-browser/package.json @@ -19,7 +19,7 @@ "license": "Apache-2.0", "dependencies": { "@aws-crypto/material-management-browser": "file:../material-management-browser", - "@aws-crypto/random-source-browser": "1.0.0", + "@aws-crypto/random-source-browser": "5.0.0", "@aws-crypto/raw-keyring": "file:../raw-keyring", "@aws-crypto/web-crypto-backend": "file:../web-crypto-backend", "@aws-sdk/util-base64-browser": "3.1.0", diff --git a/modules/web-crypto-backend/package.json b/modules/web-crypto-backend/package.json index 7a6ea54a1..4afe21d2d 100644 --- a/modules/web-crypto-backend/package.json +++ b/modules/web-crypto-backend/package.json @@ -20,7 +20,7 @@ "license": "Apache-2.0", "dependencies": { "@aws-crypto/ie11-detection": "1.0.0", - "@aws-crypto/supports-web-crypto": "1.0.0", + "@aws-crypto/supports-web-crypto": "5.0.0", "@aws-sdk/util-locate-window": "3.37.0", "tslib": "^2.2.0" }, From cfeee225667c367b92628674f33f98b9d22eb1b3 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 14 Jul 2023 13:44:12 -0700 Subject: [PATCH 2/7] chore: upgrade codebuild images --- buildspec.yml | 18 +++++++++--------- codebuild/release/prod-release.yml | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/buildspec.yml b/buildspec.yml index 3f8d21987..3f035dabb 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -6,44 +6,44 @@ batch: - identifier: testNodejs20 buildspec: codebuild/nodejs20.yml env: - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: testNodejs18 buildspec: codebuild/nodejs18.yml env: - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: testNodejs16 buildspec: codebuild/nodejs16.yml env: - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: testBrowser18 buildspec: codebuild/browser18.yml env: - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: compliance buildspec: codebuild/compliance.yml env: - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: testVectorsNodejs16 buildspec: codebuild/test_vectors/nodejs16.yml env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: testVectorsNodejs18 buildspec: codebuild/test_vectors/nodejs18.yml env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: testVectorsNodejs20 buildspec: codebuild/test_vectors/nodejs20.yml env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: testVectorsBrowser18 buildspec: codebuild/test_vectors/browser18.yml env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 diff --git a/codebuild/release/prod-release.yml b/codebuild/release/prod-release.yml index 3046d8803..04b77e3b9 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -12,7 +12,7 @@ batch: - identifier: testNodejs20 buildspec: codebuild/nodejs20.yml env: - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: testBrowser18 buildspec: codebuild/browser18.yml @@ -22,13 +22,13 @@ batch: env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: testVectorsBrowser18 buildspec: codebuild/test_vectors/browser18.yml env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 # Version the project and push git commits and tags - identifier: version @@ -54,7 +54,7 @@ batch: env: variables: PUBLISH_LOCAL: "false" - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: validateBrowser depend-on: - publish @@ -62,4 +62,4 @@ batch: env: variables: PUBLISH_LOCAL: "false" - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 From f8b409191c2d8c525bb8fec80c698b90cc920475 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 14 Jul 2023 13:46:36 -0700 Subject: [PATCH 3/7] chore(docs): update SUPPORT_POLICY --- SUPPORT_POLICY.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SUPPORT_POLICY.rst b/SUPPORT_POLICY.rst index 39c96bc20..e5093ce89 100644 --- a/SUPPORT_POLICY.rst +++ b/SUPPORT_POLICY.rst @@ -26,12 +26,16 @@ This table describes the current support status of each major version of the AWS - - * - 2.x - - Maintenance - End of Support - - 2023-03-02 + - + - * - 3.x - General Availability - - + * - 4.x + - General Availability + - + - .. _AWS SDKs and Tools Maintenance Policy: https://docs.aws.amazon.com/sdkref/latest/guide/maint-policy.html#version-life-cycle From f268c38d291c28d34f00d395a24e63a7f4249cbe Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 14 Jul 2023 14:18:25 -0700 Subject: [PATCH 4/7] update package-lock --- package-lock.json | 93 ++++++++++++++--------------------------------- 1 file changed, 28 insertions(+), 65 deletions(-) diff --git a/package-lock.json b/package-lock.json index c24516f52..f08eecf71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -616,7 +616,7 @@ "license": "Apache-2.0", "dependencies": { "@aws-crypto/material-management-browser": "file:../material-management-browser", - "@aws-crypto/random-source-browser": "1.0.0", + "@aws-crypto/random-source-browser": "5.0.0", "@aws-crypto/raw-keyring": "file:../raw-keyring", "@aws-crypto/serialize": "file:../serialize", "@aws-crypto/web-crypto-backend": "file:../web-crypto-backend", @@ -658,7 +658,7 @@ "license": "Apache-2.0", "dependencies": { "@aws-crypto/material-management-browser": "file:../material-management-browser", - "@aws-crypto/random-source-browser": "1.0.0", + "@aws-crypto/random-source-browser": "5.0.0", "@aws-crypto/raw-keyring": "file:../raw-keyring", "@aws-crypto/web-crypto-backend": "file:../web-crypto-backend", "@aws-sdk/util-base64-browser": "3.1.0", @@ -707,7 +707,7 @@ "license": "Apache-2.0", "dependencies": { "@aws-crypto/ie11-detection": "1.0.0", - "@aws-crypto/supports-web-crypto": "1.0.0", + "@aws-crypto/supports-web-crypto": "5.0.0", "@aws-sdk/util-locate-window": "3.37.0", "tslib": "^2.2.0" } @@ -726,9 +726,9 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "modules/web-crypto-backend/node_modules/@aws-crypto/supports-web-crypto": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-1.0.0.tgz", - "integrity": "sha512-IHLfv+WmVH89EW4n6a5eE8/hUlz6qkWGMn/v4r5ZgzcXdTC5nolii2z3k46y01hWRiC2PPhOdeSLzMUCUMco7g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.0.0.tgz", + "integrity": "sha512-sUdCftb1fT4NIIj++wp6ZjQ7dKnTFiyTcC4AgsGjNAPbYPSXm3Zgr0qIAGwZ3F0/K4VTR276LwK+wa0xn/kL/g==", "dependencies": { "tslib": "^1.11.1" } @@ -884,43 +884,23 @@ "link": true }, "node_modules/@aws-crypto/random-source-browser": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/random-source-browser/-/random-source-browser-1.0.0.tgz", - "integrity": "sha512-5FeVUHcCfkREPBpmbYN0ZkRCfIyvOCCkXlqQPBq8NsN7B/R+4uj0zjAyCAvU4k59xPrmNUC5UQc7zACYypPbeg==", - "dependencies": { - "@aws-crypto/ie11-detection": "^1.0.0", - "@aws-crypto/supports-web-crypto": "^1.0.0", - "@aws-sdk/util-locate-window": "^1.0.0-rc.1", - "tslib": "^1.11.1" - } - }, - "node_modules/@aws-crypto/random-source-browser/node_modules/@aws-crypto/ie11-detection": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-1.0.0.tgz", - "integrity": "sha512-kCKVhCF1oDxFYgQrxXmIrS5oaWulkvRcPz+QBDMsUr2crbF4VGgGT6+uQhSwJFdUAQ2A//Vq+uT83eJrkzFgXA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/random-source-browser/-/random-source-browser-5.0.0.tgz", + "integrity": "sha512-HC8eqq7d3tyG4cHRYWGaWqFiGdn6inea6jeIUAiWFnTiIIIQur+9i6UmwMdUP7ZWqMqkDWKJwmi9+YAq2rvztw==", "dependencies": { + "@aws-crypto/supports-web-crypto": "^5.0.0", + "@aws-sdk/util-locate-window": "^3.0.0", "tslib": "^1.11.1" } }, "node_modules/@aws-crypto/random-source-browser/node_modules/@aws-crypto/supports-web-crypto": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-1.0.0.tgz", - "integrity": "sha512-IHLfv+WmVH89EW4n6a5eE8/hUlz6qkWGMn/v4r5ZgzcXdTC5nolii2z3k46y01hWRiC2PPhOdeSLzMUCUMco7g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.0.0.tgz", + "integrity": "sha512-sUdCftb1fT4NIIj++wp6ZjQ7dKnTFiyTcC4AgsGjNAPbYPSXm3Zgr0qIAGwZ3F0/K4VTR276LwK+wa0xn/kL/g==", "dependencies": { "tslib": "^1.11.1" } }, - "node_modules/@aws-crypto/random-source-browser/node_modules/@aws-sdk/util-locate-window": { - "version": "1.0.0-rc.8", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-1.0.0-rc.8.tgz", - "integrity": "sha512-TvqeA4fgmZ0A0x3K+qVj/OSWEFHGZjzpVuyXlm1EYOf7NQ9VWRlokEn1MYKuL+t7al9ZeQyi16D8Dn7DW1eidw==", - "dependencies": { - "tslib": "^1.8.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/@aws-crypto/random-source-browser/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -19815,40 +19795,23 @@ } }, "@aws-crypto/random-source-browser": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/random-source-browser/-/random-source-browser-1.0.0.tgz", - "integrity": "sha512-5FeVUHcCfkREPBpmbYN0ZkRCfIyvOCCkXlqQPBq8NsN7B/R+4uj0zjAyCAvU4k59xPrmNUC5UQc7zACYypPbeg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/random-source-browser/-/random-source-browser-5.0.0.tgz", + "integrity": "sha512-HC8eqq7d3tyG4cHRYWGaWqFiGdn6inea6jeIUAiWFnTiIIIQur+9i6UmwMdUP7ZWqMqkDWKJwmi9+YAq2rvztw==", "requires": { - "@aws-crypto/ie11-detection": "^1.0.0", - "@aws-crypto/supports-web-crypto": "^1.0.0", - "@aws-sdk/util-locate-window": "^1.0.0-rc.1", + "@aws-crypto/supports-web-crypto": "^5.0.0", + "@aws-sdk/util-locate-window": "^3.0.0", "tslib": "^1.11.1" }, "dependencies": { - "@aws-crypto/ie11-detection": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-1.0.0.tgz", - "integrity": "sha512-kCKVhCF1oDxFYgQrxXmIrS5oaWulkvRcPz+QBDMsUr2crbF4VGgGT6+uQhSwJFdUAQ2A//Vq+uT83eJrkzFgXA==", - "requires": { - "tslib": "^1.11.1" - } - }, "@aws-crypto/supports-web-crypto": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-1.0.0.tgz", - "integrity": "sha512-IHLfv+WmVH89EW4n6a5eE8/hUlz6qkWGMn/v4r5ZgzcXdTC5nolii2z3k46y01hWRiC2PPhOdeSLzMUCUMco7g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.0.0.tgz", + "integrity": "sha512-sUdCftb1fT4NIIj++wp6ZjQ7dKnTFiyTcC4AgsGjNAPbYPSXm3Zgr0qIAGwZ3F0/K4VTR276LwK+wa0xn/kL/g==", "requires": { "tslib": "^1.11.1" } }, - "@aws-sdk/util-locate-window": { - "version": "1.0.0-rc.8", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-1.0.0-rc.8.tgz", - "integrity": "sha512-TvqeA4fgmZ0A0x3K+qVj/OSWEFHGZjzpVuyXlm1EYOf7NQ9VWRlokEn1MYKuL+t7al9ZeQyi16D8Dn7DW1eidw==", - "requires": { - "tslib": "^1.8.0" - } - }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -19860,7 +19823,7 @@ "version": "file:modules/raw-aes-keyring-browser", "requires": { "@aws-crypto/material-management-browser": "file:../material-management-browser", - "@aws-crypto/random-source-browser": "1.0.0", + "@aws-crypto/random-source-browser": "5.0.0", "@aws-crypto/raw-keyring": "file:../raw-keyring", "@aws-crypto/serialize": "file:../serialize", "@aws-crypto/web-crypto-backend": "file:../web-crypto-backend", @@ -19897,7 +19860,7 @@ "version": "file:modules/raw-rsa-keyring-browser", "requires": { "@aws-crypto/material-management-browser": "file:../material-management-browser", - "@aws-crypto/random-source-browser": "1.0.0", + "@aws-crypto/random-source-browser": "5.0.0", "@aws-crypto/raw-keyring": "file:../raw-keyring", "@aws-crypto/web-crypto-backend": "file:../web-crypto-backend", "@aws-sdk/util-base64-browser": "3.1.0", @@ -20014,7 +19977,7 @@ "version": "file:modules/web-crypto-backend", "requires": { "@aws-crypto/ie11-detection": "1.0.0", - "@aws-crypto/supports-web-crypto": "1.0.0", + "@aws-crypto/supports-web-crypto": "5.0.0", "@aws-sdk/util-locate-window": "3.37.0", "tslib": "^2.2.0" }, @@ -20035,9 +19998,9 @@ } }, "@aws-crypto/supports-web-crypto": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-1.0.0.tgz", - "integrity": "sha512-IHLfv+WmVH89EW4n6a5eE8/hUlz6qkWGMn/v4r5ZgzcXdTC5nolii2z3k46y01hWRiC2PPhOdeSLzMUCUMco7g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.0.0.tgz", + "integrity": "sha512-sUdCftb1fT4NIIj++wp6ZjQ7dKnTFiyTcC4AgsGjNAPbYPSXm3Zgr0qIAGwZ3F0/K4VTR276LwK+wa0xn/kL/g==", "requires": { "tslib": "^1.11.1" }, From 89043799e3b135b1b0a777fcf9b6802c80cb5cd9 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 17 Jul 2023 13:19:15 -0700 Subject: [PATCH 5/7] revert back to image 5.0 --- buildspec.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/buildspec.yml b/buildspec.yml index 3f035dabb..3f8d21987 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -6,44 +6,44 @@ batch: - identifier: testNodejs20 buildspec: codebuild/nodejs20.yml env: - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: testNodejs18 buildspec: codebuild/nodejs18.yml env: - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: testNodejs16 buildspec: codebuild/nodejs16.yml env: - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: testBrowser18 buildspec: codebuild/browser18.yml env: - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: compliance buildspec: codebuild/compliance.yml env: - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: testVectorsNodejs16 buildspec: codebuild/test_vectors/nodejs16.yml env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: testVectorsNodejs18 buildspec: codebuild/test_vectors/nodejs18.yml env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: testVectorsNodejs20 buildspec: codebuild/test_vectors/nodejs20.yml env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: testVectorsBrowser18 buildspec: codebuild/test_vectors/browser18.yml env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 From 533e0825335194effe64d36fb4d5e07f8c8996dd Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 17 Jul 2023 13:35:33 -0700 Subject: [PATCH 6/7] forgot one place --- codebuild/release/prod-release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/codebuild/release/prod-release.yml b/codebuild/release/prod-release.yml index 04b77e3b9..3046d8803 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -12,7 +12,7 @@ batch: - identifier: testNodejs20 buildspec: codebuild/nodejs20.yml env: - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: testBrowser18 buildspec: codebuild/browser18.yml @@ -22,13 +22,13 @@ batch: env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: testVectorsBrowser18 buildspec: codebuild/test_vectors/browser18.yml env: variables: PUBLISH_LOCAL: "true" - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 # Version the project and push git commits and tags - identifier: version @@ -54,7 +54,7 @@ batch: env: variables: PUBLISH_LOCAL: "false" - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 - identifier: validateBrowser depend-on: - publish @@ -62,4 +62,4 @@ batch: env: variables: PUBLISH_LOCAL: "false" - image: aws/codebuild/standard:6.0 + image: aws/codebuild/standard:5.0 From 65cd80eecdf54c4db8ff04bed301ca3b98eb7fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Corella?= <39066999+josecorella@users.noreply.github.com> Date: Mon, 17 Jul 2023 13:48:55 -0700 Subject: [PATCH 7/7] Update SUPPORT_POLICY.rst Co-authored-by: Tony Knapp <5892063+texastony@users.noreply.github.com> --- SUPPORT_POLICY.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SUPPORT_POLICY.rst b/SUPPORT_POLICY.rst index e5093ce89..593fdc6af 100644 --- a/SUPPORT_POLICY.rst +++ b/SUPPORT_POLICY.rst @@ -30,9 +30,9 @@ This table describes the current support status of each major version of the AWS - - * - 3.x - - General Availability - - - - + - Maintenance + - End of Support + - 2024-01-17 * - 4.x - General Availability -