fix: add more random names (#70)

Signed-off-by: matttrach <matt.trachier@suse.com>

examples/basic/main.tf

@@ -11,18 +11,26 @@ provider "acme" {
   server_url = "https://acme-staging-v02.api.letsencrypt.org/directory"
 }
 locals {
-  identifier = var.identifier
+  identifier   = var.identifier
-  name       = "tf-${local.identifier}"
+  example      = "basic"
-  zone       = var.zone
+  project_name = "tf-${substr(md5(join("-", [local.example, random_pet.string.id])), 0, 5)}-${local.identifier}"
-  domain     = "${local.identifier}.${local.zone}"
+  zone         = var.zone
+  domain       = "${local.identifier}.${local.zone}"
+}
+resource "random_pet" "string" {
+  keepers = {
+    # regenerate the pet name when the identifier changes
+    identifier = local.identifier
+  }
+  length = 1
 }
 # AWS reserves the first four IP addresses and the last IP address in any CIDR block for its own use (cumulatively)
 module "this" {
   source              = "../../"
-  vpc_name            = local.name
+  vpc_name            = "${local.project_name}-vpc"
   vpc_cidr            = "10.0.255.0/24" # gives 256 usable addresses from .1 to .254, but AWS reserves .1 to .4 and .255, leaving .5 to .254
-  security_group_name = local.name
+  security_group_name = "${local.project_name}-sg"
   security_group_type = "egress"
-  load_balancer_name  = local.name
+  load_balancer_name  = "${local.project_name}-lb"
   domain              = local.domain
 }

examples/basic/versions.tf

@@ -9,9 +9,13 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 5.11"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
+    }
     acme = {
       source  = "vancluever/acme"
       version = ">= 2.0"
     }
   }
-}
+}

examples/domain/main.tf

@@ -11,21 +11,29 @@ provider "acme" {
   server_url = "https://acme-staging-v02.api.letsencrypt.org/directory"
 }
 locals {
-  identifier = var.identifier
+  identifier   = var.identifier
-  name       = "tf-${local.identifier}"
+  example      = "domain"
-  owner      = "terraform-ci@suse.com"
+  project_name = "tf-${substr(md5(join("-", [local.example, random_pet.string.id])), 0, 5)}-${local.identifier}"
-  zone       = var.zone
+  owner        = "terraform-ci@suse.com"
-  domain     = "${local.identifier}.${local.zone}"
+  zone         = var.zone
+  domain       = "${local.identifier}.${local.zone}"
   #zone = var.domain_zone
 }
+resource "random_pet" "string" {
+  keepers = {
+    # regenerate the pet name when the identifier changes
+    identifier = local.identifier
+  }
+  length = 1
+}
 # AWS reserves the first four IP addresses and the last IP address in any CIDR block for its own use (cumulatively)
 module "this" {
   source              = "../../"
-  vpc_name            = local.name
+  vpc_name            = "${local.project_name}-vpc"
   vpc_cidr            = "10.0.255.0/24" # gives 256 usable addresses from .1 to .254, but AWS reserves .1 to .4 and .255, leaving .5 to .254
-  security_group_name = local.name
+  security_group_name = "${local.project_name}-sg"
   security_group_type = "project"
-  load_balancer_name  = local.name
+  load_balancer_name  = "${local.project_name}-lb"
   domain              = local.domain
   #domain_zone         = local.zone # only specify when creating a new zone
 }

examples/domain/versions.tf

@@ -9,9 +9,13 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 5.11"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
+    }
     acme = {
       source  = "vancluever/acme"
       version = ">= 2.0"
     }
   }
-}
+}

examples/ingress/main.tf

