Merge pull request #123 from IABTechLab/tjm-UID2-3620-publish-all-use-ami

Updates for publishing AMIs

Author: thomasm-ttd

.github/workflows/shared-run-e2e-tests.yaml

@@ -186,9 +186,8 @@ jobs:
       - name: Prepare AWS metadata
         id: prepare_aws_metadata
         if: ${{ inputs.operator_type == 'aws' }}
-        uses: IABTechLab/uid2-shared-actions/actions/prepare_aws_metadata@v2
+        uses: IABTechLab/uid2-shared-actions/actions/prepare_aws_metadata@v3
         with:
-          operator_image_version: ${{ inputs.operator_image_version }}
           admin_root: ${{ inputs.admin_root }}
           aws_pcr0: ${{ inputs.aws_pcr0 }}
 
@@ -245,14 +244,13 @@ jobs:
       - name: Start AWS private operator
         id: start_aws_private_operator
         if: ${{ inputs.operator_type == 'aws' }}
-        uses: IABTechLab/uid2-shared-actions/actions/start_aws_private_operator@v2
+        uses: IABTechLab/uid2-shared-actions/actions/start_aws_private_operator@v3
         with:
           bore_url_core: ${{ steps.bore.outputs.BORE_URL_CORE }}
           bore_url_optout: ${{ steps.bore.outputs.BORE_URL_OPTOUT }}
           bore_url_localstack: ${{ steps.bore.outputs.BORE_URL_LOCALSTACK }}
           aws_region: ${{ inputs.aws_region }}
           aws_ami: ${{ inputs.aws_ami }}
-          image_hash: ${{ steps.prepare_aws_metadata.outputs.image_hash }}
           identity_scope: ${{ inputs.uid2_e2e_identity_scope }}
           operator_key: ${{ steps.prepare_aws_metadata.outputs.operator_key }}
 

actions/prepare_aws_metadata/action.yaml

@@ -2,9 +2,6 @@ name: Prepare AWS Metadata
 description: Prepares the AWS Nitro enclave metadata
 
 inputs:
-  operator_image_version:
-    description: The uid2-operator image version
-    default: latest
   admin_root:
     description: The root path for uid2-admin folder
     default: uid2-admin
@@ -13,9 +10,6 @@ inputs:
     required: true
 
 outputs:
-  image_hash:
-    description: The operator image hash
-    value: ${{ steps.image_digest.outputs.IMAGE_HASH }}
   operator_key:
     description: The operator key
     value: ${{ steps.enclave_metadata.outputs.OPERATOR_KEY }}
@@ -24,19 +18,6 @@ runs:
   using: "composite"
 
   steps:
-    - name: Get image digest
-      id: image_digest
-      shell: bash
-      run: |
-        # Pull the image to make sure it's available locally
-        IMAGE_NAME="ghcr.io/iabtechlab/uid2-operator"
-        IMAGE_TAG="${{ inputs.operator_image_version }}"
-        docker pull "${IMAGE_NAME}:${IMAGE_TAG}"
-
-        # Get the digest
-        IMAGE_HASH=$(docker inspect --format='{{index .RepoDigests 0}}' "${IMAGE_NAME}:${IMAGE_TAG}" | cut -d'@' -f2 | cut -d':' -f2)
-        echo "::set-output name=image_hash::${IMAGE_HASH}"
-
     - name: Prepare AWS enclave metadata
       id: enclave_metadata
       shell: bash

actions/start_aws_private_operator/action.yaml

@@ -17,9 +17,6 @@ inputs:
   aws_ami:
     description: The AWS AMI ID
     required: true
-  image_hash:
-    description: The operator image hash
-    required: true
   identity_scope:
     description: The identity scope [UID2, EUID]
     required: true
@@ -40,7 +37,7 @@ runs:
 
   steps:
     - name: Setup Python 3
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
 
@@ -66,7 +63,6 @@ runs:
         BORE_URL_LOCALSTACK: ${{ inputs.bore_url_localstack }}
         AWS_REGION: ${{ inputs.aws_region }}
         AWS_AMI: ${{ inputs.aws_ami }}
-        IMAGE_HASH: ${{ inputs.image_hash }}
         IDENTITY_SCOPE: ${{ inputs.identity_scope }}
         OPERATOR_KEY: ${{ inputs.operator_key }}
       run: |

scripts/aws/start_aws_enclave.sh

@@ -30,10 +30,6 @@ if [ -z "${AWS_AMI}" ]; then
   exit 1
 fi
 
-if [ -z "${IMAGE_HASH}" ]; then
-  echo "IMAGE_HASH can not be empty"
-  exit 1
-fi
 
 if [ -z "${IDENTITY_SCOPE}" ]; then
   echo "IDENTITY_SCOPE can not be empty"
@@ -46,7 +42,7 @@ if [ -z "${OPERATOR_KEY}" ]; then
 fi
 
 DATE=$(date '+%Y%m%d%H%M%S')
-AWS_STACK_NAME="uid2-operator-e2e-${IMAGE_HASH}-${DATE}"
+AWS_STACK_NAME="uid2-operator-e2e-${AWS_AMI}-${DATE}"
 
 CF_TEMPLATE_SCOPE=""
 case "${IDENTITY_SCOPE}" in