clean37

Author: lucasmcdonald3

codebuild/py37/decrypt_masterkey_with_js.yml

@@ -10,9 +10,6 @@ env:
       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
-    GENERATE_OUTPUT_DIR: >-
-      $CODEBUILD_SRC_DIR/generated_vectors/
-
 
 phases:
   install:
@@ -25,17 +22,8 @@ phases:
 
   pre_build:
     commands:
-      # Assume Role to access non-prod resources
-      # - TMP_ROLE=$(aws sts assume-role --role-arn "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Python-Role-us-west-2" --role-session-name "CB-TestVectorResources")
-      # - export TMP_ROLE
-      # - export AWS_ACCESS_KEY_ID=$(echo "${TMP_ROLE}" | jq -r '.Credentials.AccessKeyId')
-      # - export AWS_SECRET_ACCESS_KEY=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SecretAccessKey')
-      # - export AWS_SESSION_TOKEN=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SessionToken')
-      # - aws sts get-caller-identity
-      # - cd $CODEBUILD_SRC_DIR
-
       # Download previously generated vectors
-      - aws s3 cp s3://generated-vectors-artifacts-bucket/77b9165380cfad5fe8b18809fe72b7ca7accfa1c/37_masterkey.zip 37_masterkey.zip
+      - aws s3 cp s3://generated-vectors-artifacts-bucket/$CODEBUILD_RESOLVED_SOURCE_VERSION/37_masterkey.zip 37_masterkey.zip
       # Repackage zip in expected format
       - unzip 37_masterkey.zip
       - cd 37_masterkey

codebuild/py37/decrypt_net_401_vectors.yml

@@ -12,23 +12,13 @@ env:
       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:
-      # # Assume Role to access non-prod resources
-      # - TMP_ROLE=$(aws sts assume-role --role-arn "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Python-Role-us-west-2" --role-session-name "CB-TestVectorResources")
-      # - export TMP_ROLE
-      # - export AWS_ACCESS_KEY_ID=$(echo "${TMP_ROLE}" | jq -r '.Credentials.AccessKeyId')
-      # - export AWS_SECRET_ACCESS_KEY=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SecretAccessKey')
-      # - export AWS_SESSION_TOKEN=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SessionToken')
-      # - aws sts get-caller-identity
-
       # Fetch ESDK .NET v4.0.1 Test Vectors
       - VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
       - VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip

codebuild/py37/encrypt_masterkey.yml

@@ -11,8 +11,6 @@ env:
       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:
@@ -25,8 +23,3 @@ phases:
       - |
         tox -- \
           --input test/aws-crypto-tools-test-vector-framework/features/CANONICAL-GENERATED-MANIFESTS/0003-awses-message-encryption.v2.json \
-# artifacts:
-#   files:
-#     - test_vector_handlers/37_master.zip
-#   name: $CODEBUILD_INITIATOR/37_master.zip
-#   discard-paths: yes

codebuild/py37/generate_decrypt_vectors_masterkey.yml

@@ -11,8 +11,6 @@ env:
       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:
@@ -28,8 +26,3 @@ phases:
           --output 37_masterkey
       - zip -r 37_masterkey.zip 37_masterkey
       - aws s3 cp 37_masterkey.zip s3://generated-vectors-artifacts-bucket/$CODEBUILD_RESOLVED_SOURCE_VERSION/37_masterkey.zip
-# artifacts:
-#   files:
-#     - test_vector_handlers/37_master.zip
-#   name: $CODEBUILD_INITIATOR/37_master.zip
-#   discard-paths: yes