AE-956 [ads] Updated to reflect GHA changes (#475)

* Updated to reflect GHA changes using ./script/update_ci_config

Author: gleonard-m

.github/workflows/job-ads-attribution-dap-collector.yml

@@ -23,7 +23,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-
       - name: Build the Docker image
         # yamllint disable
         run: |
@@ -32,27 +31,28 @@ jobs:
       - name: Test Code
         run: docker run us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest python3 -m pytest
 
-  push-job-ads-attribution-dap-collector:
+  deploy-to-gar-ads-attribution-dap-collector:
+    name: Deploy ads-attribution-dap-collector to GAR
     runs-on: ubuntu-latest
-    needs: build-job-ads-attribution-dap-collector
+    needs: [build-job-ads-attribution-dap-collector]
     if: github.ref == 'refs/heads/main'
+    permissions:
+      id-token: write
+      contents: read
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-
-      - name: Authenticate to Google Cloud
-        uses: google-github-actions/auth@v2
         with:
-          credentials_json: ${{ secrets.GCP_CREDENTIALS }}
-
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2
-
-      - name: Configure Docker for GCR
-        run: gcloud auth configure-docker
-
-      - name: Build Docker image
-        run: docker build jobs/ads-attribution-dap-collector/ -t gcr.io/$${{ secrets.GCP_PROJECT }}/ads-attribution-dap-collector_docker_etl:latest
-
-      - name: Push to GCR
-        run: docker push gcr.io/$${{ secrets.GCP_PROJECT }}/ads-attribution-dap-collector_docker_etl:latest
+          persist-credentials: false
+      - name: Build the Docker image
+        # yamllint disable
+        run: |
+          docker build jobs/ads-attribution-dap-collector -t us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest
+        # yamllint enable
+      - name: Push Docker image latest to GAR
+        uses: mozilla-it/deploy-actions/[email protected]
+        with:
+          project_id: moz-fx-data-artifacts-prod
+          image_tags: us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest
+          workload_identity_pool_project_number: ${{ vars.GCPV2_WORKLOAD_IDENTITY_POOL_PROJECT_NUMBER }}
+          service_account_name: docker-etl

jobs/ads-attribution-dap-collector/ci_job.yaml

@@ -3,7 +3,6 @@
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-
       - name: Check if job files changed
         id: changes
         uses: dorny/paths-filter@v3
@@ -21,27 +20,28 @@
         if: steps.changes.outputs.job == 'true'
         run: docker run us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest python3 -m pytest
 
-  push-job-ads-attribution-dap-collector:
+  deploy-to-gar-ads-attribution-dap-collector:
+    name: Deploy ads-attribution-dap-collector to GAR
     runs-on: ubuntu-latest
-    needs: build-job-ads-attribution-dap-collector
+    needs: [build-job-ads-attribution-dap-collector]
     if: github.ref == 'refs/heads/main'
+    permissions:
+      id-token: write
+      contents: read
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-
-      - name: Authenticate to Google Cloud
-        uses: google-github-actions/auth@v2
         with:
-          credentials_json: ${{ secrets.GCP_CREDENTIALS }}
-
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2
-
-      - name: Configure Docker for GCR
-        run: gcloud auth configure-docker
-
-      - name: Build Docker image
-        run: docker build jobs/ads-attribution-dap-collector/ -t gcr.io/$${{ secrets.GCP_PROJECT }}/ads-attribution-dap-collector_docker_etl:latest
-
-      - name: Push to GCR
-        run: docker push gcr.io/$${{ secrets.GCP_PROJECT }}/ads-attribution-dap-collector_docker_etl:latest
+          persist-credentials: false
+      - name: Build the Docker image
+        # yamllint disable
+        run: |
+          docker build jobs/ads-attribution-dap-collector -t us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest
+        # yamllint enable
+      - name: Push Docker image latest to GAR
+        uses: mozilla-it/deploy-actions/[email protected]
+        with:
+          project_id: moz-fx-data-artifacts-prod
+          image_tags: us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest
+          workload_identity_pool_project_number: ${{ vars.GCPV2_WORKLOAD_IDENTITY_POOL_PROJECT_NUMBER }}
+          service_account_name: docker-etl