Skip to content

Commit 65b1eec

Browse files
ShubhamChaturvedi7ShubhamChaturvedi7
authored
Merge branch 'master' into shubhamchaturvedi7/cfn_template
2 parents e6747a5 + fb10180 commit 65b1eec

File tree

168 files changed

+23144
-22420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+23144
-22420
lines changed

‎.eslintrc.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ module.exports = {
8080
'@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': false }],
8181
// This rule fights with Prettier and no-semi
8282
'@typescript-eslint/no-extra-semi': 'off',
83+
// Added in later versions of @typescript-eslint
84+
'@typescript-eslint/explicit-module-boundary-types': 'off',
85+
'@typescript-eslint/no-unused-vars': 'off',
8386
},
8487
// This is a good rule,
8588
// but in many tests,

‎.github/workflows/ci.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# This workflow performs tests in JavaScript.
2+
name: ESDK JavaScript CI Tests
3+
4+
on: [pull_request, workflow_call]
5+
6+
jobs:
7+
CI:
8+
strategy:
9+
matrix:
10+
node: [18.x, 20.x, 22.x, latest]
11+
fail-fast: false
12+
runs-on: codebuild-AWS-ESDK-JS-Release-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-5.0-large
13+
permissions:
14+
id-token: write
15+
contents: read
16+
defaults:
17+
run:
18+
shell: bash
19+
steps:
20+
- uses: actions/checkout@v4
21+
with:
22+
submodules: true
23+
- uses: actions/setup-node@v4
24+
with:
25+
node-version: ${{matrix.node}}
26+
- name: Configure AWS Credentials for Tests
27+
uses: aws-actions/configure-aws-credentials@v4
28+
with:
29+
aws-region: us-west-2
30+
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-MPL-Dafny-Role-us-west-2
31+
role-session-name: JavaScriptTests
32+
- name: Test Coverage Node ${{matrix.node}}
33+
env:
34+
NODE_OPTIONS: "--max-old-space-size=4096"
35+
run: |
36+
npm ci
37+
npm run build
38+
npm run coverage-node
39+
- name: Test Coverage Browser ${{matrix.node}}
40+
env:
41+
NODE_OPTIONS: "--max-old-space-size=4096"
42+
run: |
43+
npm run coverage-browser
44+
- name: Test compliance
45+
env:
46+
NODE_OPTIONS: "--max-old-space-size=4096"
47+
run: |
48+
npm run lint
49+
npm run test_conditions
50+
- name: Run Test Vectors Node ${{matrix.node}}
51+
env:
52+
NODE_OPTIONS: "--max-old-space-size=4096"
53+
NPM_CONFIG_UNSAFE_PERM: true
54+
PUBLISH_LOCAL: true
55+
run: |
56+
npm run verdaccio-publish
57+
npm run verdaccio-node-decrypt
58+
npm run verdaccio-node-encrypt
59+
- name: Run Test Vectors Browser node ${{matrix.node}}
60+
env:
61+
NODE_OPTIONS: "--max-old-space-size=4096"
62+
NPM_CONFIG_UNSAFE_PERM: true
63+
PUBLISH_LOCAL: true
64+
run: |
65+
npm run verdaccio-publish
66+
npm run verdaccio-browser-decrypt
67+
npm run verdaccio-browser-encrypt

‎.github/workflows/daily_ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This workflow runs every weekday at 15:00 UTC (8AM PDT)
2+
name: Daily CI
3+
4+
on:
5+
schedule:
6+
- cron: "00 15 * * 1-5"
7+
8+
jobs:
9+
DAILY_CI:
10+
# Don't run the cron builds on forks
11+
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
12+
uses: ./.github/workflows/ci.yml

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@ package.json.decrypt
4747
# they track the package.json version
4848
/modules/kms-keyring-browser/src/version.ts
4949
/modules/kms-keyring-node/src/version.ts
50+
/modules/branch-keystore-node/src/version.ts
51+
/modules/integration-node/src/version.ts

‎.gitmodules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
[submodule "aws-encryption-sdk-specification"]
55
path = aws-encryption-sdk-specification
66
url = https://github.com/awslabs/aws-encryption-sdk-specification.git
7+
branch = master

