Updates from bitrot livestream (#16)

- Remove minor version pin for postgres versions (i.e. 12.5 -> 12)
- Update s3 config to use separate versioning and encryption terraform resources
- Use bucket_prefix instead of bucket for bucket naming to avoid name conflicts

Stream: https://youtu.be/KWwKPYuOGBw

04-variables-and-outputs/examples/main.tf

@@ -37,7 +37,7 @@ resource "aws_db_instance" "db_instance" {
   allocated_storage   = 20
   storage_type        = "gp2"
   engine              = "postgres"
-  engine_version      = "12.4"
+  engine_version      = "12"
   instance_class      = "db.t2.micro"
   name                = "mydb"
   username            = var.db_user

04-variables-and-outputs/web-app/main.tf

@@ -45,17 +45,22 @@ resource "aws_instance" "instance_2" {
 }
 
 resource "aws_s3_bucket" "bucket" {
-  bucket        = var.bucket_name
+  bucket_prefix = var.bucket_prefix
   force_destroy = true
-  versioning {
-    enabled = true
-  }
+}
 
-  server_side_encryption_configuration {
-    rule {
-      apply_server_side_encryption_by_default {
-        sse_algorithm = "AES256"
-      }
+resource "aws_s3_bucket_versioning" "bucket_versioning" {
+  bucket = aws_s3_bucket.bucket.id
+  versioning_configuration {
+    status = "Enabled"
+  }
+}
+
+resource "aws_s3_bucket_server_side_encryption_configuration" "bucket_crypto_conf" {
+  bucket = aws_s3_bucket.bucket.bucket
+  rule {
+    apply_server_side_encryption_by_default {
+      sse_algorithm = "AES256"
     }
   }
 }
@@ -202,7 +207,7 @@ resource "aws_db_instance" "db_instance" {
   allocated_storage   = 20
   storage_type        = "standard"
   engine              = "postgres"
-  engine_version      = "12.5"
+  engine_version      = "12"
   instance_class      = "db.t2.micro"
   name                = var.db_name
   username            = var.db_user

04-variables-and-outputs/web-app/terraform.tfvars

@@ -1,5 +1,5 @@
-bucket_name = "devops-directive-web-app-data"
-domain      = "devopsdeployed.com"
-db_name     = "mydb"
-db_user     = "foo"
+bucket_prefix = "devops-directive-web-app-data"
+domain        = "devopsdeployed.com"
+db_name       = "mydb"
+db_user       = "foo"
 # db_pass = "foobarbaz"

04-variables-and-outputs/web-app/variables.tf

@@ -22,8 +22,8 @@ variable "instance_type" {
 
 # S3 Variables
 
-variable "bucket_name" {
-  description = "name of s3 bucket for app data"
+variable "bucket_prefix" {
+  description = "prefix of s3 bucket for app data"
   type        = string
 }