From 70cff46b180ad165d15b0fd438c77a355a2e5ac5 Mon Sep 17 00:00:00 2001
From: Andreas Salhus Bakseter <141913422+baksetercx@users.noreply.github.com>
Date: Wed, 22 May 2024 12:54:37 +0200
Subject: [PATCH 1/2] Update README & fix destroy

---
 .github/workflows/destroy.yml | 2 +-
 README.md                     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/destroy.yml b/.github/workflows/destroy.yml
index 43e37db..ce68adf 100644
--- a/.github/workflows/destroy.yml
+++ b/.github/workflows/destroy.yml
@@ -14,9 +14,9 @@ jobs:
       TF_VAR_my_name: ${{ github.head_ref }}
       TF_VAR_repository: ${{ github.repository }}
       ARM_CLIENT_ID: ${{ vars.ARM_CLIENT_ID }}
-      ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
       ARM_SUBSCRIPTION_ID: ${{ vars.ARM_SUBSCRIPTION_ID }}
       ARM_TENANT_ID: ${{ vars.ARM_TENANT_ID }}
+      ARM_USE_OIDC: 'true'
     defaults:
       run:
         working-directory: 'terraform'
diff --git a/README.md b/README.md
index 6b4033b..019cc29 100644
--- a/README.md
+++ b/README.md
@@ -221,6 +221,8 @@ resource "azurerm_container_app" "devops" {
 Vi har lyst til å deploye med Terraform.
 Legg til et siste steg som kjører en Terraform kommando for å endre infrastrukturen vår.
 
+Push så til branchen din og se om det fungerer!
+
 <details>
   <summary>✨ Se fasit</summary>
 
@@ -256,6 +258,11 @@ deploy:
       run: terraform apply -auto-approve # legger til denne linjen
 ```
 
+## 🔨 Oppgave 3.4
+
+Se på `Outputs` under **Run Terraform apply** i loggen til GitHub Actions.
+Her skal du finne en link til applikasjonen din.
+
 </details>
 
 # 🤓 Setup for spesielt interesserte (ikke en del av workshop'en)

From 62e5dc37a14113d945c254a0f518e18ee4d14a57 Mon Sep 17 00:00:00 2001
From: Andreas Salhus Bakseter <141913422+baksetercx@users.noreply.github.com>
Date: Wed, 22 May 2024 12:56:50 +0200
Subject: [PATCH 2/2] Fix fasit

---
 README.md | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 019cc29..7fb61bf 100644
--- a/README.md
+++ b/README.md
@@ -230,17 +230,22 @@ Push så til branchen din og se om det fungerer!
 deploy:
   name: 'Deploy using Terraform'
   runs-on: ubuntu-latest
-  depends-on: [build]
+  needs: [build]
   env:
     TF_VAR_revision_suffix: ${{ github.sha }}
-    TF_VAR_my_name: ${{ env.MY_NAME }}
+    TF_VAR_my_name: ${{ github.head_ref }}
+    TF_VAR_repository: ${{ github.repository }}
     ARM_CLIENT_ID: ${{ vars.ARM_CLIENT_ID }}
-    ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
-    ARM_SUBSCRIPTION_ID: ${{ vars.ARM_SUBSCRIPTION_ID }}
     ARM_SUBSCRIPTION_ID: ${{ vars.ARM_SUBSCRIPTION_ID }}
+    ARM_TENANT_ID: ${{ vars.ARM_TENANT_ID }}
+    ARM_USE_OIDC: 'true'
+  permissions:
+    contents: read
+    id-token: write
+  environment: prod
   defaults:
     run:
-      working-directory: './terraform'
+      working-directory: 'terraform'
   steps:
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -252,7 +257,10 @@ deploy:
       run: terraform init
 
     - name: Set Terraform workspace
-      run: teraform workspace new $MY_NAME || terraform workspace select $MY_NAME
+      run: terraform workspace new $TF_VAR_my_name || terraform workspace select $TF_VAR_my_name
+
+    - name: Run Terraform plan
+      run: terraform plan
 
     - name: Run Terraform apply
       run: terraform apply -auto-approve # legger til denne linjen