refactor

Author: lucasmcdonald3

buildspec.yml

@@ -11,20 +11,20 @@ batch:
       buildspec: codebuild/py37/examples.yml
       env:
         image: aws/codebuild/standard:5.0
-    # - identifier: py37_awses_local
-    #   buildspec: codebuild/py37/awses_local.yml
-    #   env:
-    #     image: aws/codebuild/standard:5.0
-    # - identifier: py37_decrypt_dafny_esdk_vectors
-    #   buildspec: codebuild/py37/decrypt_dafny_esdk_vectors.yml
-    #   env:
-    #     image: aws/codebuild/standard:5.0
+    - identifier: py37_decrypt_dafny_esdk_vectors
+      buildspec: codebuild/py37/decrypt_dafny_esdk_vectors.yml
+      env:
+        image: aws/codebuild/standard:5.0
     - identifier: py37_decrypt_net_401_vectors
       buildspec: codebuild/py37/decrypt_net_401_vectors.yml
       env:
         image: aws/codebuild/standard:5.0
-    - identifier: py37_generate_decrypt_vectors
-      buildspec: codebuild/py37/generate_decrypt_vectors.yml
+    - identifier: py37_encrypt_masterkey
+      buildspec: codebuild/py37/encrypt_masterkey.yml
+      env:
+        image: aws/codebuild/standard:5.0
+    - identifier: py37_generate_decrypt_vectors_masterkey
+      buildspec: codebuild/py37/generate_decrypt_vectors_masterkey.yml
       env:
         image: aws/codebuild/standard:5.0
     - identifier: py37_decrypt_masterkey_with_masterkey

codebuild/py37/encrypt_masterkey.yml

@@ -0,0 +1,33 @@
+version: 0.2
+
+env:
+  variables:
+    TOXENV: "py37-full_decrypt"
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
+      arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >-
+      arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >-
+      arn:aws:kms:us-west-2:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_2: >-
+      arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
+    AWS_ENCRYPTION_SDK_PYTHON_DECRYPT_ORACLE_API_DEPLOYMENT_ID: "xi1mwx3ttb"
+    AWS_ENCRYPTION_SDK_PYTHON_DECRYPT_ORACLE_REGION: "us-west-2"
+
+phases:
+  install:
+    runtime-versions:
+      python: 3.7
+  pre_build:
+    commands:
+      # Download generated vectors
+      # TODO rewrite URL
+      - aws s3 cp s3://generated-vectors-artifacts-bucket/$CODEBUILD_RESOLVED_SOURCE_VERSION/37_masterkey.zip 37_masterkey.zip
+      - unzip 37_masterkey.zip
+  build:
+    commands:
+      - pip install "tox < 4.0"
+      - cd test_vector_handlers
+      - |
+        tox -- \
+          --input ../37_masterkey/manifest.json

codebuild/py37/generate_decrypt_vectors.yml renamed to codebuild/py37/generate_decrypt_vectors_masterkey.yml

@@ -58,6 +58,7 @@ commands =
     mplvectors: {[testenv:base-command]commands} test/mpl
     full_decrypt_generate: awses-full-message-decrypt-generate {posargs}
     full_decrypt: awses-full-message-decrypt {posargs}
+    full_encrypt: awses-full-message-encrypt {posargs}
 
 [testenv:full-encrypt]
 basepython = python3