@@ -12,20 +12,28 @@ provider "acme" {
   #server_url = "https://acme-v02.api.letsencrypt.org/directory" # use this url in production
 }
 locals {
-  identifier = var.identifier
+  identifier   = var.identifier
-  name       = "tf-${local.identifier}"
+  example      = "ingress"
-  zone       = var.zone
+  project_name = "tf-${substr(md5(join("-", [local.example, random_pet.string.id])), 0, 5)}-${local.identifier}"
-  domain     = "${local.identifier}.${local.zone}"
+  zone         = var.zone
+  domain       = "${local.identifier}.${local.zone}"
+}
+resource "random_pet" "string" {
+  keepers = {
+    # regenerate the pet name when the identifier changes
+    identifier = local.identifier
+  }
+  length = 1
 }
 # AWS reserves the first four IP addresses and the last IP address in any CIDR block for its own use (cumulatively)
 module "this" {
   source              = "../../"
-  vpc_name            = local.name
+  vpc_name            = "${local.project_name}-vpc"
   vpc_cidr            = "10.0.255.0/24" # gives 256 usable addresses from .1 to .254, but AWS reserves .1 to .4 and .255, leaving .5 to .254
-  security_group_name = local.name
+  security_group_name = "${local.project_name}-sg"
   security_group_type = "egress"
   domain              = local.domain
-  load_balancer_name  = local.name
+  load_balancer_name  = "${local.project_name}-lb"
   load_balancer_access_cidrs = {
     application = {
       port     = 443

examples/ingress/versions.tf

@@ -9,9 +9,13 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 5.11"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
+    }
     acme = {
       source  = "vancluever/acme"
       version = ">= 2.0"
     }
   }
-}
+}

examples/loadbalancer/main.tf

@@ -11,16 +11,24 @@ provider "acme" {
   server_url = "https://acme-staging-v02.api.letsencrypt.org/directory"
 }
 locals {
-  identifier = var.identifier
+  identifier   = var.identifier
-  name       = "tf-${local.identifier}"
+  example      = "loadbalancer"
+  project_name = "tf-${substr(md5(join("-", [local.example, random_pet.string.id])), 0, 5)}-${local.identifier}"
+}
+resource "random_pet" "string" {
+  keepers = {
+    # regenerate the pet name when the identifier changes
+    identifier = local.identifier
+  }
+  length = 1
 }
 # AWS reserves the first four IP addresses and the last IP address in any CIDR block for its own use (cumulatively)
 module "this" {
   source              = "../../"
-  vpc_name            = local.name
+  vpc_name            = "${local.project_name}-vpc"
   vpc_cidr            = "10.0.255.0/24" # gives 256 usable addresses from .1 to .254, but AWS reserves .1 to .4 and .255, leaving .5 to .254
-  security_group_name = local.name
+  security_group_name = "${local.project_name}-sg"
   security_group_type = "project"
-  load_balancer_name  = local.name
+  load_balancer_name  = "${local.project_name}-lb"
   domain_use_strategy = "skip"
 }

examples/loadbalancer/versions.tf

@@ -9,9 +9,13 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 5.11"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
+    }
     acme = {
       source  = "vancluever/acme"
       version = ">= 2.0"
     }
   }
-}
+}

examples/securitygroup/main.tf

@@ -11,15 +11,23 @@ provider "acme" {
   server_url = "https://acme-staging-v02.api.letsencrypt.org/directory"
 }
 locals {
-  identifier = var.identifier
+  identifier   = var.identifier
-  name       = "tf-${local.identifier}"
+  example      = "securitygroup"
+  project_name = "tf-${substr(md5(join("-", [local.example, random_pet.string.id])), 0, 5)}-${local.identifier}"
+}
+resource "random_pet" "string" {
+  keepers = {
+    # regenerate the pet name when the identifier changes
+    identifier = local.identifier
+  }
+  length = 1
 }
 # AWS reserves the first four IP addresses and the last IP address in any CIDR block for its own use (cumulatively)
 module "this" {
   source                     = "../../"
-  vpc_name                   = local.name
+  vpc_name                   = "${local.project_name}-vpc"
   vpc_cidr                   = "10.0.255.0/24" # gives 256 usable addresses from .1 to .254, but AWS reserves .1 to .4 and .255, leaving .5 to .254
-  security_group_name        = local.name
+  security_group_name        = "${local.project_name}-sg"
   security_group_type        = "project"
   load_balancer_use_strategy = "skip" # everything depending on load balancer is skipped implicitly
 }

examples/securitygroup/versions.tf

@@ -9,9 +9,13 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 5.11"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
+    }
     acme = {
       source  = "vancluever/acme"
       version = ">= 2.0"
     }
   }
-}
+}

examples/selectvpc/main.tf

