update github org, fix terragrunt bug, new cloudfront dist

bryborge · Dec 3, 2023 · bcef7c2 · bcef7c2
1 parent 61af586
commit bcef7c2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/aws/live/production/blog/main.tf b/aws/live/production/blog/main.tf
@@ -7,7 +7,7 @@ locals {
   account_id         = "388372205874"
   region             = "us-west-2"
   env                = "production"
-  cloudfront_dist_id = "E3E47UCVRC2WJ9"
+  cloudfront_dist_id = "E2IV2DY4NDYVVW"
 }
 
 module "s3_bucket_site" {

diff --git a/aws/live/terragrunt.hcl b/aws/live/terragrunt.hcl
@@ -1,5 +1,6 @@
 locals {
-  account_id  = get_env("ACCOUNT_ID", get_aws_account_id())
+  path       = path_relative_to_include()
+  account_id = get_env("ACCOUNT_ID", get_aws_account_id())
 
   # Parse the file path we're in to read the env name: e.g., env will be "development" in the development folder,
   # "staging" in the staging folder, etc.
@@ -13,6 +14,9 @@ locals {
   #   3. The return value from `aws configure get region`
   default_region = get_env("AWS_DEFAULT_REGION", try(run_cmd("--terragrunt-quiet", "aws", "configure", "get", "region"), ""))
   region         = get_env("AWS_REGION", local.default_region)
+
+  bucket_name    = "tf-${local.env}-${local.region}-${local.account_id}"
+  dynamodb_table = "tf-lock-${local.env}"
 }
 
 # Remote state configuration.
@@ -22,20 +26,28 @@ remote_state {
 
   generate = {
     path      = "backend.tf"
-    if_exists = "overwrite"
+    if_exists = "overwrite_terragrunt"
   }
 
   config = {
     encrypt        = true
-    bucket         = "tf-${local.env}-${local.region}-${local.account_id}"
-    key            = "iac/${local.env}/${local.account_id}/${local.region}/terraform.tfstate"
+    bucket         = local.bucket_name
+    // key            = "iac/${local.env}/${local.account_id}/${local.region}/terraform.tfstate"
+    key            = "iac/${path_relative_to_include()}/${local.account_id}/${local.region}/terraform.tfstate"
     region         = local.region
-    dynamodb_table = "tf-lock-${local.env}"
+    dynamodb_table = local.dynamodb_table
   }
 }
 
 inputs = {
-  aws_account_id = local.account_id
-  aws_region     = local.region
-  environment    = local.env
+  aws_account_id             = local.account_id
+  aws_region                 = local.region
+  environment                = local.env
+  environment_bucket         = local.bucket_name
+  environment_dynamodb_table = local.dynamodb_table
+  tags = {
+    "Region"              = local.region,
+    "Environment"         = local.env,
+    "DeploymentDirectory" = local.path,
+  }
 }
diff --git a/aws/modules/default-vpc/main.tf b/aws/modules/default-vpc/main.tf
@@ -4,6 +4,6 @@ resource "aws_default_vpc" "default" {
     Region      = var.aws_region
     Environment = var.environment
     GithubRepo  = "cosmos"
-    GithubOrg   = "sonofborge"
+    GithubOrg   = "bryborge"
   }
 }