From 09d451ce77c931a3acc3f381bd8526cac18f1bb5 Mon Sep 17 00:00:00 2001 From: pradeep pariyar Date: Mon, 18 Dec 2023 21:08:06 +0100 Subject: [PATCH 1/9] modified-main-branch-credentials --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index e1d1b8045..2bff4c352 100644 --- a/main.tf +++ b/main.tf @@ -12,10 +12,10 @@ terraform { required_version = "~> 1.0" backend "remote" { - organization = "REPLACE_ME" + organization = "mygithub001" workspaces { - name = "REPLACE_ME" + name = "github-action" } } } From d40ab9c97a3018aec89b3879c78c864a85a9e970 Mon Sep 17 00:00:00 2001 From: pradeep pariyar Date: Tue, 13 Feb 2024 17:31:21 +0100 Subject: [PATCH 2/9] updated the correct organization and workspacename --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 2bff4c352..4a2b0a2d3 100644 --- a/main.tf +++ b/main.tf @@ -12,10 +12,10 @@ terraform { required_version = "~> 1.0" backend "remote" { - organization = "mygithub001" + organization = "ACG-Terraform-pradip" workspaces { - name = "github-action" + name = "demo-github-action" } } } From 2834c4ef157487beaddb5b1d59613f1b4426b739 Mon Sep 17 00:00:00 2001 From: pradeep pariyar Date: Tue, 13 Feb 2024 17:44:55 +0100 Subject: [PATCH 3/9] updates the branch master --- .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 da856aaedfbcd82cae902693bf46925da2b1a73f Mon Sep 17 00:00:00 2001 From: pradeep pariyar Date: Tue, 13 Feb 2024 17:47:14 +0100 Subject: [PATCH 4/9] updates the branch master both --- .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..5a69df16e 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -3,7 +3,7 @@ name: "Terraform" on: push: branches: - - main + - master pull_request: jobs: From dbc19b32c4be942c6534bb8a05e0e3d5ee3d0a27 Mon Sep 17 00:00:00 2001 From: pradeep pariyar Date: Thu, 28 Mar 2024 13:32:38 +0100 Subject: [PATCH 5/9] updates TFC and backend workspace --- .github/workflows/terraform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 5a69df16e..34c8cf2b8 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -1,9 +1,8 @@ name: "Terraform" - on: push: branches: - - master + - main pull_request: jobs: @@ -71,6 +70,7 @@ jobs: if: steps.plan.outcome == 'failure' run: exit 1 + - name: Terraform Apply - if: github.ref == 'refs/heads/master' && github.event_name == 'push' + if: github.ref == 'refs/heads/main' && github.event_name == 'push' run: terraform apply -auto-approve From 41451cd24ca128a785585cf2c9a0a53d110727f4 Mon Sep 17 00:00:00 2001 From: pradeep pariyar Date: Thu, 28 Mar 2024 13:37:22 +0100 Subject: [PATCH 6/9] removed the spaces --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 4a2b0a2d3..2afcc2c54 100644 --- a/main.tf +++ b/main.tf @@ -21,12 +21,12 @@ terraform { } + provider "aws" { region = "us-east-1" } - resource "random_pet" "sg" {} resource "aws_instance" "web" { From c1a439c82d19a3c23f46f637b58dece48945b5f7 Mon Sep 17 00:00:00 2001 From: pradeep pariyar Date: Thu, 28 Mar 2024 13:44:09 +0100 Subject: [PATCH 7/9] updated branch name with master --- .github/workflows/terraform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 34c8cf2b8..2cfe8ccb5 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -2,7 +2,7 @@ name: "Terraform" on: push: branches: - - main + - master pull_request: jobs: @@ -70,7 +70,7 @@ jobs: if: steps.plan.outcome == 'failure' run: exit 1 - + - name: Terraform Apply if: github.ref == 'refs/heads/main' && github.event_name == 'push' run: terraform apply -auto-approve From d94b6b61989238293895713f6babf6a3325eac77 Mon Sep 17 00:00:00 2001 From: pradeep pariyar Date: Thu, 28 Mar 2024 13:47:56 +0100 Subject: [PATCH 8/9] original main --- .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 2cfe8ccb5..3743eaa26 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -2,7 +2,7 @@ name: "Terraform" on: push: branches: - - master + - main pull_request: jobs: From 59cffb320d13420e0ddf75ebac8e3f6b14e32d47 Mon Sep 17 00:00:00 2001 From: pradeep pariyar Date: Thu, 28 Mar 2024 14:08:58 +0100 Subject: [PATCH 9/9] added another instance --- main.tf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/main.tf b/main.tf index 2afcc2c54..9f24dead1 100644 --- a/main.tf +++ b/main.tf @@ -41,6 +41,17 @@ resource "aws_instance" "web" { EOF } +resource "aws_instance" "app_server" { + ami = "ami-09e67e426f25ce0d7" + vpc_security_group_ids = [aws_security_group.web-sg.id] + instance_type = "t2.micro" + + tags = { + Name = "ExampleAppServerInstance" + } +} + + resource "aws_security_group" "web-sg" { name = "${random_pet.sg.id}-sg" ingress {