From 640a67d9f811daba2a498191eacfab392584d012 Mon Sep 17 00:00:00 2001
From: Leo J <153937047+leiicamundi@users.noreply.github.com>
Date: Wed, 22 May 2024 10:26:05 +0200
Subject: [PATCH] fix: do not rely on default AWS_REGION (#4)

---
 .github/actions/rosa-create-cluster/action.yml | 8 ++++----
 .github/workflows/tests.yml                    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/actions/rosa-create-cluster/action.yml b/.github/actions/rosa-create-cluster/action.yml
index 7925a9f..87a2993 100644
--- a/.github/actions/rosa-create-cluster/action.yml
+++ b/.github/actions/rosa-create-cluster/action.yml
@@ -115,15 +115,15 @@ runs:
     - name: Login to Red Hat Hybrid Cloud Console
       shell: bash
       run: |
-        rosa login --token=${{ inputs.rh-token }}
-        rosa whoami
+        rosa login --token=${{ inputs.rh-token }} --region="${{ inputs.aws-region }}"
+        rosa whoami --region="${{ inputs.aws-region }}"
 
     - name: Verify and enable HCP ROSA on AWS Marketplace
       shell: bash
       run: |
         rosa verify quota --region="${{ inputs.aws-region }}"
         rosa verify permissions --region="${{ inputs.aws-region }}"
-        rosa create account-roles --mode auto
+        rosa create account-roles --mode auto --region="${{ inputs.aws-region }}"
 
     - name: Install aws-cli v2
       shell: bash
@@ -200,7 +200,7 @@ runs:
       shell: bash
       id: cluster_info
       run: |
-        rosa describe cluster --output=json -c "${{ steps.apply.outputs.cluster_id }}"
+        rosa describe cluster --output=json -c "${{ steps.apply.outputs.cluster_id }}"  --region="${{ inputs.aws-region }}"
         export cluster_api=$(rosa describe cluster --output=json -c "${{ steps.apply.outputs.cluster_id }}" | jq -r '.api.url')
         echo "cluster_api=$cluster_api"
         echo "cluster_api=$cluster_api" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 003c6e8..639643f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,7 +33,7 @@ concurrency:
 
 env:
   AWS_PROFILE: "infex"
-  AWS_REGION: "eu-west-2"
+  TESTS_AWS_REGION: "eu-west-2"
   TF_S3_BUCKET: "camunda-tf-rosa"
   OCP_ADMIN_USERNAME: "cluster-admin"
   OCP_NAMESPACE: "myns"
@@ -80,7 +80,7 @@ jobs:
         run: |
           aws configure set aws_access_key_id ${{ steps.secrets.outputs.AWS_ACCESS_KEY }} --profile ${{ env.AWS_PROFILE }}
           aws configure set aws_secret_access_key ${{ steps.secrets.outputs.AWS_SECRET_KEY }} --profile ${{ env.AWS_PROFILE }}
-          aws configure set region ${{ env.AWS_REGION }} --profile ${{ env.AWS_PROFILE }}
+          aws configure set region ${{ env.TESTS_AWS_REGION }} --profile ${{ env.AWS_PROFILE }}
 
       - name: Create Cluster
         timeout-minutes: 125
@@ -91,7 +91,7 @@ jobs:
           cluster-name: ${{ steps.commit_info.outputs.cluster_name }}
           admin-username: ${{ env.OCP_ADMIN_USERNAME }}
           admin-password: ${{ steps.secrets.outputs.CI_OPENSHIFT_MAIN_PASSWORD }}
-          aws-region: ${{ env.AWS_REGION }}
+          aws-region: ${{ env.TESTS_AWS_REGION }}
           s3-backend-bucket: ${{ env.TF_S3_BUCKET }}
 
       - name: Create namespace if not exists
@@ -110,5 +110,5 @@ jobs:
         with:
           rh-token: ${{ steps.secrets.outputs.RH_OPENSHIFT_TOKEN }}
           cluster-name: "${{ steps.commit_info.outputs.cluster_name }}"
-          aws-region: ${{ env.AWS_REGION }}
+          aws-region: ${{ env.TESTS_AWS_REGION }}
           s3-backend-bucket: ${{ env.TF_S3_BUCKET }}