From afb154ceb70a73161724fba0a5e3a43391aee896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?=
 <66256922+daniel-weisse@users.noreply.github.com>
Date: Mon, 16 Oct 2023 16:20:32 +0200
Subject: [PATCH] ci: add missing quotation marks for region flag + revert to
 northeurope (#2459)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add missing quotation marks for region flag
* Revert default Azure region to northeurope

---------

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
---
 .../constellation_iam_create/action.yml       | 23 +++++++------------
 .github/actions/e2e_test/action.yml           |  2 +-
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.github/actions/constellation_iam_create/action.yml b/.github/actions/constellation_iam_create/action.yml
index eac415a8b6..f5f307e88d 100644
--- a/.github/actions/constellation_iam_create/action.yml
+++ b/.github/actions/constellation_iam_create/action.yml
@@ -39,14 +39,7 @@ runs:
     - name: Generate config
       id: generate-config
       shell: bash
-      # TODO(katexochen): Remove the generate-config flag once v2.10 is released.
       run: |
-        output=$(constellation iam create --help)
-        if [[ $output == *"generate-config"* ]]; then
-          echo "flag=--generate-config" | tee -a "$GITHUB_OUTPUT"
-          exit 0
-        fi
-
         kubernetesFlag=""
         if [[ ! -z "${{ inputs.kubernetesVersion }}" ]]; then
           kubernetesFlag="--kubernetes=${{ inputs.kubernetesVersion }}"
@@ -60,9 +53,9 @@ runs:
       if: inputs.cloudProvider == 'aws'
       run: |
         constellation iam create aws \
-          --zone=${{ inputs.awsZone }} \
-          --prefix=${{ inputs.namePrefix }} \
-          ${{ steps.generate-config.outputs.flag }} \
+          --zone="${{ inputs.awsZone }}" \
+          --prefix="${{ inputs.namePrefix }}" \
+          --update-config \
           --tf-log=DEBUG \
           --yes
 
@@ -71,10 +64,10 @@ runs:
       if: inputs.cloudProvider == 'azure'
       run: |
         constellation iam create azure \
-          --region=${{ inputs.azureRegion }} \
+          --region="${{ inputs.azureRegion }}" \
           --resourceGroup="${{ inputs.namePrefix }}-rg" \
           --servicePrincipal="${{ inputs.namePrefix }}-sp" \
-          ${{ steps.generate-config.outputs.flag }} \
+          --update-config \
           --tf-log=DEBUG \
           --yes
 
@@ -83,9 +76,9 @@ runs:
       if: inputs.cloudProvider == 'gcp'
       run: |
         constellation iam create gcp \
-          --projectID=${{ inputs.gcpProjectID }} \
-          --zone=${{ inputs.gcpZone }} \
+          --projectID="${{ inputs.gcpProjectID }}" \
+          --zone="${{ inputs.gcpZone }}" \
           --serviceAccountID="${{ inputs.namePrefix }}-sa" \
-          ${{ steps.generate-config.outputs.flag }} \
+          --update-config \
           --tf-log=DEBUG \
           --yes
diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml
index ce6f3aab91..9e8f5f87c1 100644
--- a/.github/actions/e2e_test/action.yml
+++ b/.github/actions/e2e_test/action.yml
@@ -209,7 +209,7 @@ runs:
         cloudProvider: ${{ inputs.cloudProvider }}
         namePrefix: ${{ steps.create-prefix.outputs.prefix }}
         awsZone: ${{ inputs.regionZone || 'us-east-2c' }}
-        azureRegion: ${{ inputs.regionZone || 'westus' }}
+        azureRegion: ${{ inputs.regionZone || 'northeurope' }}
         gcpProjectID: ${{ inputs.gcpProject }}
         gcpZone: ${{ inputs.regionZone || 'europe-west3-b' }}
         kubernetesVersion: ${{ inputs.kubernetesVersion }}