From c2af2697ccf23e4b0eda48c2699f5f9d83268a20 Mon Sep 17 00:00:00 2001 From: UV Date: Wed, 3 Jan 2024 23:16:42 +0000 Subject: [PATCH 1/7] update terraform backend in main.tf --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index e1d1b8045..62eed6bba 100644 --- a/main.tf +++ b/main.tf @@ -12,10 +12,10 @@ terraform { required_version = "~> 1.0" backend "remote" { - organization = "REPLACE_ME" + organization = "UX_HCP" workspaces { - name = "REPLACE_ME" + name = "github-action-terraform" } } } From bf6afbe5388210ca7b7e1f37b4a99b296341ba8e Mon Sep 17 00:00:00 2001 From: UV Date: Thu, 4 Jan 2024 01:18:52 +0000 Subject: [PATCH 2/7] main.tf update --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 62eed6bba..450128945 100644 --- a/main.tf +++ b/main.tf @@ -15,7 +15,7 @@ terraform { organization = "UX_HCP" workspaces { - name = "github-action-terraform" + name = "demo-github-actions" } } } From c94a87904bf2fa7703930c3bbca607954333621f Mon Sep 17 00:00:00 2001 From: UV Date: Thu, 4 Jan 2024 14:49:51 +0000 Subject: [PATCH 3/7] main.tf update --- main.tf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 450128945..c8c8d58e0 100644 --- a/main.tf +++ b/main.tf @@ -11,13 +11,15 @@ terraform { } required_version = "~> 1.0" - backend "remote" { - organization = "UX_HCP" + cloud { + organization = "UX_HCP" workspaces { + # name = "aws-static-site" name = "demo-github-actions" } } + } From df6a4f2c44272ed93cbb65afb1a12780aa190d48 Mon Sep 17 00:00:00 2001 From: UV Date: Thu, 4 Jan 2024 15:16:56 +0000 Subject: [PATCH 4/7] terraform.yml - refs/heads/main-> refs/heads/master update --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 6e7df42c1..ab90ea356 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -72,5 +72,5 @@ jobs: run: exit 1 - name: Terraform Apply - if: github.ref == 'refs/heads/main' && github.event_name == 'push' + if: github.ref == 'refs/heads/master' && github.event_name == 'push' run: terraform apply -auto-approve From 1a3945aaaac26724729035b5024396f8a10d086f Mon Sep 17 00:00:00 2001 From: UV Date: Thu, 4 Jan 2024 15:22:39 +0000 Subject: [PATCH 5/7] added github.ref to plan output --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index ab90ea356..26720fe8b 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -58,7 +58,7 @@ jobs: - *Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`*`; + *Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`*`, Destination branch: \`${{ github.ref }}\`*`; github.issues.createComment({ issue_number: context.issue.number, From 61a2464f5d2787712396a8c128823dd360e6eef8 Mon Sep 17 00:00:00 2001 From: UV Date: Thu, 4 Jan 2024 15:31:24 +0000 Subject: [PATCH 6/7] added github.ref to plan output-2 --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 26720fe8b..2613e400c 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -58,7 +58,7 @@ jobs: - *Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`*`, Destination branch: \`${{ github.ref }}\`*`; + *Pusher: @${{ github.actor }}, Destination branch: @${{ github.ref }}, Action: \`${{ github.event_name }}\`*`; github.issues.createComment({ issue_number: context.issue.number, From 6167edb76edd6a86b87d48e864dadfcb73a57e9f Mon Sep 17 00:00:00 2001 From: UV Date: Thu, 4 Jan 2024 16:36:42 +0000 Subject: [PATCH 7/7] comment github.ref --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 2613e400c..6a67dc311 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -72,5 +72,5 @@ jobs: run: exit 1 - name: Terraform Apply - if: github.ref == 'refs/heads/master' && github.event_name == 'push' + #if: github.ref == 'refs/heads/master' && github.event_name == 'push' run: terraform apply -auto-approve