extract network into module

koenighotze · May 3, 2024 · 62badcd · 62badcd
1 parent 664ddf6
commit 62badcd
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 19 deletions.
diff --git a/getting-started/08/locals.tf b/getting-started/08/locals.tf
@@ -4,12 +4,6 @@ locals {
 
   firewall_target_tags = ["webserver"]
 
-  website_bucket_name = lower("website-${local.name_postfix}")
-  website_content = [
-    "index.html",
-    "404.html"
-  ]
-
   default_labels = {
     purpose        = "gcp-terraform-training"
     gettingstarted = local.name_postfix

diff --git a/getting-started/08/modules/website/bucket.tf b/getting-started/08/modules/website/bucket.tf
@@ -1,6 +1,6 @@
 resource "google_storage_bucket" "websitecontent" {
   #checkov:skip=CKV_GCP_62: No logging needed
-  name     = var.website_bucket_name
+  name     = lower("website-${var.name_postfix}")
   location = var.region
   # we do not use object level ACLs
   uniform_bucket_level_access = true

diff --git a/getting-started/08/modules/website/variables.tf b/getting-started/08/modules/website/variables.tf
@@ -1,10 +1,6 @@
-variable "website_bucket_name" {
-  description = "The name of the bucket to store the website content"
+variable "name_postfix" {
+  description = "A postfix to append to the name of the resources"
   type        = string
-  validation {
-    condition     = can(regex("^[a-z0-9][a-z0-9-.]{1,61}[a-z0-9]$", var.website_bucket_name))
-    error_message = "The website_bucket_name must start and end with a lowercase letter or number, and only contain lowercase letters, numbers, and dashes. It must be between 3 and 63 characters."
-  }
 }
 
 variable "region" {

diff --git a/getting-started/08/variables.tf b/getting-started/08/variables.tf
@@ -29,11 +29,6 @@ variable "sa_email" {
   }
 }
 
-variable "rebuild_mig" {
-  type    = bool
-  default = false
-}
-
 variable "mig_pool_size" {
   type    = number
   default = 2

diff --git a/getting-started/08/website.tf b/getting-started/08/website.tf
@@ -3,5 +3,5 @@ module "website" {
 
   region                         = var.region
   instance_service_account_email = google_service_account.instance_service_account.email
-  website_bucket_name            = "website"
+  name_postfix                   = local.name_postfix
 }