Skip to content

Commit 3b0bd60

Browse files
committed
build: allow for encryption of multiple files
1 parent d79b022 commit 3b0bd60

File tree

7 files changed

+12
-13
lines changed

7 files changed

+12
-13
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ test/resources/auth.js
77
test/resources/-auth.js # to make sure tests run without the auth file
88
test/resources/tts-output.ogg
99
test/resources/visual_recognition.prepop/images
10-
test/resources/cc_bucket_input_auth_file.json
11-
test/resources/cc_bucket_output_auth_file.json
10+
test/resources/cc_input_auth_file.json
11+
test/resources/cc_output_auth_file.json
12+
test/resources/secrets.tar
1213
.idea
1314
doc/
1415
.vscode/

.travis.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,16 @@ node_js:
55
- 8
66
before_install:
77
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_ac3aacad7ba8_key -iv $encrypted_ac3aacad7ba8_iv
8-
-in encrypted-files/cc_bucket_output_auth_file.json.enc -out test/resources/cc_bucket_output_auth_file.json
9-
-d || true'
10-
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_ac3aacad7ba8_key -iv $encrypted_ac3aacad7ba8_iv
11-
-in encrypted-files/cc_bucket_input_auth_file.json.enc -out test/resources/cc_bucket_input_auth_file.json
12-
-d || true'
13-
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_ac3aacad7ba8_key
14-
-iv $encrypted_ac3aacad7ba8_iv -in encrypted-files/auth.js.enc -out test/resources/auth.js -d || true'
8+
-in secrets.tar.enc -out test/resources/secrets.tar -d || true'
9+
- cd test/resources/ && tar xvf secrets.tar && cd ../..
1510
- npm install -g typescript
1611
script:
1712
- tsc
18-
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then npm run test-travis; else npm run
19-
test-unit-travis; fi
13+
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ];
14+
then npm run test-travis;
15+
else
16+
npm run test-unit-travis;
17+
fi
2018
- sh scripts/typedoc/generate_typedoc.sh
2119
after_success:
2220
- npm run report-coverage

encrypted-files/auth.js.enc

-5.69 KB
Binary file not shown.
-976 Bytes
Binary file not shown.
-976 Bytes
Binary file not shown.

secrets.tar.enc

20 KB
Binary file not shown.

test/integration/compare_comply.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,12 @@ describe('batches', () => {
225225
const params = {
226226
_function: 'html_conversion',
227227
input_credentials_file: fs.createReadStream(
228-
__dirname + '/../resources/cc_bucket_input_auth_file.json'
228+
__dirname + '/../resources/cc_input_auth_file.json'
229229
),
230230
input_bucket_location: 'us-south',
231231
input_bucket_name: 'compare-comply-integration-test-bucket-input',
232232
output_credentials_file: fs.createReadStream(
233-
__dirname + '/../resources/cc_bucket_output_auth_file.json'
233+
__dirname + '/../resources/cc_output_auth_file.json'
234234
),
235235
output_bucket_location: 'us-south',
236236
output_bucket_name: 'compare-comply-integration-test-bucket-output',

0 commit comments

Comments
 (0)