Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci_static-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Upgrade setuptools
run: python -m pip install "setuptools<81"
- name: not-grep
uses: mattsb42-meta/not-grep@1.0.0
2 changes: 1 addition & 1 deletion .github/workflows/shared-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: ['18.x', '20.x', '22.x', 'latest']
node-version: ['22.x', 'latest']
test-type: ['node', 'browser']
# Determine test categories based on whether testing published packages or source code:
# - Testing published packages: only run vector tests (don't have build artifacts to test coverage or compliance)
Expand Down
30 changes: 0 additions & 30 deletions buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,10 @@ version: 0.2
batch:
fast-fail: false
build-list:
- identifier: testNodejs20
buildspec: codebuild/nodejs20.yml
env:
image: aws/codebuild/standard:5.0
- identifier: testNodejs18
buildspec: codebuild/nodejs18.yml
env:
image: aws/codebuild/standard:5.0
- identifier: testNodejs16
buildspec: codebuild/nodejs16.yml
env:
image: aws/codebuild/standard:5.0
- identifier: testBrowser18
buildspec: codebuild/browser18.yml
env:
image: aws/codebuild/standard:5.0
- identifier: compliance
buildspec: codebuild/compliance.yml
env:
Expand All @@ -29,21 +17,3 @@ batch:
variables:
PUBLISH_LOCAL: "true"
image: aws/codebuild/standard:5.0
- identifier: testVectorsNodejs18
buildspec: codebuild/test_vectors/nodejs18.yml
env:
variables:
PUBLISH_LOCAL: "true"
image: aws/codebuild/standard:5.0
- identifier: testVectorsNodejs20
buildspec: codebuild/test_vectors/nodejs20.yml
env:
variables:
PUBLISH_LOCAL: "true"
image: aws/codebuild/standard:5.0
- identifier: testVectorsBrowser18
buildspec: codebuild/test_vectors/browser18.yml
env:
variables:
PUBLISH_LOCAL: "true"
image: aws/codebuild/standard:5.0
17 changes: 0 additions & 17 deletions codebuild/browser18.yml

This file was deleted.

19 changes: 0 additions & 19 deletions codebuild/nodejs18.yml

This file was deleted.

23 changes: 0 additions & 23 deletions codebuild/nodejs20.yml

This file was deleted.

32 changes: 7 additions & 25 deletions codebuild/release/prod-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,14 @@ batch:
buildspec: codebuild/compliance.yml

# Unit Tests
- identifier: testNodejs20
buildspec: codebuild/nodejs20.yml
- identifier: testNodejs16
buildspec: codebuild/nodejs16.yml
env:
image: aws/codebuild/standard:5.0
- identifier: testBrowser18
buildspec: codebuild/browser18.yml

# Integration Tests
- identifier: testVectorsNodejs20
buildspec: codebuild/test_vectors/nodejs20.yml
env:
variables:
PUBLISH_LOCAL: "true"
image: aws/codebuild/standard:5.0
- identifier: testVectorsBrowser18
buildspec: codebuild/test_vectors/browser18.yml
- identifier: testVectorsNodejs16
buildspec: codebuild/test_vectors/nodejs16.yml
env:
variables:
PUBLISH_LOCAL: "true"
Expand All @@ -34,10 +26,8 @@ batch:
- identifier: version
depend-on:
- compliance
- testNodejs20
- testBrowser18
- testVectorsNodejs20
- testVectorsBrowser18
- testNodejs16
- testVectorsNodejs16
buildspec: codebuild/release/version.yml
env:
image: aws/codebuild/standard:6.0
Expand All @@ -54,15 +44,7 @@ batch:
- identifier: validateNodejs
depend-on:
- publish
buildspec: codebuild/test_vectors/nodejs20.yml
env:
variables:
PUBLISH_LOCAL: "false"
image: aws/codebuild/standard:5.0
- identifier: validateBrowser
depend-on:
- publish
buildspec: codebuild/test_vectors/browser18.yml
buildspec: codebuild/test_vectors/nodejs16.yml
env:
variables:
PUBLISH_LOCAL: "false"
Expand Down
26 changes: 0 additions & 26 deletions codebuild/test_vectors/browser18.yml

This file was deleted.

25 changes: 0 additions & 25 deletions codebuild/test_vectors/nodejs18.yml

This file was deleted.

25 changes: 0 additions & 25 deletions codebuild/test_vectors/nodejs20.yml

This file was deleted.

1 change: 0 additions & 1 deletion modules/web-crypto-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-crypto/ie11-detection": "4.0.0",
"@aws-crypto/supports-web-crypto": "5.2.0",
"@aws-sdk/util-locate-window": "3.310.0",
"tslib": "^2.2.0"
Expand Down
3 changes: 0 additions & 3 deletions modules/web-crypto-backend/src/backend-factory.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

import { isMsWindow } from '@aws-crypto/ie11-detection'
import {
supportsWebCrypto,
supportsSubtleCrypto,
supportsZeroByteGCM,
} from '@aws-crypto/supports-web-crypto'
import { generateSynchronousRandomValues } from './synchronous_random_values'
import promisifyMsSubtleCrypto from './promisify-ms-crypto'

type MaybeSubtleCrypto = SubtleCrypto | false
export type WebCryptoBackend =
Expand Down Expand Up @@ -140,7 +138,6 @@ export function pluckSubtleCrypto(window: Window): MaybeSubtleCrypto {
// if needed webkitSubtle check should be added here
// see: https://webkit.org/blog/7790/update-on-web-cryptography/
if (supportsWebCrypto(window)) return window.crypto.subtle
if (isMsWindow(window)) return promisifyMsSubtleCrypto(window.msCrypto.subtle)
return false
}

Expand Down
38 changes: 0 additions & 38 deletions modules/web-crypto-backend/src/promisify-ms-crypto.ts

This file was deleted.

5 changes: 0 additions & 5 deletions modules/web-crypto-backend/src/synchronous_random_values.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

import { isMsWindow } from '@aws-crypto/ie11-detection'
import { supportsSecureRandom } from '@aws-crypto/supports-web-crypto'
import { locateWindow } from '@aws-sdk/util-locate-window'

Expand All @@ -19,10 +18,6 @@ export function generateSynchronousRandomValues(
return function synchronousRandomValues(byteLength: number): Uint8Array {
if (supportsSecureRandom(globalScope)) {
return globalScope.crypto.getRandomValues(new Uint8Array(byteLength))
} else if (isMsWindow(globalScope)) {
const values = new Uint8Array(byteLength)
globalScope.msCrypto.getRandomValues(values)
return values
}

throw new Error(`Unable to locate a secure random source.`)
Expand Down
Loading