From b52da300fbaefb8ce2b9a2ac530a950191fcf625 Mon Sep 17 00:00:00 2001 From: Ryan Emery Date: Fri, 16 Aug 2019 10:25:32 -0700 Subject: [PATCH 1/2] fix: CI encrypt/decrypt test vectors * add no-sandbox to integration-browser see: https://bugs.chromium.org/p/chromium/issues/detail?id=638180 * Update submodule to use https * change the names on integration to only run all tests once --- .gitmodules | 2 +- modules/integration-browser/karma.conf.js | 2 +- package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0bf7230c0..3fe7cc6fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/modules/integration-browser/karma.conf.js b/modules/integration-browser/karma.conf.js index 35aaae1a6..e76ed9d3e 100644 --- a/modules/integration-browser/karma.conf.js +++ b/modules/integration-browser/karma.conf.js @@ -47,7 +47,7 @@ module.exports = function (config) { customLaunchers: { ChromeHeadlessDisableCors: { base: 'ChromeHeadless', - flags: ['--disable-web-security'] + flags: ['--disable-web-security', '--no-sandbox'] } }, singleRun: true, diff --git a/package.json b/package.json index 1f4aecf4d..27186002c 100644 --- a/package.json +++ b/package.json @@ -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" }, From b01e567f6145fe6fe7a4c9d59853d4768a7c67bf Mon Sep 17 00:00:00 2001 From: Ryan Emery Date: Mon, 19 Aug 2019 12:19:45 -0700 Subject: [PATCH 2/2] better error? --- modules/integration-browser/src/cli.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/integration-browser/src/cli.ts b/modules/integration-browser/src/cli.ts index a767d875a..aace54ad9 100644 --- a/modules/integration-browser/src/cli.ts +++ b/modules/integration-browser/src/cli.ts @@ -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') {