Skip to content

fix: CI encrypt/decrypt test vectors #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2019
Merged
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: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "aws-encryption-sdk-test-vectors"]
path = aws-encryption-sdk-test-vectors
url = git@github.com:awslabs/aws-encryption-sdk-test-vectors.git
url = https://github.com/awslabs/aws-encryption-sdk-test-vectors.git
2 changes: 1 addition & 1 deletion modules/integration-browser/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module.exports = function (config) {
customLaunchers: {
ChromeHeadlessDisableCors: {
base: 'ChromeHeadless',
flags: ['--disable-web-security']
flags: ['--disable-web-security', '--no-sandbox']
}
},
singleRun: true,
Expand Down
2 changes: 2 additions & 0 deletions modules/integration-browser/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ if (!existsSync(fixtures)) {

if (command === 'decrypt') {
const { vectorFile } = argv
const vectorPath = join(__dirname, vectorFile as string)
if (!existsSync(vectorPath)) throw new Error(`No file found at ${vectorPath}`)
// @ts-ignore
await buildDecryptFixtures(fixtures, vectorFile, testName, slice)
} else if (command === 'encrypt') {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"test": "npm run lint && npm run build && npm run coverage",
"integration-browser-decrypt": "npm run build; lerna run build_fixtures --stream --no-prefix -- -- decrypt -v $npm_package_config_localTestVectors --karma",
"integration-browser-encrypt": "npm run build; lerna run build_fixtures --stream --no-prefix -- -- encrypt -m $npm_package_config_encryptManifestList -k $npm_package_config_encryptKeyManifest -o $npm_package_config_decryptOracle --karma",
"integration-browser": "run-s integration-browser-*",
"browser-integration": "run-s integration-browser-*",
"integration-node-decrypt": "npm run build; lerna run integration_node --stream --no-prefix -- -- decrypt -v $npm_package_config_localTestVectors",
"integration-node-encrypt": "npm run build; lerna run integration_node --stream --no-prefix -- -- encrypt -m $npm_package_config_encryptManifestList -k $npm_package_config_encryptKeyManifest -o $npm_package_config_decryptOracle",
"integration-node": "run-s integration-node-*",
"node-integration": "run-s integration-node-*",
"integration": "run-s integration-*",
"test_conditions": "./util/bootstrap_tsconfig"
},
Expand Down