From d4f02c3b0cc263129a64b3c5f465ddce788b9795 Mon Sep 17 00:00:00 2001
From: Jarrod Lowe <github@rrod.net>
Date: Sat, 10 Aug 2024 15:14:06 +1200
Subject: [PATCH 1/2] More test workflow

---
 .github/workflows/environment-main-deploy.yaml | 2 +-
 .github/workflows/environment-main-plan.yaml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/environment-main-deploy.yaml b/.github/workflows/environment-main-deploy.yaml
index 2414ef8a..4b798a70 100644
--- a/.github/workflows/environment-main-deploy.yaml
+++ b/.github/workflows/environment-main-deploy.yaml
@@ -24,7 +24,7 @@ jobs:
       uses: aws-actions/configure-aws-credentials@39228ca2bffc0bfc8f7761ce893f5b80e7eaaf8f
       with:
         role-to-assume: arn:aws:iam::${{ vars.AWS_ACCOUNT }}:role/GitHubAction-Wildsea@${{ vars.ENVIRONMENT }}
-        role-session-name: GitHubTest
+        role-session-name: GitHubDeploy
         aws-region: ${{ vars.AWS_REGION }}
     - name: terraform apply
       uses: dflook/terraform-apply@7d435d4d115a11e5db1e710ac969f5382f0f6f9f
diff --git a/.github/workflows/environment-main-plan.yaml b/.github/workflows/environment-main-plan.yaml
index 4949f42d..241d004f 100644
--- a/.github/workflows/environment-main-plan.yaml
+++ b/.github/workflows/environment-main-plan.yaml
@@ -21,7 +21,7 @@ jobs:
     - name: Configure AWS Access
       uses: aws-actions/configure-aws-credentials@39228ca2bffc0bfc8f7761ce893f5b80e7eaaf8f
       with:
-        role-to-assume: arn:aws:iam::${{ vars.AWS_ACCOUNT }}:role/GitHubAction-Wildsea
+        role-to-assume: arn:aws:iam::${{ vars.AWS_ACCOUNT }}:role/GitHubAction-Wildsea-main
         role-session-name: GitHubTest
         aws-region: ${{ vars.AWS_REGION }}
     - name: terraform plan

From 7a565f02e258d788d839ac02df3c8e2fec67f006 Mon Sep 17 00:00:00 2001
From: Jarrod Lowe <github@rrod.net>
Date: Sat, 10 Aug 2024 15:15:26 +1200
Subject: [PATCH 2/2] More test workflow

---
 .github/workflows/environment-main-deploy.yaml | 2 +-
 .github/workflows/environment-main-plan.yaml   | 2 +-
 README.md                                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/environment-main-deploy.yaml b/.github/workflows/environment-main-deploy.yaml
index 4b798a70..127f42f1 100644
--- a/.github/workflows/environment-main-deploy.yaml
+++ b/.github/workflows/environment-main-deploy.yaml
@@ -23,7 +23,7 @@ jobs:
     - name: Configure AWS Access
       uses: aws-actions/configure-aws-credentials@39228ca2bffc0bfc8f7761ce893f5b80e7eaaf8f
       with:
-        role-to-assume: arn:aws:iam::${{ vars.AWS_ACCOUNT }}:role/GitHubAction-Wildsea@${{ vars.ENVIRONMENT }}
+        role-to-assume: arn:aws:iam::${{ vars.AWS_ACCOUNT }}:role/GitHubAction-Wildsea-${{ vars.ENVIRONMENT }}
         role-session-name: GitHubDeploy
         aws-region: ${{ vars.AWS_REGION }}
     - name: terraform apply
diff --git a/.github/workflows/environment-main-plan.yaml b/.github/workflows/environment-main-plan.yaml
index 241d004f..4949f42d 100644
--- a/.github/workflows/environment-main-plan.yaml
+++ b/.github/workflows/environment-main-plan.yaml
@@ -21,7 +21,7 @@ jobs:
     - name: Configure AWS Access
       uses: aws-actions/configure-aws-credentials@39228ca2bffc0bfc8f7761ce893f5b80e7eaaf8f
       with:
-        role-to-assume: arn:aws:iam::${{ vars.AWS_ACCOUNT }}:role/GitHubAction-Wildsea-main
+        role-to-assume: arn:aws:iam::${{ vars.AWS_ACCOUNT }}:role/GitHubAction-Wildsea
         role-session-name: GitHubTest
         aws-region: ${{ vars.AWS_REGION }}
     - name: terraform plan
diff --git a/README.md b/README.md
index f59beb65..af9d3dc3 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ To set up a github repository:
 * Create an AWS Account for deployment
   * Set up OIDC as per <https://aws.amazon.com/blogs/security/use-iam-roles-to-connect-github-actions-to-actions-in-aws/>
   * Restrict it to the repo and branch main
-  * Add AdministratorAccess, for now, and call it GitHubAccess-Wildsea@main
+  * Add AdministratorAccess, for now, and call it GitHubAccess-Wildsea-main
   * Add another role with ReadyOnlyAccess, don't restrict the branch, and call it GitHubAccess-Wildsea
 * Add an environment "main"
   * Add an Environment Variable in the environment "AWS_ACCOUNT" with the ID of the AWS Account