feedback

Author: seebees

.gitignore

@@ -47,4 +47,5 @@ package.json.decrypt
 # they track the package.json version
 /modules/kms-keyring-browser/src/version.ts
 /modules/kms-keyring-node/src/version.ts
-/modules/branch-keystore-node/src/version.ts
+/modules/branch-keystore-node/src/version.ts
+/modules/integration-node/src/version.ts

modules/integration-node/package.json

@@ -2,6 +2,8 @@
   "name": "@aws-crypto/integration-node",
   "version": "4.1.0",
   "scripts": {
+    "prepublishOnly": "npm run generate-version.ts; npm run build",
+    "generate-version.ts": "npx genversion --es6  src/version.ts",
     "build": "tsc -b tsconfig.json",
     "lint": "run-s lint-*",
     "lint-eslint": "eslint src/*.ts test/*.ts",

modules/integration-node/src/constants.ts

@@ -0,0 +1,10 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export const KEYS_MANIFEST_NAME_FILENAME = 'keys.json'
+export const MANIFEST_NAME_FILENAME = 'manifest.json'
+export const DECRYPT_MANIFEST_TYPE = 'awses-decrypt'
+export const DECRYPT_MANIFEST_CLIENT_NAME = 'aws/aws-encryption-sdk-javascript'
+export const MANIFEST_URI_PREFIX = 'file://'
+export const MANIFEST_PLAINTEXT_PATH = 'plaintexts/'
+export const MANIFEST_CIPHERTEXT_PATH = 'ciphertexts/'

modules/integration-node/src/get_encrypt_test_iterator.ts

@@ -15,6 +15,10 @@ import { URL } from 'url'
 import { readFileSync } from 'fs'
 import got from 'got'
 import { ZipFile } from 'yazl'
+import {
+  KEYS_MANIFEST_NAME_FILENAME,
+  MANIFEST_PLAINTEXT_PATH,
+} from './constants'
 
 export async function getEncryptTestVectorIterator(
   manifestFile: string,
@@ -40,7 +44,7 @@ export function _getEncryptTestVectorIterator(
     // has all the keys required for decrypt.
     manifestZip.addBuffer(
       Buffer.from(JSON.stringify(keysManifest)),
-      `keys.json`
+      `${KEYS_MANIFEST_NAME_FILENAME}`
     )
   }
   const { keys } = keysManifest
@@ -50,7 +54,10 @@ export function _getEncryptTestVectorIterator(
     plaintextBytes[name] = randomBytes(plaintexts[name])
 
     if (manifestZip) {
-      manifestZip.addBuffer(plaintextBytes[name], `plaintexts/${name}`)
+      manifestZip.addBuffer(
+        plaintextBytes[name],
+        `${MANIFEST_PLAINTEXT_PATH}${name}`
+      )
     }
   })
 

modules/integration-node/src/integration_tests.ts

@@ -23,6 +23,7 @@ import {
   needs,
   DecryptOutput,
 } from '@aws-crypto/client-node'
+import { version } from './version'
 import { URL } from 'url'
 import got from 'got'
 import streamToPromise from 'stream-to-promise'
@@ -34,6 +35,15 @@ import { createWriteStream } from 'fs'
 import { v4 } from 'uuid'
 import * as stream from 'stream'
 import * as util from 'util'
+import {
+  DECRYPT_MANIFEST_CLIENT_NAME,
+  DECRYPT_MANIFEST_TYPE,
+  KEYS_MANIFEST_NAME_FILENAME,
+  MANIFEST_CIPHERTEXT_PATH,
+  MANIFEST_NAME_FILENAME,
+  MANIFEST_PLAINTEXT_PATH,
+  MANIFEST_URI_PREFIX,
+} from './constants'
 const pipeline = util.promisify(stream.pipeline)
 
 const notSupportedEncryptMessages = [
@@ -231,15 +241,14 @@ function decryptionManifestEncryptResults(
   const manifestZip = new ZipFile()
   const manifest: DecryptManifestList = {
     manifest: {
-      type: 'awses-decrypt',
-      version: 1,
+      type: `${DECRYPT_MANIFEST_TYPE}`,
+      version: 2,
     },
     client: {
-      name: 'aws/aws-encryption-sdk-javascript',
-      //Get the right version
-      version: '2.2.0',
+      name: `${DECRYPT_MANIFEST_CLIENT_NAME}`,
+      version,
     },
-    keys: 'file://keys.json',
+    keys: `${MANIFEST_URI_PREFIX}${KEYS_MANIFEST_NAME_FILENAME}`,
     tests: {},
   }
   manifestZip.outputStream.pipe(createWriteStream(manifestPath))
@@ -252,7 +261,7 @@ function decryptionManifestEncryptResults(
       // as close the zip file.
       manifestZip.addBuffer(
         Buffer.from(JSON.stringify(manifest)),
-        `manifest.json`
+        `${MANIFEST_NAME_FILENAME}`
       )
       manifestZip.end()
     },
@@ -265,15 +274,18 @@ function decryptionManifestEncryptResults(
   ): Promise<boolean> {
     const testName = v4()
 
-    manifestZip.addBuffer(encryptResult, `ciphertexts/${testName}`)
+    manifestZip.addBuffer(
+      encryptResult,
+      `${MANIFEST_CIPHERTEXT_PATH}${testName}`
+    )
 
     manifest.tests[testName] = {
       description: `Decrypt vector from ${info.name}`,
-      ciphertext: `file://ciphertexts/${testName}`,
+      ciphertext: `${MANIFEST_URI_PREFIX}${MANIFEST_CIPHERTEXT_PATH}${testName}`,
       'master-keys': info.keysInfo.map((info) => info[0]),
       result: {
         output: {
-          plaintext: `file://plaintexts/${info.plaintextName}`,
+          plaintext: `${MANIFEST_URI_PREFIX}${MANIFEST_PLAINTEXT_PATH}${info.plaintextName}`,
         },
       },
     }