From 6fcf40e88d4a300b98f51535a85c544a9ad431b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 12:38:18 +0200 Subject: [PATCH 01/23] Point backend to correct TFC org and workspace --- main.tf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.tf b/main.tf index cacd40f1d..753666cbe 100644 --- a/main.tf +++ b/main.tf @@ -13,9 +13,8 @@ terraform { } } required_version = ">= 1.1.0" - cloud { - organization = "REPLACE_ME" + organization = "cornebester" workspaces { name = "gh-actions-demo" From f7f010c1072bc793eafacba47926e8a12527fd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 15:52:01 +0200 Subject: [PATCH 02/23] test --- .github/workflows/backend.personal.tfvars | 6 ++++++ .github/workflows/terraform.yml | 2 +- .gitignore | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/backend.personal.tfvars diff --git a/.github/workflows/backend.personal.tfvars b/.github/workflows/backend.personal.tfvars new file mode 100644 index 000000000..1bd02b326 --- /dev/null +++ b/.github/workflows/backend.personal.tfvars @@ -0,0 +1,6 @@ +bucket = "corne.146632099925.terraform" # my personal aws +key = "dev/test/cicd" +region = "eu-west-1" +dynamodb_table = "TerraformBackend" +# shared_credentials_file = "C:/Users/cbester/Dropbox/devops/aws/.aws" +profile = "default" # cornebester diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 0e5c867e7..880dcb3a9 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -28,7 +28,7 @@ jobs: - name: Terraform Init id: init - run: terraform init + run: terraform init -backend-config="backend.personal.tfvars" - name: Terraform Validate id: validate diff --git a/.gitignore b/.gitignore index 15ab5efe7..71c2d32d7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,8 +17,8 @@ crash.*.log # password, private keys, and other secrets. These should not be part of version # control as they are data points which are potentially sensitive and subject # to change depending on the environment. -*.tfvars -*.tfvars.json +# *.tfvars +# *.tfvars.json # Ignore override files as they are usually used to override resources locally and so # are not checked in From 1a5e374d3541a9476ab63205e92ec3a9bec92a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 15:53:42 +0200 Subject: [PATCH 03/23] Update main.tf --- main.tf | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/main.tf b/main.tf index 753666cbe..a9f4bf810 100644 --- a/main.tf +++ b/main.tf @@ -13,12 +13,15 @@ terraform { } } required_version = ">= 1.1.0" - cloud { - organization = "cornebester" + # cloud { + # organization = "cornebester" - workspaces { - name = "gh-actions-demo" - } + # workspaces { + # name = "gh-actions-demo" + # } + # } + + backend "s3" { } } From 5ef7e75049f50e8936f438a386238f828cae5bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 15:55:10 +0200 Subject: [PATCH 04/23] Update main.tf --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index a9f4bf810..25f901cdd 100644 --- a/main.tf +++ b/main.tf @@ -21,7 +21,7 @@ terraform { # } # } - backend "s3" { + backend "s3" { } } From de43d60c95e0199ccc341d97fd84a7c4dafa4afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 15:56:23 +0200 Subject: [PATCH 05/23] move tfvars --- .../workflows/backend.personal.tfvars => backend.personal.tfvars | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/backend.personal.tfvars => backend.personal.tfvars (100%) diff --git a/.github/workflows/backend.personal.tfvars b/backend.personal.tfvars similarity index 100% rename from .github/workflows/backend.personal.tfvars rename to backend.personal.tfvars From f44f6d83cee3a9cf870640ca9ebc015378ba529e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 15:57:24 +0200 Subject: [PATCH 06/23] Update backend.personal.tfvars --- backend.personal.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend.personal.tfvars b/backend.personal.tfvars index 1bd02b326..48cd24b1a 100644 --- a/backend.personal.tfvars +++ b/backend.personal.tfvars @@ -3,4 +3,4 @@ key = "dev/test/cicd" region = "eu-west-1" dynamodb_table = "TerraformBackend" # shared_credentials_file = "C:/Users/cbester/Dropbox/devops/aws/.aws" -profile = "default" # cornebester +# profile = "default" # cornebester From 5e8b0a973438357b754eb2440fdf6546ea14edb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 16:00:24 +0200 Subject: [PATCH 07/23] Update terraform.yml --- .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 880dcb3a9..9dc39553f 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -28,7 +28,7 @@ jobs: - name: Terraform Init id: init - run: terraform init -backend-config="backend.personal.tfvars" + run: terraform init -backend-config=../"backend.personal.tfvars" - name: Terraform Validate id: validate From b4f01de3e11631bb5112ecd8e0a535cc21aebbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 16:02:47 +0200 Subject: [PATCH 08/23] update --- .../workflows/backend.personal.tfvars | 0 .github/workflows/terraform.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename backend.personal.tfvars => .github/workflows/backend.personal.tfvars (100%) diff --git a/backend.personal.tfvars b/.github/workflows/backend.personal.tfvars similarity index 100% rename from backend.personal.tfvars rename to .github/workflows/backend.personal.tfvars diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 9dc39553f..72e652a6a 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -28,7 +28,7 @@ jobs: - name: Terraform Init id: init - run: terraform init -backend-config=../"backend.personal.tfvars" + run: terraform init -backend-config=backend.personal.tfvars - name: Terraform Validate id: validate From daa5f4eb3e8c092adeb7a8d27cb7c98595287fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 16:10:00 +0200 Subject: [PATCH 09/23] Update terraform.yml --- .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 72e652a6a..bbf41bc96 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -28,7 +28,7 @@ jobs: - name: Terraform Init id: init - run: terraform init -backend-config=backend.personal.tfvars + run: "terraform init -backend-config=backend.personal.tfvars" - name: Terraform Validate id: validate From a6652e8f84239868bdf9eaa2a7c43e6e2e66a849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 16:11:24 +0200 Subject: [PATCH 10/23] update --- .github/workflows/terraform.yml | 2 +- .../backend.personal.tfvars => backend.personal.tfvars | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/backend.personal.tfvars => backend.personal.tfvars (100%) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index bbf41bc96..880dcb3a9 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -28,7 +28,7 @@ jobs: - name: Terraform Init id: init - run: "terraform init -backend-config=backend.personal.tfvars" + run: terraform init -backend-config="backend.personal.tfvars" - name: Terraform Validate id: validate diff --git a/.github/workflows/backend.personal.tfvars b/backend.personal.tfvars similarity index 100% rename from .github/workflows/backend.personal.tfvars rename to backend.personal.tfvars From 87d62359f20214e97be4e231b781f6503cdc4a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Tue, 21 Mar 2023 16:22:21 +0200 Subject: [PATCH 11/23] Update terraform.yml --- .github/workflows/terraform.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 880dcb3a9..3931fd7bc 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -21,6 +21,12 @@ jobs: with: # terraform_version: 0.13.0: cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v2 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-2 - name: Terraform Format id: fmt From 8717e113914b5480794a615e7bc8bb1f33ae763f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 10:17:21 +0200 Subject: [PATCH 12/23] test env var --- backend.personal.tfvars | 2 +- main.tf | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/backend.personal.tfvars b/backend.personal.tfvars index 48cd24b1a..a49ab29f4 100644 --- a/backend.personal.tfvars +++ b/backend.personal.tfvars @@ -1,4 +1,4 @@ -bucket = "corne.146632099925.terraform" # my personal aws +bucket = var.state_bucket # my personal aws key = "dev/test/cicd" region = "eu-west-1" dynamodb_table = "TerraformBackend" diff --git a/main.tf b/main.tf index 25f901cdd..2e80bf299 100644 --- a/main.tf +++ b/main.tf @@ -82,3 +82,7 @@ resource "aws_security_group" "web-sg" { output "web-address" { value = "${aws_instance.web.public_dns}:8080" } + +variable "state_bucket" { + +} \ No newline at end of file From 79e1b5a42ee7885bbbac8dc809399537bf19fd65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 10:18:11 +0200 Subject: [PATCH 13/23] Update main.tf --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 2e80bf299..bd8fe5608 100644 --- a/main.tf +++ b/main.tf @@ -84,5 +84,5 @@ output "web-address" { } variable "state_bucket" { - + } \ No newline at end of file From 24eccc2fd6d7c343f259bb231a7864ad5317c851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 10:19:58 +0200 Subject: [PATCH 14/23] locals --- backend.personal.tfvars | 2 +- main.tf | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/backend.personal.tfvars b/backend.personal.tfvars index a49ab29f4..7941f4317 100644 --- a/backend.personal.tfvars +++ b/backend.personal.tfvars @@ -1,4 +1,4 @@ -bucket = var.state_bucket # my personal aws +bucket = local.state-bucket # my personal aws key = "dev/test/cicd" region = "eu-west-1" dynamodb_table = "TerraformBackend" diff --git a/main.tf b/main.tf index bd8fe5608..367f3dd7f 100644 --- a/main.tf +++ b/main.tf @@ -85,4 +85,8 @@ output "web-address" { variable "state_bucket" { +} + +locals { + state-bucket = var.state_bucket } \ No newline at end of file From 3ab84bc19413a4563e00b0f756cd5218c0fdd05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 10:21:58 +0200 Subject: [PATCH 15/23] bucket --- backend.personal.tfvars | 2 +- main.tf | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/backend.personal.tfvars b/backend.personal.tfvars index 7941f4317..753242ed4 100644 --- a/backend.personal.tfvars +++ b/backend.personal.tfvars @@ -1,4 +1,4 @@ -bucket = local.state-bucket # my personal aws +# bucket = local.state-bucket # my personal aws key = "dev/test/cicd" region = "eu-west-1" dynamodb_table = "TerraformBackend" diff --git a/main.tf b/main.tf index 367f3dd7f..b3bb21c21 100644 --- a/main.tf +++ b/main.tf @@ -22,6 +22,7 @@ terraform { # } backend "s3" { + bucket = var.state_bucket } } @@ -87,6 +88,3 @@ variable "state_bucket" { } -locals { - state-bucket = var.state_bucket -} \ No newline at end of file From 10f8058fdfaf7c8ca103e4eb53039d57487c60c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 15:54:19 +0200 Subject: [PATCH 16/23] test --- .github/workflows/terraform.yml | 4 ++++ backend.personal.tfvars | 6 ------ main.tf | 5 ----- 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 backend.personal.tfvars diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 3931fd7bc..f0f96d580 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -27,6 +27,10 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-2 + + - name: downlaod backend + id: dwnld + run: aws s3api get-object --bucket ${TF_VAR_state_bucket} --key backend.personal.tfvars backend.personal.tfvarsm - name: Terraform Format id: fmt diff --git a/backend.personal.tfvars b/backend.personal.tfvars deleted file mode 100644 index 753242ed4..000000000 --- a/backend.personal.tfvars +++ /dev/null @@ -1,6 +0,0 @@ -# bucket = local.state-bucket # my personal aws -key = "dev/test/cicd" -region = "eu-west-1" -dynamodb_table = "TerraformBackend" -# shared_credentials_file = "C:/Users/cbester/Dropbox/devops/aws/.aws" -# profile = "default" # cornebester diff --git a/main.tf b/main.tf index b3bb21c21..81c365363 100644 --- a/main.tf +++ b/main.tf @@ -83,8 +83,3 @@ resource "aws_security_group" "web-sg" { output "web-address" { value = "${aws_instance.web.public_dns}:8080" } - -variable "state_bucket" { - -} - From afde971c1b8d76f42ec2d74b481830147509e897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 15:55:53 +0200 Subject: [PATCH 17/23] Update terraform.yml --- .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 f0f96d580..e13956fb8 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -30,7 +30,7 @@ jobs: - name: downlaod backend id: dwnld - run: aws s3api get-object --bucket ${TF_VAR_state_bucket} --key backend.personal.tfvars backend.personal.tfvarsm + run: aws s3api get-object --bucket ${TF_VAR_STATE_BUCKET} --key backend.personal.tfvars backend.personal.tfvarsm - name: Terraform Format id: fmt From a8d223d921524c2be5bc6cbc9c788b7007c3f6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 15:57:48 +0200 Subject: [PATCH 18/23] Update terraform.yml --- .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 e13956fb8..e99782687 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -30,7 +30,7 @@ jobs: - name: downlaod backend id: dwnld - run: aws s3api get-object --bucket ${TF_VAR_STATE_BUCKET} --key backend.personal.tfvars backend.personal.tfvarsm + run: aws s3api get-object --bucket $TF_VAR_STATE_BUCKET --key backend.personal.tfvars backend.personal.tfvars - name: Terraform Format id: fmt From b797e5c6875f87dcf5d35a1651eedf08acb7bcc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 15:59:04 +0200 Subject: [PATCH 19/23] Update terraform.yml --- .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 e99782687..78e72eed7 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -30,7 +30,7 @@ jobs: - name: downlaod backend id: dwnld - run: aws s3api get-object --bucket $TF_VAR_STATE_BUCKET --key backend.personal.tfvars backend.personal.tfvars + run: echo $TF_VAR_STATE_BUCKET - name: Terraform Format id: fmt From de99964022405deb134d5f063268b288652eb4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 16:40:55 +0200 Subject: [PATCH 20/23] Update terraform.yml --- .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 78e72eed7..afafb06be 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -30,7 +30,7 @@ jobs: - name: downlaod backend id: dwnld - run: echo $TF_VAR_STATE_BUCKET + run: echo "${{variables.TF_VAR_STATE_BUCKET}}" - name: Terraform Format id: fmt From da04d1ba32eee3fcca58b09aa30f7fe1b1ed5b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 16:42:27 +0200 Subject: [PATCH 21/23] Update terraform.yml --- .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 afafb06be..50b31bfb0 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -30,7 +30,7 @@ jobs: - name: downlaod backend id: dwnld - run: echo "${{variables.TF_VAR_STATE_BUCKET}}" + run: echo "${{ TF_VAR_STATE_BUCKET }}" - name: Terraform Format id: fmt From 9e3a6935ce6999ee2b6cc4612bb81031f705540f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 16:44:45 +0200 Subject: [PATCH 22/23] Update terraform.yml --- .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 50b31bfb0..0f0943f2a 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -30,7 +30,7 @@ jobs: - name: downlaod backend id: dwnld - run: echo "${{ TF_VAR_STATE_BUCKET }}" + run: echo "${{ vars.TF_VAR_STATE_BUCKET }}" - name: Terraform Format id: fmt From 9dca2388ac2c7c004975d557b699af1a6ab37e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Bester?= Date: Wed, 22 Mar 2023 16:47:07 +0200 Subject: [PATCH 23/23] Update terraform.yml --- .github/workflows/terraform.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 0f0943f2a..b33c9b109 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -28,10 +28,14 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-2 - - name: downlaod backend - id: dwnld + - name: Test var + id: testvar run: echo "${{ vars.TF_VAR_STATE_BUCKET }}" + - name: Download backend + id: s3d + run: aws s3api get-object --bucket ${{ vars.TF_VAR_STATE_BUCKET }} --key backend.personal.tfvars backend.personal.tfvars + - name: Terraform Format id: fmt run: terraform fmt -check