@@ -12,15 +12,23 @@ provider "acme" {
 }
 
 locals {
-  identifier = var.identifier
+  identifier   = var.identifier
-  name       = "tf-${local.identifier}"
+  example      = "selectvpc"
-  zone       = var.zone
+  project_name = "tf-${substr(md5(join("-", [local.example, random_pet.string.id])), 0, 5)}-${local.identifier}"
-  domain     = "${local.identifier}.${local.zone}"
+  zone         = var.zone
+  domain       = "${local.identifier}.${local.zone}"
+}
+resource "random_pet" "string" {
+  keepers = {
+    # regenerate the pet name when the identifier changes
+    identifier = local.identifier
+  }
+  length = 1
 }
 
 module "setup" {
   source              = "../../"
-  vpc_name            = local.name
+  vpc_name            = "${local.project_name}-vpc"
   vpc_cidr            = "10.0.255.0/24"
   subnet_use_strategy = "skip"
 }
@@ -32,8 +40,8 @@ module "this" {
   source              = "../../"
   vpc_use_strategy    = "select"
   vpc_name            = module.setup.vpc.tags.Name
-  security_group_name = local.name
+  security_group_name = "${local.project_name}-sg"
   security_group_type = "egress"
-  load_balancer_name  = local.name
+  load_balancer_name  = "${local.project_name}-lb"
   domain              = local.domain
 }

examples/selectvpc/versions.tf

@@ -9,9 +9,13 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 5.11"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
+    }
     acme = {
       source  = "vancluever/acme"
       version = ">= 2.0"
     }
   }
-}
+}

examples/skipvpc/versions.tf

@@ -9,9 +9,13 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 5.11"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
+    }
     acme = {
       source  = "vancluever/acme"
       version = ">= 2.0"
     }
   }
-}
+}

examples/subnets/main.tf

@@ -11,13 +11,21 @@ provider "acme" {
   server_url = "https://acme-staging-v02.api.letsencrypt.org/directory"
 }
 locals {
-  identifier = var.identifier
+  identifier   = var.identifier
-  name       = "tf-${local.identifier}"
+  example      = "subnets"
+  project_name = "tf-${substr(md5(join("-", [local.example, random_pet.string.id])), 0, 5)}-${local.identifier}"
+}
+resource "random_pet" "string" {
+  keepers = {
+    # regenerate the pet name when the identifier changes
+    identifier = local.identifier
+  }
+  length = 1
 }
 # AWS reserves the first four IP addresses and the last IP address in any CIDR block for its own use (cumulatively)
 module "this" {
   source   = "../../"
-  vpc_name = local.name
+  vpc_name = "${local.project_name}-vpc"
   vpc_cidr = "10.0.255.0/24" # gives 256 usable addresses from .1 to .254, but AWS reserves .1 to .4 and .255, leaving .5 to .254
   subnets = {
     "subnetA" = {

examples/subnets/versions.tf

@@ -9,9 +9,13 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 5.11"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
+    }
     acme = {
       source  = "vancluever/acme"
       version = ">= 2.0"
     }
   }
-}
+}

examples/vpc/main.tf

@@ -11,13 +11,21 @@ provider "acme" {
   server_url = "https://acme-staging-v02.api.letsencrypt.org/directory"
 }
 locals {
-  identifier = var.identifier
+  identifier   = var.identifier
-  name       = "tf-${local.identifier}"
+  example      = "vpc"
+  project_name = "tf-${substr(md5(join("-", [local.example, random_pet.string.id])), 0, 5)}-${local.identifier}"
+}
+resource "random_pet" "string" {
+  keepers = {
+    # regenerate the pet name when the identifier changes
+    identifier = local.identifier
+  }
+  length = 1
 }
 # AWS reserves the first four IP addresses and the last IP address in any CIDR block for its own use (cumulatively)
 module "this" {
   source              = "../../"
-  vpc_name            = local.name
+  vpc_name            = "${local.project_name}-vpc"
   vpc_cidr            = "10.0.255.0/24" # gives 256 usable addresses from .1 to .254, but AWS reserves .1 to .4 and .255, leaving .5 to .254
   subnet_use_strategy = "skip"          # everything depending on subnet is skipped implicitly
 }

examples/vpc/versions.tf

@@ -9,9 +9,13 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 5.11"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
+    }
     acme = {
       source  = "vancluever/acme"
       version = ">= 2.0"
     }
   }
-}
+}