Initial update to 3rd edition code

brikis98 · Feb 24, 2022 · 89e992f · 89e992f
1 parent f31b91c
commit 89e992f
Show file tree

Hide file tree

Showing 379 changed files with 6,699 additions and 1,180 deletions.
diff --git a/code/ansible/01-why-terraform/procedural-examples.yml b/code/ansible/01-why-terraform/procedural-examples.yml
@@ -1,9 +1,9 @@
 - ec2:
     count: 10
-    image: ami-0c55b159cbfafe1f0
+    image: ami-0fb653ca2d3203ac1
     instance_type: t2.micro
 
 - ec2:
     count: 5
-    image: ami-0c55b159cbfafe1f0
+    image: ami-0fb653ca2d3203ac1
     instance_type: t2.micro
diff --git a/code/json/02-intro-to-terraform-syntax/iam-policy.json b/code/json/02-intro-to-terraform-syntax/iam-policy.json
@@ -0,0 +1,80 @@
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": "ec2:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "elasticloadbalancing:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "cloudwatch:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "autoscaling:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "iam:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "s3:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "dynamodb:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "kms:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "lambda:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "application-autoscaling:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "rds:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "sns:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "logs:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "organizations:*",
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "account:*",
+      "Resource": "*"
+    }
+  ]
+}
diff --git a/code/opa/09-testing-terraform-code/README.md b/code/opa/09-testing-terraform-code/README.md
@@ -0,0 +1,13 @@
+# OPA example
+
+This folder contains example [Open Policy Agent (OPA)](https://www.openpolicyagent.org/) policy that enforces all 
+module source URLs come from the `brikis98` GitHub org.
+
+For more info, please see Chapter 9, "How to test Terraform code", of
+*[Terraform: Up and Running](http://www.terraformupandrunning.com)*.
+
+## Quick start
+
+The best way to run this test is with Terratest. See 
+[opa_test.go](../../terraform/09-testing-terraform-code/test/opa_test.go).
+
diff --git a/code/opa/09-testing-terraform-code/enforce_source.rego b/code/opa/09-testing-terraform-code/enforce_source.rego
@@ -0,0 +1,10 @@
+package enforce_source
+
+allow = true {
+    count(violation) == 0
+}
+
+violation[module_label] {
+    some module_label, i
+    startswith(input.module[module_label][i].source, "github.com/brikis98") == false
+}
diff --git a/code/packer/01-why-terraform/webserver.json b/code/packer/01-why-terraform/webserver.json
@@ -4,7 +4,7 @@
     "instance_type": "t2.micro",
     "region": "us-east-2",
     "type": "amazon-ebs",
-    "source_ami": "ami-0c55b159cbfafe1f0",
+    "source_ami": "ami-0fb653ca2d3203ac1",
     "ssh_username": "ubuntu"
   }],
   "provisioners": [{

diff --git a/...g-terraform-code/web-server-basic-test.rb → ...g-terraform-code/web-server-basic-test.rb b/...g-terraform-code/web-server-basic-test.rb → ...g-terraform-code/web-server-basic-test.rb
diff --git a/...esting-terraform-code/web-server-basic.rb → ...esting-terraform-code/web-server-basic.rb b/...esting-terraform-code/web-server-basic.rb → ...esting-terraform-code/web-server-basic.rb
diff --git a/...terraform-code/web-server-full-di-test.rb → ...terraform-code/web-server-full-di-test.rb b/...terraform-code/web-server-full-di-test.rb → ...terraform-code/web-server-full-di-test.rb
diff --git a/...ting-terraform-code/web-server-full-di.rb → ...ting-terraform-code/web-server-full-di.rb b/...ting-terraform-code/web-server-full-di.rb → ...ting-terraform-code/web-server-full-di.rb
diff --git a/...ng-terraform-code/web-server-full-test.rb → ...ng-terraform-code/web-server-full-test.rb b/...ng-terraform-code/web-server-full-test.rb → ...ng-terraform-code/web-server-full-test.rb
diff --git a/...testing-terraform-code/web-server-full.rb → ...testing-terraform-code/web-server-full.rb b/...testing-terraform-code/web-server-full.rb → ...testing-terraform-code/web-server-full.rb
diff --git a/...ruby/08-terraform-team/web-server-test.rb → ...ruby/10-terraform-team/web-server-test.rb b/...ruby/08-terraform-team/web-server-test.rb → ...ruby/10-terraform-team/web-server-test.rb
diff --git a/code/ruby/08-terraform-team/web-server.rb → code/ruby/10-terraform-team/web-server.rb b/code/ruby/08-terraform-team/web-server.rb → code/ruby/10-terraform-team/web-server.rb
diff --git a/code/terraform/.terraform-version b/code/terraform/.terraform-version
@@ -0,0 +1 @@
+1.1.4
diff --git a/code/terraform/00-preface/hello-world/README.md b/code/terraform/00-preface/hello-world/README.md
@@ -10,7 +10,7 @@ For more info, please see the preface of *[Terraform: Up and Running](http://www
 * You must have [Terraform](https://www.terraform.io/) installed on your computer. 
 * You must have an [Amazon Web Services (AWS) account](http://aws.amazon.com/).
 
-Please note that this code was written for Terraform 0.12.x.
+Please note that this code was written for Terraform 1.x.
 
 ## Quick start
 

diff --git a/code/terraform/00-preface/hello-world/main.tf b/code/terraform/00-preface/hello-world/main.tf
@@ -1,16 +1,20 @@
 terraform {
-  required_version = ">= 0.12, < 0.13"
+  required_version = ">= 1.0.0, < 2.0.0"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
 }
 
 provider "aws" {
   region = "us-east-2"
-
-  # Allow any 2.x version of the AWS provider
-  version = "~> 2.0"
 }
 
 resource "aws_instance" "example" {
-  ami           = "ami-0c55b159cbfafe1f0"
+  ami           = "ami-0fb653ca2d3203ac1"
   instance_type = "t2.micro"
 }
 
diff --git a/code/terraform/01-why-terraform/web-server/README.md b/code/terraform/01-why-terraform/web-server/README.md
@@ -11,7 +11,7 @@ For more info, please see Chapter 1, "Why Terraform", of
 * You must have [Terraform](https://www.terraform.io/) installed on your computer. 
 * You must have an [Amazon Web Services (AWS) account](http://aws.amazon.com/).
 
-Please note that this code was written for Terraform 0.12.x.
+Please note that this code was written for Terraform 1.x.
 
 ## Quick start
 

diff --git a/code/terraform/01-why-terraform/web-server/main.tf b/code/terraform/01-why-terraform/web-server/main.tf
@@ -1,18 +1,22 @@
 terraform {
-  required_version = ">= 0.12, < 0.13"
+  required_version = ">= 1.0.0, < 2.0.0"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
 }
 
 provider "aws" {
   region = "us-east-2"
-
-  # Allow any 2.x version of the AWS provider
-  version = "~> 2.0"
 }
 
 resource "aws_instance" "app" {
   instance_type     = "t2.micro"
   availability_zone = "us-east-2a"
-  ami               = "ami-0c55b159cbfafe1f0"
+  ami               = "ami-0fb653ca2d3203ac1"
 
   user_data = <<-EOF
               #!/bin/bash

diff --git a/code/terraform/02-intro-to-terraform-syntax/one-server/README.md b/code/terraform/02-intro-to-terraform-syntax/one-server/README.md
@@ -11,7 +11,7 @@ For more info, please see Chapter 2, "Getting started with Terraform", of
 * You must have [Terraform](https://www.terraform.io/) installed on your computer. 
 * You must have an [Amazon Web Services (AWS) account](http://aws.amazon.com/).
 
-Please note that this code was written for Terraform 0.12.x.
+Please note that this code was written for Terraform 1.x.
 
 ## Quick start
 

diff --git a/code/terraform/02-intro-to-terraform-syntax/one-server/main.tf b/code/terraform/02-intro-to-terraform-syntax/one-server/main.tf
@@ -1,16 +1,20 @@
 terraform {
-  required_version = ">= 0.12, < 0.13"
+  required_version = ">= 1.0.0, < 2.0.0"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
 }
 
 provider "aws" {
   region = "us-east-2"
-
-  # Allow any 2.x version of the AWS provider
-  version = "~> 2.0"
 }
 
 resource "aws_instance" "example" {
-  ami           = "ami-0c55b159cbfafe1f0"
+  ami           = "ami-0fb653ca2d3203ac1"
   instance_type = "t2.micro"
 
   tags = {

diff --git a/code/terraform/02-intro-to-terraform-syntax/one-webserver-with-vars/README.md b/code/terraform/02-intro-to-terraform-syntax/one-webserver-with-vars/README.md
@@ -13,7 +13,7 @@ For more info, please see Chapter 2, "Getting started with Terraform", of
 * You must have [Terraform](https://www.terraform.io/) installed on your computer. 
 * You must have an [Amazon Web Services (AWS) account](http://aws.amazon.com/).
 
-Please note that this code was written for Terraform 0.12.x.
+Please note that this code was written for Terraform 1.x.
 
 ## Quick start
 

diff --git a/code/terraform/02-intro-to-terraform-syntax/one-webserver-with-vars/main.tf b/code/terraform/02-intro-to-terraform-syntax/one-webserver-with-vars/main.tf
@@ -1,16 +1,20 @@
 terraform {
-  required_version = ">= 0.12, < 0.13"
+  required_version = ">= 1.0.0, < 2.0.0"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
 }
 
 provider "aws" {
   region = "us-east-2"
-
-  # Allow any 2.x version of the AWS provider
-  version = "~> 2.0"
 }
 
 resource "aws_instance" "example" {
-  ami                    = "ami-0c55b159cbfafe1f0"
+  ami                    = "ami-0fb653ca2d3203ac1"
   instance_type          = "t2.micro"
   vpc_security_group_ids = [aws_security_group.instance.id]
 

diff --git a/code/terraform/02-intro-to-terraform-syntax/one-webserver/README.md b/code/terraform/02-intro-to-terraform-syntax/one-webserver/README.md
@@ -12,7 +12,7 @@ For more info, please see Chapter 2, "Getting started with Terraform", of
 * You must have [Terraform](https://www.terraform.io/) installed on your computer. 
 * You must have an [Amazon Web Services (AWS) account](http://aws.amazon.com/).
 
-Please note that this code was written for Terraform 0.12.x.
+Please note that this code was written for Terraform 1.x.
 
 ## Quick start
 

diff --git a/code/terraform/02-intro-to-terraform-syntax/one-webserver/main.tf b/code/terraform/02-intro-to-terraform-syntax/one-webserver/main.tf
@@ -1,16 +1,20 @@
 terraform {
-  required_version = ">= 0.12, < 0.13"
+  required_version = ">= 1.0.0, < 2.0.0"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
 }
 
 provider "aws" {
   region = "us-east-2"
-
-  # Allow any 2.x version of the AWS provider
-  version = "~> 2.0"
 }
 
 resource "aws_instance" "example" {
-  ami                    = "ami-0c55b159cbfafe1f0"
+  ami                    = "ami-0fb653ca2d3203ac1"
   instance_type          = "t2.micro"
   vpc_security_group_ids = [aws_security_group.instance.id]
 

diff --git a/code/terraform/02-intro-to-terraform-syntax/webserver-cluster/README.md b/code/terraform/02-intro-to-terraform-syntax/webserver-cluster/README.md
@@ -14,7 +14,7 @@ For more info, please see Chapter 2, "Getting started with Terraform", of
 * You must have [Terraform](https://www.terraform.io/) installed on your computer. 
 * You must have an [Amazon Web Services (AWS) account](http://aws.amazon.com/).
 
-Please note that this code was written for Terraform 0.12.x.
+Please note that this code was written for Terraform 1.x.
 
 ## Quick start
 

diff --git a/code/terraform/02-intro-to-terraform-syntax/webserver-cluster/main.tf b/code/terraform/02-intro-to-terraform-syntax/webserver-cluster/main.tf
@@ -1,16 +1,20 @@
 terraform {
-  required_version = ">= 0.12, < 0.13"
+  required_version = ">= 1.0.0, < 2.0.0"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
 }
 
 provider "aws" {
   region = "us-east-2"
-
-  # Allow any 2.x version of the AWS provider
-  version = "~> 2.0"
 }
 
 resource "aws_launch_configuration" "example" {
-  image_id        = "ami-0c55b159cbfafe1f0"
+  image_id        = "ami-0fb653ca2d3203ac1"
   instance_type   = "t2.micro"
   security_groups = [aws_security_group.instance.id]
 
@@ -29,7 +33,7 @@ resource "aws_launch_configuration" "example" {
 
 resource "aws_autoscaling_group" "example" {
   launch_configuration = aws_launch_configuration.example.name
-  vpc_zone_identifier  = data.aws_subnet_ids.default.ids
+  vpc_zone_identifier  = data.aws_subnets.default.ids
 
   target_group_arns = [aws_lb_target_group.asg.arn]
   health_check_type = "ELB"
@@ -59,16 +63,19 @@ data "aws_vpc" "default" {
   default = true
 }
 
-data "aws_subnet_ids" "default" {
-  vpc_id = data.aws_vpc.default.id
+data "aws_subnets" "default" {
+  filter {
+    name   = "vpc-id"
+    values = [data.aws_vpc.default.id]
+  }
 }
 
 resource "aws_lb" "example" {
 
   name               = var.alb_name
 
   load_balancer_type = "application"
-  subnets            = data.aws_subnet_ids.default.ids
+  subnets            = data.aws_subnets.default.ids
   security_groups    = [aws_security_group.alb.id]
 }
 

diff --git a/code/terraform/03-terraform-state/file-layout-example/global/s3/README.md b/code/terraform/03-terraform-state/file-layout-example/global/s3/README.md
@@ -13,7 +13,7 @@ For more info, please see Chapter 3, "How to Manage Terraform State", of
 * You must have [Terraform](https://www.terraform.io/) installed on your computer. 
 * You must have an [Amazon Web Services (AWS) account](http://aws.amazon.com/).
 
-Please note that this code was written for Terraform 0.12.x.
+Please note that this code was written for Terraform 1.x.
 
 ## Quick start