chore: align resource naming

examples/dns/README.md

@@ -44,9 +44,10 @@ resources:
 |------|-------------|------|---------|:--------:|
 | access\_key | AWS Access Key | `string` | n/a | yes |
 | hosted\_zone\_id | The id of the hosted zone in which this record set will reside. | `string` | n/a | yes |
-| name | Name of the example application | `string` | n/a | yes |
 | region | AWS Region | `string` | n/a | yes |
 | secret\_key | AWS Secret Key | `string` | n/a | yes |
+| name | Name of the example application | `string` | `"hum-rp-dns-example"` | no |
+| prefix | Prefix of the created resources | `string` | `"hum-rp-dns-ex-"` | no |
 | resource\_packs\_aws\_rev | AWS Resource Pack git branch | `string` | `"refs/heads/main"` | no |
 | resource\_packs\_aws\_url | AWS Resource Pack git url | `string` | `"https://github.com/humanitec-architecture/resource-packs-aws.git"` | no |
 <!-- END_TF_DOCS -->

examples/dns/main.tf

@@ -1,7 +1,3 @@
-locals {
-  res_def_prefix = "${var.name}-"
-}
-
 resource "humanitec_application" "example" {
   id   = var.name
   name = var.name
@@ -16,7 +12,7 @@ module "route53" {
   resource_packs_aws_rev = var.resource_packs_aws_rev
   region                 = var.region
 
-  prefix = local.res_def_prefix
+  prefix = var.prefix
 
   hosted_zone_id = var.hosted_zone_id
 }

examples/dns/terraform.tfvars.example

@@ -6,7 +6,10 @@ access_key = ""
 hosted_zone_id = ""
 
 # Name of the example application
-name = ""
+name = "hum-rp-dns-example"
+
+# Prefix of the created resources
+prefix = "hum-rp-dns-ex-"
 
 # AWS Region
 region = ""

examples/dns/variables.tf

@@ -25,12 +25,19 @@ variable "resource_packs_aws_rev" {
   default     = "refs/heads/main"
 }
 
+variable "hosted_zone_id" {
+  description = "The id of the hosted zone in which this record set will reside."
+  type        = string
+}
+
 variable "name" {
   description = "Name of the example application"
   type        = string
+  default     = "hum-rp-dns-example"
 }
 
-variable "hosted_zone_id" {
-  description = "The id of the hosted zone in which this record set will reside."
+variable "prefix" {
+  description = "Prefix of the created resources"
   type        = string
+  default     = "hum-rp-dns-ex-"
 }

examples/mysql/aurora/README.md

@@ -47,12 +47,13 @@ resources:
 | humanitec\_org\_id | Humanitec organization where resource definitions will be applied | `string` | n/a | yes |
 | humanitec\_token | Humanitec API token | `string` | n/a | yes |
 | k8s\_node\_security\_group\_id | AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster | `string` | n/a | yes |
-| name | Name that will be used in resouces' names | `string` | n/a | yes |
 | region | AWS Region to create resources | `string` | n/a | yes |
 | secret\_key | AWS Secret Key | `string` | n/a | yes |
 | subnet\_ids | AWS Subnet IDs to use for the AWS RDS cluster | `set(string)` | n/a | yes |
 | vpc\_id | AWS VPC ID | `string` | n/a | yes |
 | humanitec\_host | Humanitec API host url | `string` | `"https://api.humanitec.io"` | no |
+| name | Name of the example application | `string` | `"hum-rp-mysql-example"` | no |
+| prefix | Prefix of the created resources | `string` | `"hum-rp-mysql-ex-"` | no |
 | resource\_packs\_aws\_rev | AWS Resource Pack git branch | `string` | `"refs/heads/main"` | no |
 | resource\_packs\_aws\_url | AWS Resource Pack git url | `string` | `"https://github.com/humanitec-architecture/resource-packs-aws.git"` | no |
 <!-- END_TF_DOCS -->

examples/mysql/aurora/main.tf

@@ -6,22 +6,21 @@ resource "humanitec_application" "app" {
 module "mysql" {
   source = "../../../humanitec-resource-defs/mysql/aurora"
 
-  prefix                 = "${var.name}-"
   resource_packs_aws_rev = var.resource_packs_aws_rev
   resource_packs_aws_url = var.resource_packs_aws_url
 
   access_key = var.access_key
   secret_key = var.secret_key
   region     = var.region
 
-  name            = "${var.name}-database"
+  prefix          = var.prefix
+  name            = var.name
   database_name   = "my_database"
   master_username = "username"
   master_password = "password"
 
   vpc                    = var.vpc_id
   subnets                = var.subnet_ids
-  db_subnet_group_name   = "${var.name}-subnet-group"
   create_db_subnet_group = true
   security_group_rules = {
     ingress = {

examples/mysql/aurora/terraform.tfvars.example

@@ -14,8 +14,11 @@ humanitec_token = ""
 # AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster
 k8s_node_security_group_id = ""
 
-# Name that will be used in resouces' names
-name = ""
+# Name of the example application
+name = "hum-rp-mysql-example"
+
+# Prefix of the created resources
+prefix = "hum-rp-mysql-ex-"
 
 # AWS Region to create resources
 region = ""

examples/mysql/aurora/variables.tf

@@ -1,8 +1,3 @@
-variable "name" {
-  type        = string
-  description = "Name that will be used in resouces' names"
-}
-
 variable "access_key" {
   type        = string
   description = "AWS Access Key"
@@ -60,3 +55,15 @@ variable "k8s_node_security_group_id" {
   description = "AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster"
   type        = string
 }
+
+variable "name" {
+  description = "Name of the example application"
+  type        = string
+  default     = "hum-rp-mysql-example"
+}
+
+variable "prefix" {
+  description = "Prefix of the created resources"
+  type        = string
+  default     = "hum-rp-mysql-ex-"
+}

examples/mysql/basic/README.md

@@ -50,12 +50,13 @@ resources:
 | humanitec\_org\_id | Humanitec organization where resource definitions will be applied | `string` | n/a | yes |
 | humanitec\_token | Humanitec API token | `string` | n/a | yes |
 | k8s\_node\_security\_group\_id | AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster | `string` | n/a | yes |
-| name | Name that will be used in resouces' names | `string` | n/a | yes |
 | region | AWS Region to create resources | `string` | n/a | yes |
 | secret\_key | AWS Secret Key | `string` | n/a | yes |
 | subnet\_ids | AWS Subnet IDs to use for the AWS RDS cluster | `set(string)` | n/a | yes |
 | vpc\_id | AWS VPC ID | `string` | n/a | yes |
 | humanitec\_host | Humanitec API host url | `string` | `"https://api.humanitec.io"` | no |
+| name | Name of the example application | `string` | `"hum-rp-mysql-example"` | no |
+| prefix | Prefix of the created resources | `string` | `"hum-rp-mysql-ex-"` | no |
 | resource\_packs\_aws\_rev | AWS Resource Pack git branch | `string` | `"refs/heads/main"` | no |
 | resource\_packs\_aws\_url | AWS Resource Pack git url | `string` | `"https://github.com/humanitec-architecture/resource-packs-aws.git"` | no |
 <!-- END_TF_DOCS -->

examples/mysql/basic/main.tf

@@ -6,21 +6,20 @@ resource "humanitec_application" "app" {
 module "mysql" {
   source = "../../../humanitec-resource-defs/mysql/basic"
 
-  prefix                 = "${var.name}-"
   resource_packs_aws_rev = var.resource_packs_aws_rev
   resource_packs_aws_url = var.resource_packs_aws_url
 
   access_key = var.access_key
   secret_key = var.secret_key
   region     = var.region
 
-  name          = "${var.name}-database"
+  prefix        = var.prefix
+  name          = var.name
   database_name = "my_database"
   username      = "username"
   password      = "password"
 
   create_db_subnet_group = true
-  db_subnet_group_name   = "${var.name}-subnet-group"
   subnet_ids             = var.subnet_ids
 
   vpc_security_group_ids = [aws_security_group.mysql.id]

examples/mysql/basic/terraform.tfvars.example

@@ -14,8 +14,11 @@ humanitec_token = ""
 # AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster
 k8s_node_security_group_id = ""
 
-# Name that will be used in resouces' names
-name = ""
+# Name of the example application
+name = "hum-rp-mysql-example"
+
+# Prefix of the created resources
+prefix = "hum-rp-mysql-ex-"
 
 # AWS Region to create resources
 region = ""

examples/mysql/basic/variables.tf

@@ -1,8 +1,3 @@
-variable "name" {
-  type        = string
-  description = "Name that will be used in resouces' names"
-}
-
 variable "access_key" {
   type        = string
   description = "AWS Access Key"
@@ -60,3 +55,15 @@ variable "k8s_node_security_group_id" {
   description = "AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster"
   type        = string
 }
+
+variable "name" {
+  description = "Name of the example application"
+  type        = string
+  default     = "hum-rp-mysql-example"
+}
+
+variable "prefix" {
+  description = "Prefix of the created resources"
+  type        = string
+  default     = "hum-rp-mysql-ex-"
+}

examples/postgres/aurora/README.md

@@ -47,12 +47,13 @@ resources:
 | humanitec\_org\_id | Humanitec organization where resource definitions will be applied | `string` | n/a | yes |
 | humanitec\_token | Humanitec API token | `string` | n/a | yes |
 | k8s\_node\_security\_group\_id | AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster | `string` | n/a | yes |
-| name | Name that will be used in resouces' names | `string` | n/a | yes |
 | region | AWS Region to create resources | `string` | n/a | yes |
 | secret\_key | AWS Secret Key | `string` | n/a | yes |
 | subnet\_ids | AWS Subnet IDs to use for the AWS RDS cluster | `set(string)` | n/a | yes |
 | vpc\_id | AWS VPC ID | `string` | n/a | yes |
 | humanitec\_host | Humanitec API host url | `string` | `"https://api.humanitec.io"` | no |
+| name | Name of the example application | `string` | `"hum-rp-postgres-example"` | no |
+| prefix | Prefix of the created resources | `string` | `"hum-rp-postgres-ex-"` | no |
 | resource\_packs\_aws\_rev | AWS Resource Pack git branch | `string` | `"refs/heads/main"` | no |
 | resource\_packs\_aws\_url | AWS Resource Pack git url | `string` | `"https://github.com/humanitec-architecture/resource-packs-aws.git"` | no |
 <!-- END_TF_DOCS -->

examples/postgres/aurora/main.tf

@@ -6,22 +6,21 @@ resource "humanitec_application" "app" {
 module "postgres" {
   source = "../../../humanitec-resource-defs/postgres/aurora"
 
-  prefix                 = "${var.name}-"
   resource_packs_aws_rev = var.resource_packs_aws_rev
   resource_packs_aws_url = var.resource_packs_aws_url
 
   access_key = var.access_key
   secret_key = var.secret_key
   region     = var.region
 
-  name            = "${var.name}-database"
+  prefix          = var.prefix
+  name            = var.name
   database_name   = "my_database"
   master_username = "username"
   master_password = "password"
 
   vpc                    = var.vpc_id
   subnets                = var.subnet_ids
-  db_subnet_group_name   = "${var.name}-subnet-group"
   create_db_subnet_group = true
   security_group_rules = {
     ingress = {

examples/postgres/aurora/terraform.tfvars.example

@@ -14,8 +14,11 @@ humanitec_token = ""
 # AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster
 k8s_node_security_group_id = ""
 
-# Name that will be used in resouces' names
-name = ""
+# Name of the example application
+name = "hum-rp-postgres-example"
+
+# Prefix of the created resources
+prefix = "hum-rp-postgres-ex-"
 
 # AWS Region to create resources
 region = ""

examples/postgres/aurora/variables.tf

@@ -1,8 +1,3 @@
-variable "name" {
-  type        = string
-  description = "Name that will be used in resouces' names"
-}
-
 variable "access_key" {
   type        = string
   description = "AWS Access Key"
@@ -60,3 +55,15 @@ variable "k8s_node_security_group_id" {
   description = "AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster"
   type        = string
 }
+
+variable "name" {
+  description = "Name of the example application"
+  type        = string
+  default     = "hum-rp-postgres-example"
+}
+
+variable "prefix" {
+  description = "Prefix of the created resources"
+  type        = string
+  default     = "hum-rp-postgres-ex-"
+}

examples/postgres/basic/README.md

@@ -50,12 +50,13 @@ resources:
 | humanitec\_org\_id | Humanitec organization where resource definitions will be applied | `string` | n/a | yes |
 | humanitec\_token | Humanitec API token | `string` | n/a | yes |
 | k8s\_node\_security\_group\_id | AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster | `string` | n/a | yes |
-| name | Name that will be used in resouces' names | `string` | n/a | yes |
 | region | AWS Region to create resources | `string` | n/a | yes |
 | secret\_key | AWS Secret Key | `string` | n/a | yes |
 | subnet\_ids | AWS Subnet IDs to use for the AWS RDS cluster | `set(string)` | n/a | yes |
 | vpc\_id | AWS VPC ID | `string` | n/a | yes |
 | humanitec\_host | Humanitec API host url | `string` | `"https://api.humanitec.io"` | no |
+| name | Name of the example application | `string` | `"hum-rp-postgres-example"` | no |
+| prefix | Prefix of the created resources | `string` | `"hum-rp-postgres-ex-"` | no |
 | resource\_packs\_aws\_rev | AWS Resource Pack git branch | `string` | `"refs/heads/main"` | no |
 | resource\_packs\_aws\_url | AWS Resource Pack git url | `string` | `"https://github.com/humanitec-architecture/resource-packs-aws.git"` | no |
 <!-- END_TF_DOCS -->

examples/postgres/basic/main.tf

@@ -6,21 +6,20 @@ resource "humanitec_application" "app" {
 module "postgres" {
   source = "../../../humanitec-resource-defs/postgres/basic"
 
-  prefix                 = "${var.name}-"
   resource_packs_aws_rev = var.resource_packs_aws_rev
   resource_packs_aws_url = var.resource_packs_aws_url
 
   access_key = var.access_key
   secret_key = var.secret_key
   region     = var.region
 
-  name          = "${var.name}-database"
+  prefix        = var.prefix
+  name          = var.name
   database_name = "my_database"
   username      = "username"
   password      = "password"
 
   create_db_subnet_group = true
-  db_subnet_group_name   = "${var.name}-subnet-group"
   subnet_ids             = var.subnet_ids
 
   vpc_security_group_ids = [aws_security_group.postgres.id]

examples/postgres/basic/terraform.tfvars.example

@@ -14,8 +14,11 @@ humanitec_token = ""
 # AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster
 k8s_node_security_group_id = ""
 
-# Name that will be used in resouces' names
-name = ""
+# Name of the example application
+name = "hum-rp-postgres-example"
+
+# Prefix of the created resources
+prefix = "hum-rp-postgres-ex-"
 
 # AWS Region to create resources
 region = ""

examples/postgres/basic/variables.tf

@@ -1,8 +1,3 @@
-variable "name" {
-  type        = string
-  description = "Name that will be used in resouces' names"
-}
-
 variable "access_key" {
   type        = string
   description = "AWS Access Key"
@@ -60,3 +55,15 @@ variable "k8s_node_security_group_id" {
   description = "AWS Security Group ID of the kubernetes nodes to allow access to the AWS RDS cluster"
   type        = string
 }
+
+variable "name" {
+  description = "Name of the example application"
+  type        = string
+  default     = "hum-rp-postgres-example"
+}
+
+variable "prefix" {
+  description = "Prefix of the created resources"
+  type        = string
+  default     = "hum-rp-postgres-ex-"
+}

examples/redis/README.md

@@ -53,7 +53,8 @@ resources:
 | secret\_key | AWS Secret Key | `string` | n/a | yes |
 | subnet\_ids | AWS Subnet IDs to use for the AWS ElastiCache cluster | `set(string)` | n/a | yes |
 | vpc\_id | AWS VPC ID | `string` | n/a | yes |
-| name | Name of the example application | `string` | `"redis-test"` | no |
+| name | Name of the example application | `string` | `"hum-rp-redis-example"` | no |
+| prefix | Prefix of the created resources | `string` | `"hum-rp-redis-ex-"` | no |
 | resource\_packs\_aws\_rev | AWS Resource Pack git branch | `string` | `"refs/heads/main"` | no |
 | resource\_packs\_aws\_url | AWS Resource Pack git url | `string` | `"https://github.com/humanitec-architecture/resource-packs-aws.git"` | no |
 <!-- END_TF_DOCS -->