From 3712c4cfd3b0859e270d0cd50972900e668601a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= <dw@edgeless.systems>
Date: Mon, 12 Feb 2024 09:04:03 +0100
Subject: [PATCH] Prevent duplicate artifact naming in same workflow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
---
 .../workflows/e2e-test-provider-example.yml    | 18 ++----------------
 .github/workflows/e2e-upgrade.yml              |  6 +++---
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/e2e-test-provider-example.yml b/.github/workflows/e2e-test-provider-example.yml
index e1d2cf7650..6f2d920639 100644
--- a/.github/workflows/e2e-test-provider-example.yml
+++ b/.github/workflows/e2e-test-provider-example.yml
@@ -83,20 +83,6 @@ jobs:
           ref: main
           stream: nightly
 
-      - name: Upload Terraform module
-        uses: ./.github/actions/upload_terraform_module
-
-      - name: Download Terraform module
-        uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
-        with:
-          name: terraform-module
-
-      - name: Unzip Terraform module
-        shell: bash
-        run: |
-          unzip terraform-module.zip -d ${{ github.workspace }}
-          rm terraform-module.zip
-
       - name: Create resource prefix
         id: create-prefix
         shell: bash
@@ -213,8 +199,8 @@ jobs:
           version=${prefixed_version#v} # remove v prefix
 
           if [[ "${{ inputs.providerVersion }}" == "" ]]; then
-            iam_src="${{ github.workspace }}/terraform-module/iam/${{ steps.determine.outputs.cloudProvider }}"
-            infra_src="${{ github.workspace }}/terraform-module/${{ steps.determine.outputs.cloudProvider }}"
+            iam_src="${{ github.workspace }}/terraform/infrastructure/iam/${{ steps.determine.outputs.cloudProvider }}"
+            infra_src="${{ github.workspace }}/terraform/infrastructure/${{ steps.determine.outputs.cloudProvider }}"
           else
             iam_src="https://github.com/edgelesssys/constellation/releases/download/${{ inputs.providerVersion }}/terraform-module.zip//terraform-module/iam/${{ steps.determine.outputs.cloudProvider }}"
             infra_src="https://github.com/edgelesssys/constellation/releases/download/${{ inputs.providerVersion }}/terraform-module.zip//terraform-module/${{ steps.determine.outputs.cloudProvider }}"
diff --git a/.github/workflows/e2e-upgrade.yml b/.github/workflows/e2e-upgrade.yml
index 758d27c23c..a455ea8021 100644
--- a/.github/workflows/e2e-upgrade.yml
+++ b/.github/workflows/e2e-upgrade.yml
@@ -174,7 +174,7 @@ jobs:
       - name: Upload CLI binary
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
-          name: constellation
+          name: constellation-upgrade-${{ inputs.attestationVariant }}
           path: build/constellation
 
   create-cluster:
@@ -336,7 +336,7 @@ jobs:
       - name: Download CLI
         uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
         with:
-          name: constellation
+          name: constellation-upgrade-${{ inputs.attestationVariant }}
           path: build
 
       - name: Download Working Directory (Pre-test)
@@ -459,7 +459,7 @@ jobs:
       - name: Download CLI
         uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
         with:
-          name: constellation
+          name: constellation-upgrade-${{ inputs.attestationVariant }}
           path: build
 
       - name: Download Working Directory (Pre-test)