‎CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,39 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [4.2.1](https://github.com/awslabs/aws-encryption-sdk-javascript/compare/v4.2.0...v4.2.1) (2025-04-10)
7+
8+
### Bug Fixes
9+
10+
- add serializationOptions flag for AAD UTF8 sorting ([#1581](https://github.com/awslabs/aws-encryption-sdk-javascript/issues/1581)) ([b80cad1](https://github.com/awslabs/aws-encryption-sdk-javascript/commit/b80cad14df361b4384aeed5753efb57c69d77377))
11+
12+
# [4.2.0](https://github.com/awslabs/aws-encryption-sdk-javascript/compare/v4.1.0...v4.2.0) (2025-02-27)
13+
14+
### Bug Fixes
15+
16+
- include uuid as a dependency in material-management ([#1564](https://github.com/awslabs/aws-encryption-sdk-javascript/issues/1564)) ([dee213b](https://github.com/awslabs/aws-encryption-sdk-javascript/commit/dee213bc91dd0cde8dd177da52b739e10129f514))
17+
18+
### Features
19+
20+
- integration-node can produce decrypt manifests ([#1580](https://github.com/awslabs/aws-encryption-sdk-javascript/issues/1580)) ([95f0fa1](https://github.com/awslabs/aws-encryption-sdk-javascript/commit/95f0fa10b7d94ccc142fc2e89b2ffa49620285c9))
21+
22+
# [4.1.0](https://github.com/awslabs/aws-encryption-sdk-javascript/compare/v4.0.2...v4.1.0) (2025-01-16)
23+
24+
### Features
25+
26+
- Adding the hierarchical keyring ([#1537](https://github.com/awslabs/aws-encryption-sdk-javascript/issues/1537)) ([43dcb16](https://github.com/awslabs/aws-encryption-sdk-javascript/commit/43dcb166d5ac76d744ea283808006f65915b9730))
27+
28+
## [4.0.2](https://github.com/awslabs/aws-encryption-sdk-javascript/compare/v4.0.1...v4.0.2) (2024-10-21)
29+
30+
**Note:** Version bump only for package aws-encryption-sdk-javascript
31+
32+
## [4.0.1](https://github.com/awslabs/aws-encryption-sdk-javascript/compare/v4.0.0...v4.0.1) (2024-07-30)
33+
34+
### Bug Fixes
35+
36+
- Add CVE-2023-46809 option to integration node ([#1424](https://github.com/awslabs/aws-encryption-sdk-javascript/issues/1424)) ([84a7034](https://github.com/awslabs/aws-encryption-sdk-javascript/commit/84a703440aa7313ad0c779e50b7c052aa8dd5e7b))
37+
- **CI:** npx_verdaccio ([#1190](https://github.com/awslabs/aws-encryption-sdk-javascript/issues/1190)) ([1051f19](https://github.com/awslabs/aws-encryption-sdk-javascript/commit/1051f19578ba54bc476a30dedf5779576cf46d9f))
38+
639
# [4.0.0](https://github.com/awslabs/aws-encryption-sdk-javascript/compare/v3.2.2...v4.0.0) (2023-07-17)
740

841
- feat!: Remove AWS SDK V2 Dependency (#1180) ([1d74248](https://github.com/awslabs/aws-encryption-sdk-javascript/commit/1d742489b436748a656ecc2abce00e99353d1d62)), closes [#1180](https://github.com/awslabs/aws-encryption-sdk-javascript/issues/1180)

‎aws-encryption-sdk-specification

‎codebuild/nodejs20.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,15 @@ env:
55
NODE_OPTIONS: "--max-old-space-size=4096"
66

77
phases:
8-
install:
8+
install:
99
commands:
10+
- TMP_ROLE=$(aws sts assume-role --role-arn "arn:aws:iam::370957321024:role/GitHub-CI-MPL-Dafny-Role-us-west-2" --role-session-name "CB-TestVectorResources")
11+
- export TMP_ROLE
12+
- export AWS_ACCESS_KEY_ID=$(echo "${TMP_ROLE}" | jq -r '.Credentials.AccessKeyId')
13+
- export AWS_SECRET_ACCESS_KEY=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SecretAccessKey')
14+
- export AWS_SESSION_TOKEN=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SessionToken')
15+
- aws sts get-caller-identity
16+
1017
- n 20
1118
- node --version ; npm --version
1219
- npm ci --unsafe-perm

‎karma.conf.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ function createCredentialPreprocessor() {
127127
// This will affect the generated (ES5) JS
128128
const regionCode = `var defaultRegion = '${region}';`
129129
const credentialsCode = `var credentials = ${JSON.stringify(credentials)};`
130+
// See: https://github.com/aws/aws-sdk-js-v3/issues/5890
131+
const expirationNeedsToBeDate = `credentials.expiration = new Date(credentials.expiration);`
130132
const isBrowser = `var isBrowser = true;`
131133
const contents = content.split('\n')
132134
let idx = -1
@@ -137,7 +139,7 @@ function createCredentialPreprocessor() {
137139
break
138140
}
139141
}
140-
contents.splice(idx + 1, 0, regionCode, credentialsCode, isBrowser)
142+
contents.splice(idx + 1, 0, regionCode, credentialsCode, expirationNeedsToBeDate, isBrowser)
141143
done(contents.join('\n'))
142144
}
143145
}

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"packages": ["modules/*"],
3-
"version": "4.0.0",
3+
"version": "4.2.1",
44
"command": {
55
"bootstrap": {
66
"nohoist": ["typedoc"]

0 commit comments

Comments
 (0)