From 86f34cc26b2b93fc6c91841923a478154b499545 Mon Sep 17 00:00:00 2001 From: aaylearn <84032387+aaylearn@users.noreply.github.com> Date: Mon, 12 Aug 2024 12:57:42 +0530 Subject: [PATCH 1/8] Update ec2-instance.tf merge --- .../terraform-manifests/ec2-instance.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02-Terraform-Basics/02-02-Terraform-Command-Basics/terraform-manifests/ec2-instance.tf b/02-Terraform-Basics/02-02-Terraform-Command-Basics/terraform-manifests/ec2-instance.tf index 8b007c8c..f905b63c 100644 --- a/02-Terraform-Basics/02-02-Terraform-Command-Basics/terraform-manifests/ec2-instance.tf +++ b/02-Terraform-Basics/02-02-Terraform-Command-Basics/terraform-manifests/ec2-instance.tf @@ -7,7 +7,7 @@ terraform { } } } - +# need to test merge branch # Provider Block provider "aws" { profile = "default" # AWS Credentials Profile configured on your local desktop terminal $HOME/.aws/credentials From 517efe57994795d57ef69310d63a619b869394aa Mon Sep 17 00:00:00 2001 From: aaylearn <84032387+aaylearn@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:58:18 +0530 Subject: [PATCH 2/8] Update main.tf --- .../main.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/10-Terraform-Modules/10-02-Terraform-Build-a-Module/Oldv2-2024-Backup/v2-host-static-website-on-s3-using-terraform-manifests/main.tf b/10-Terraform-Modules/10-02-Terraform-Build-a-Module/Oldv2-2024-Backup/v2-host-static-website-on-s3-using-terraform-manifests/main.tf index 00b2bfcf..a01a0ea3 100644 --- a/10-Terraform-Modules/10-02-Terraform-Build-a-Module/Oldv2-2024-Backup/v2-host-static-website-on-s3-using-terraform-manifests/main.tf +++ b/10-Terraform-Modules/10-02-Terraform-Build-a-Module/Oldv2-2024-Backup/v2-host-static-website-on-s3-using-terraform-manifests/main.tf @@ -1,3 +1,5 @@ + +#mark the new changes to test creation of a new release # Create S3 Bucket Resource resource "aws_s3_bucket" "s3_bucket" { bucket = var.bucket_name From f0c6a0d1a0c5536ffa08b476d858fd53f3e9e358 Mon Sep 17 00:00:00 2001 From: aaylearn <84032387+aaylearn@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:07:54 +0530 Subject: [PATCH 3/8] Update README.md --- 01-Infrastructure-as-Code-IaC-Basics/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/01-Infrastructure-as-Code-IaC-Basics/README.md b/01-Infrastructure-as-Code-IaC-Basics/README.md index 7c778fe2..ae0d75f0 100644 --- a/01-Infrastructure-as-Code-IaC-Basics/README.md +++ b/01-Infrastructure-as-Code-IaC-Basics/README.md @@ -3,11 +3,14 @@ ## Step-01: Understand Problems with Traditional way of Managing Infrastructure - Time it takes for building multiple environments - Issues we face with different environments -- Scale-Up and Scale-Down On-Demand - +- Scale-Up +- # +- # +- 3njsjf and Scale-Down On-Demand +#change ## Step-02: Discuss how IaC with Terraform Solves them - Visibility - Stability - Scalability - Security -- Audit \ No newline at end of file +- Audit From 9a2bbb793573e809687b206683a95c8eca3359ab Mon Sep 17 00:00:00 2001 From: aaylearn <84032387+aaylearn@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:40:50 +0530 Subject: [PATCH 4/8] Update README.md --- 06-Terraform-Datasources/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/06-Terraform-Datasources/README.md b/06-Terraform-Datasources/README.md index 1d969eff..a5479f78 100644 --- a/06-Terraform-Datasources/README.md +++ b/06-Terraform-Datasources/README.md @@ -4,7 +4,7 @@ - Understand about Datasources in Terraform - Implement a sample usecase with Datasources. - Get the latest Amazon Linux 2 AMI ID using datasources and reference that value when creating EC2 Instance resource `ami = data.aws_ami.amzlinux.id` - +#change to test rebase ## Step-02: Create a Datasource to fetch latest AMI ID - Create or review manifest `c6-ami-datasource.tf` - Go to AWS Mgmt Console -> Services -> EC2 -> Images -> AMI From 26863eebe9c22fdba83a0aa209ed3ee14d14c4d5 Mon Sep 17 00:00:00 2001 From: aaylearn <84032387+aaylearn@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:41:12 +0530 Subject: [PATCH 5/8] Update README.md --- 05-Terraform-Variables/05-03-Terraform-Local-Values/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/05-Terraform-Variables/05-03-Terraform-Local-Values/README.md b/05-Terraform-Variables/05-03-Terraform-Local-Values/README.md index 0e577d3e..42730575 100644 --- a/05-Terraform-Variables/05-03-Terraform-Local-Values/README.md +++ b/05-Terraform-Variables/05-03-Terraform-Local-Values/README.md @@ -6,6 +6,7 @@ - When To Use Local Values? - What is the problem locals are solving ? +#change to test rebase ``` What is DRY Principle ? Don't repeat yourself @@ -50,4 +51,4 @@ terraform apply -auto-approve ``` ## References -- [Terraform Local values](https://www.terraform.io/docs/language/values/locals.html) \ No newline at end of file +- [Terraform Local values](https://www.terraform.io/docs/language/values/locals.html) From b1daae3db32363e58af505166d8a225ef1b693b3 Mon Sep 17 00:00:00 2001 From: aaylearn <84032387+aaylearn@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:41:30 +0530 Subject: [PATCH 6/8] Update README.md --- 04-Terraform-Resources/04-06-Provisioners/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/04-Terraform-Resources/04-06-Provisioners/README.md b/04-Terraform-Resources/04-06-Provisioners/README.md index 84803d68..ede5d2ac 100644 --- a/04-Terraform-Resources/04-06-Provisioners/README.md +++ b/04-Terraform-Resources/04-06-Provisioners/README.md @@ -1,2 +1,4 @@ # Provisioners - We are going to learn Terraform Provisioners in detail in [Section-09](https://github.com/stacksimplify/hashicorp-certified-terraform-associate/tree/master/09-Terraform-Provisioners) of this course. + +#change to test rebase From 24e3408215d393c961bc57370c2f327036991336 Mon Sep 17 00:00:00 2001 From: aaylearn <84032387+aaylearn@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:41:47 +0530 Subject: [PATCH 7/8] Update README.md --- .../03-03-Multiple-Provider-Configurations/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/03-Terraform-Fundamental-Blocks/03-03-Multiple-Provider-Configurations/README.md b/03-Terraform-Fundamental-Blocks/03-03-Multiple-Provider-Configurations/README.md index bb42ff85..55a7b26f 100644 --- a/03-Terraform-Fundamental-Blocks/03-03-Multiple-Provider-Configurations/README.md +++ b/03-Terraform-Fundamental-Blocks/03-03-Multiple-Provider-Configurations/README.md @@ -13,6 +13,7 @@ provider "aws" { profile = "default" } +#change to test rebase # Provider-2 for us-west-1 provider "aws" { region = "us-west-1" @@ -66,4 +67,4 @@ rm -rf terraform.tfstate* ## References -- [Provider Meta Argument](https://www.terraform.io/docs/configuration/meta-arguments/resource-provider.html) \ No newline at end of file +- [Provider Meta Argument](https://www.terraform.io/docs/configuration/meta-arguments/resource-provider.html) From 9404b4dbd314bc8f16f33a0aa01f6180bceb9f33 Mon Sep 17 00:00:00 2001 From: aaylearn <84032387+aaylearn@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:42:02 +0530 Subject: [PATCH 8/8] Update README.md --- 02-Terraform-Basics/02-03-Terraform-Language-Syntax/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/02-Terraform-Basics/02-03-Terraform-Language-Syntax/README.md b/02-Terraform-Basics/02-03-Terraform-Language-Syntax/README.md index 3c0fb52d..ebfb9b35 100644 --- a/02-Terraform-Basics/02-03-Terraform-Language-Syntax/README.md +++ b/02-Terraform-Basics/02-03-Terraform-Language-Syntax/README.md @@ -7,6 +7,7 @@ - Understand Identifiers - Understand Comments +#change to test rebase ## Step-02: Terraform Configuration Language Syntax