Skip to content

Commit caf772e

Browse files
author
Lucas McDonald
committed
fix(release): inline integration config so npm 12 can run scripts
npm 12 rejects the package.json 'config' keys as unknown config, breaking every 'npm run'. Inline the four values into the scripts and drop the block.
1 parent f0f6548 commit caf772e

1 file changed

Lines changed: 9 additions & 15 deletions

File tree

‎package.json‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,23 @@
3434
"coverage": "run-s coverage-*",
3535
"report-coverage": "nyc report --extension .ts --check-coverage -r html",
3636
"test": "npm run build && npm run coverage",
37-
"integration-browser-decrypt": "npm run build; integration-browser decrypt -v $npm_package_config_localTestVectors --karma -c cpu",
38-
"integration-browser-encrypt": "npm run build; integration-browser encrypt -m $npm_package_config_encryptManifestList -k $npm_package_config_encryptKeyManifest -o $npm_package_config_decryptOracle --karma -c cpu",
37+
"integration-browser-decrypt": "npm run build; integration-browser decrypt -v aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0.zip --karma -c cpu",
38+
"integration-browser-encrypt": "npm run build; integration-browser encrypt -m https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0003-awses-message-encryption.v1.json -k https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0002-keys.v1.json -o https://xi1mwx3ttb.execute-api.us-west-2.amazonaws.com/api/v0/decrypt --karma -c cpu",
3939
"browser-integration": "run-s integration-browser-*",
40-
"integration-node-decrypt": "npm run build; integration-node decrypt -v $npm_package_config_localTestVectors -c cpu",
41-
"integration-node-decrypt-legacy": "node --security-revert=CVE-2023-46809 ./modules/integration-node/build/main/src/cli.js decrypt -v $npm_package_config_localTestVectors -c cpu --CVE-2023-46809",
42-
"integration-node-encrypt": "npm run build; integration-node encrypt -m $npm_package_config_encryptManifestList -k $npm_package_config_encryptKeyManifest -o $npm_package_config_decryptOracle -c cpu",
40+
"integration-node-decrypt": "npm run build; integration-node decrypt -v aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0.zip -c cpu",
41+
"integration-node-decrypt-legacy": "node --security-revert=CVE-2023-46809 ./modules/integration-node/build/main/src/cli.js decrypt -v aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0.zip -c cpu --CVE-2023-46809",
42+
"integration-node-encrypt": "npm run build; integration-node encrypt -m https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0003-awses-message-encryption.v1.json -k https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0002-keys.v1.json -o https://xi1mwx3ttb.execute-api.us-west-2.amazonaws.com/api/v0/decrypt -c cpu",
4343
"node-integration": "run-s integration-node-*",
4444
"integration": "run-s integration-*",
4545
"verdaccio": "run-s verdaccio-*",
4646
"verdaccio-publish": "./util/local_verdaccio_publish",
47-
"verdaccio-browser-decrypt": "./util/npx_verdaccio @aws-crypto/integration-browser decrypt -v $PWD/$npm_package_config_localTestVectors --karma -c cpu",
48-
"verdaccio-browser-encrypt": "./util/npx_verdaccio @aws-crypto/integration-browser encrypt -m $npm_package_config_encryptManifestList -k $npm_package_config_encryptKeyManifest -o $npm_package_config_decryptOracle --karma -c cpu",
49-
"verdaccio-node-decrypt": "./util/npx_verdaccio @aws-crypto/integration-node decrypt -v $PWD/$npm_package_config_localTestVectors -c cpu",
50-
"verdaccio-node-encrypt": "./util/npx_verdaccio @aws-crypto/integration-node encrypt -m $npm_package_config_encryptManifestList -k $npm_package_config_encryptKeyManifest -o $npm_package_config_decryptOracle -c cpu",
47+
"verdaccio-browser-decrypt": "./util/npx_verdaccio @aws-crypto/integration-browser decrypt -v $PWD/aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0.zip --karma -c cpu",
48+
"verdaccio-browser-encrypt": "./util/npx_verdaccio @aws-crypto/integration-browser encrypt -m https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0003-awses-message-encryption.v1.json -k https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0002-keys.v1.json -o https://xi1mwx3ttb.execute-api.us-west-2.amazonaws.com/api/v0/decrypt --karma -c cpu",
49+
"verdaccio-node-decrypt": "./util/npx_verdaccio @aws-crypto/integration-node decrypt -v $PWD/aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0.zip -c cpu",
50+
"verdaccio-node-encrypt": "./util/npx_verdaccio @aws-crypto/integration-node encrypt -m https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0003-awses-message-encryption.v1.json -k https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0002-keys.v1.json -o https://xi1mwx3ttb.execute-api.us-west-2.amazonaws.com/api/v0/decrypt -c cpu",
5151
"test_conditions": "./aws-encryption-sdk-specification/util/test_conditions -s 'modules/**/src/*.ts' -t 'modules/**/test/*.ts' -s 'compliance_exceptions/*.ts'",
5252
"duvet-report": "aws-encryption-sdk-specification/util/report.js modules/**/src/**/*.ts modules/**/test/**/*.ts compliance_exceptions/*.ts"
5353
},
54-
"config": {
55-
"localTestVectors": "aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0.zip",
56-
"encryptManifestList": "https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0003-awses-message-encryption.v1.json",
57-
"encryptKeyManifest": "https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0002-keys.v1.json",
58-
"decryptOracle": "https://xi1mwx3ttb.execute-api.us-west-2.amazonaws.com/api/v0/decrypt"
59-
},
6054
"repository": {
6155
"type": "git",
6256
"url": "https://github.com/aws/aws-encryption-sdk-javascript.git"

0 commit comments

Comments
 (0)