Merge pull request #79 from brikis98/3rd-edition

3rd edition

Author: brikis98

README.md

@@ -1,35 +1,35 @@
 # Terraform: Up & Running Code
 
-This repo contains the code samples for the book *[Terraform: Up and Running](http://www.terraformupandrunning.com)*,
-2nd edition, by [Yevgeniy Brikman](http://www.ybrikman.com).
+This repo contains the code samples for the book *[Terraform: Up and Running](http://www.terraformupandrunning.com)*, 
+by [Yevgeniy Brikman](http://www.ybrikman.com).
 
 
 
 
-## Quick start
-
-All the code is in the [code](/code) folder. It is organized by language (terraform, bash, ruby, etc) and within each
-language, by chapter. Since this code comes from a book about Terraform, the vast majority of the code consists of
-Terraform examples in the [code/terraform folder](/code/terraform). 
+## Looking for the 1st, 2nd, or 3rd edition?
 
-For instructions on running the code, please consult the README in each folder, and, of course, the 
-*[Terraform: Up and Running](http://www.terraformupandrunning.com)* book. 
+*Terraform: Up & Running* is now on its **3rd edition**; all the code in `master` is for this edition. If you're looking
+for code examples for other editions, please see the following branches:
 
+* [1st-edition branch](https://github.com/brikis98/terraform-up-and-running-code/tree/1st-edition).
+* [2nd-edition branch](https://github.com/brikis98/terraform-up-and-running-code/tree/2nd-edition).
+* [3rd-edition branch](https://github.com/brikis98/terraform-up-and-running-code/tree/3rd-edition).
 
 
-## More examples
-
-The example code in *Terraform: Up and Running* are mostly for Amazon Web Services (AWS). There is a project underway
-to translate these examples to their equivalents on other cloud providers, such as Google Cloud and Azure, here:
-https://github.com/mjuenema/Terraform-Up-and-Running-Code-Samples-Translated/. 
 
+## Quick start
 
+All the code is in the [code](/code) folder. The code examples are organized first by the tool or language and then
+by chapter. For example, if you're looking at an example of Terraform code in Chapter 2, you'll find it in the 
+[code/terraform/02-intro-to-terraform-syntax](code/terraform/02-intro-to-terraform-syntax) folder; if you're looking at 
+an OPA (Rego) example in Chapter 9, you'll find it in the 
+[code/terraform/09-testing-terraform-code](code/terraform/09-testing-terraform-code) folder.
 
-## Looking for the 1st edition?
+Since this code comes from a book about Terraform, the vast majority of the code consists of Terraform examples in the 
+[code/terraform folder](/code/terraform).
 
-All the code examples in the `master` branch are for the 2nd edition of *Terraform: Up & Running*. If you're looking
-for the code examples from the 1st edition, please head over to the 
-[1st-edition branch](https://github.com/brikis98/terraform-up-and-running-code/tree/1st-edition).
+For instructions on running the code, please consult the README in each folder, and, of course, the
+*[Terraform: Up and Running](http://www.terraformupandrunning.com)* book.
 
 
 

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

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": "*"
+    }
+  ]
+}

code/opa/09-testing-terraform-code/README.md

@@ -0,0 +1,14 @@
+# OPA example
+
+This folder contains example [Open Policy Agent (OPA)](https://www.openpolicyagent.org/) policy that enforces all 
+resources include a specific tag.
+
+For more info, please see Chapter 9, "How to test Terraform code", of
+*[Terraform: Up and Running](http://www.terraformupandrunning.com)*.
+
+## Quick start
+
+Please see the README in the companion Terraform module at 
+[09-testing-terraform-code/examples/opa](../../terraform/09-testing-terraform-code/examples/opa) for instructions on 
+how to use this policy to test that module.
+

code/opa/09-testing-terraform-code/enforce_tagging.rego

@@ -0,0 +1,6 @@
+package tuar
+
+allow {
+   resource_change := input.resource_changes[_]
+   resource_change.change.after.tags["ManagedBy"]
+}

code/packer/01-why-terraform/webserver.json

@@ -1,10 +1,10 @@
 {
   "builders": [{
-    "ami_name": "packer-example",
+    "ami_name": "packer-example-{{isotime | clean_resource_name}}",
     "instance_type": "t2.micro",
     "region": "us-east-2",
     "type": "amazon-ebs",
-    "source_ami": "ami-0c55b159cbfafe1f0",
+    "source_ami": "ami-0fb653ca2d3203ac1",
     "ssh_username": "ubuntu"
   }],
   "provisioners": [{
@@ -16,6 +16,7 @@
     ],
     "environment_vars": [
       "DEBIAN_FRONTEND=noninteractive"
-    ]
+    ],
+    "pause_before": "60s"
   }]
 }

code/ruby/04-terraform-modules/function-example.rb

@@ -1,6 +1,7 @@
+# Define the function in one place
 def example_function()
   puts "Hello, World"
 end
 
-# Other places in your code
+# Use the function in multiple other places
 example_function()

code/ruby/04-terraform-modules/function-with-input-and-output-params-example.rb

@@ -1,6 +1,7 @@
+# A function that returns a value
 def example_function(param1, param2)
   return "Hello, #{param1} #{param2}"
 end
 
-# Other places in your code
+# Call the function and get the return value
 return_value = example_function("foo", "bar")

code/ruby/04-terraform-modules/function-with-input-params-example.rb

@@ -1,6 +1,7 @@
+# A function with two input parameters
 def example_function(param1, param2)
   puts "Hello, #{param1} #{param2}"
 end
 
-# Other places in your code
+# Pass two input parameters to the function
 example_function("foo", "bar")