From 90be0cb7abd0d61fd945d1c4fa369332551328f1 Mon Sep 17 00:00:00 2001 From: Joris van de Donk Date: Fri, 4 Oct 2024 16:09:09 +0200 Subject: [PATCH] chore: fix tag names so that they match recommended best practices (all lowercase) --- modules/jenkins/README.md | 12 +-- modules/jenkins/examples/complete/dns.tf | 2 +- modules/jenkins/local.tf | 2 +- modules/jenkins/s3.tf | 2 +- modules/jenkins/variables.tf | 6 +- modules/perforce/examples/complete/dns.tf | 2 +- .../helix-authentication-service/README.md | 2 +- .../helix-authentication-service/variables.tf | 6 +- modules/perforce/helix-core/README.md | 50 ++++++------- modules/perforce/helix-core/variables.tf | 6 +- modules/perforce/helix-swarm/README.md | 4 +- modules/perforce/helix-swarm/variables.tf | 6 +- modules/unreal/horde/README.md | 4 +- modules/unreal/horde/variables.tf | 6 +- samples/simple-build-pipeline/README.md | 74 +++++++++---------- samples/simple-build-pipeline/dns.tf | 4 +- 16 files changed, 94 insertions(+), 94 deletions(-) diff --git a/modules/jenkins/README.md b/modules/jenkins/README.md index 43fffc05..49391e68 100644 --- a/modules/jenkins/README.md +++ b/modules/jenkins/README.md @@ -13,8 +13,8 @@ | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.57.0 | -| [random](#provider\_random) | 3.6.2 | +| [aws](#provider\_aws) | 5.69.0 | +| [random](#provider\_random) | 3.6.3 | ## Modules @@ -92,9 +92,9 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [artifact\_buckets](#input\_artifact\_buckets) | List of Amazon S3 buckets you wish to create to store build farm artifacts. | 
map(
    object({
      name                 = string
      enable_force_destroy = optional(bool, true)
      enable_versioning    = optional(bool, true)
      tags                 = optional(map(string), {})
    })
  )
| `null` | no | -| [build\_farm\_compute](#input\_build\_farm\_compute) | Each object in this map corresponds to an ASG used by Jenkins as build agents. | 
map(object(
    {
      ami = string
      #TODO: Support mixed instances / spot with custom policies
      instance_type     = string
      ebs_optimized     = optional(bool, true)
      enable_monitoring = optional(bool, true)
    }
  ))
| `{}` | no | -| [build\_farm\_fsx\_openzfs\_storage](#input\_build\_farm\_fsx\_openzfs\_storage) | Each object in this map corresponds to an FSx OpenZFS file system used by the Jenkins build agents. | 
map(object(
    {
      storage_capacity    = number
      throughput_capacity = number
      storage_type        = optional(string, "SSD") # "SSD", "HDD"
      deployment_type     = optional(string, "SINGLE_AZ_1")
      route_table_ids     = optional(list(string), null)
      tags                = optional(map(string), null)
    }
  ))
| `{}` | no | +| [artifact\_buckets](#input\_artifact\_buckets) | List of Amazon S3 buckets you wish to create to store build farm artifacts. | 
map(
    object({
      name                 = string
      enable_force_destroy = optional(bool, true)
      enable_versioning    = optional(bool, true)
      tags                 = optional(map(string), {})
    })
  )
| `null` | no | +| [build\_farm\_compute](#input\_build\_farm\_compute) | Each object in this map corresponds to an ASG used by Jenkins as build agents. | 
map(object(
    {
      ami = string
      #TODO: Support mixed instances / spot with custom policies
      instance_type     = string
      ebs_optimized     = optional(bool, true)
      enable_monitoring = optional(bool, true)
    }
  ))
| `{}` | no | +| [build\_farm\_fsx\_openzfs\_storage](#input\_build\_farm\_fsx\_openzfs\_storage) | Each object in this map corresponds to an FSx OpenZFS file system used by the Jenkins build agents. | 
map(object(
    {
      storage_capacity    = number
      throughput_capacity = number
      storage_type        = optional(string, "SSD") # "SSD", "HDD"
      deployment_type     = optional(string, "SINGLE_AZ_1")
      route_table_ids     = optional(list(string), null)
      tags                = optional(map(string), null)
    }
  ))
| `{}` | no | | [build\_farm\_subnets](#input\_build\_farm\_subnets) | The subnets to deploy the build farms into. | `list(string)` | n/a | yes | | [certificate\_arn](#input\_certificate\_arn) | The TLS certificate ARN for the Jenkins service load balancer. | `string` | n/a | yes | | [cluster\_name](#input\_cluster\_name) | The ARN of the cluster to deploy the Jenkins service into. Defaults to null and a cluster will be created. | `string` | `null` | no | @@ -124,7 +124,7 @@ No modules. | [jenkins\_service\_subnets](#input\_jenkins\_service\_subnets) | A list of subnets to deploy the Jenkins service into. Private subnets are recommended. | `list(string)` | n/a | yes | | [name](#input\_name) | The name attached to Jenkins module resources. | `string` | `"jenkins"` | no | | [project\_prefix](#input\_project\_prefix) | The project prefix for this workload. This is appeneded to the beginning of most resource names. | `string` | `"cgd"` | no | -| [tags](#input\_tags) | Tags to apply to resources. | `map(any)` | 
{
  "IAC_MANAGEMENT": "CGD-Toolkit",
  "IAC_MODULE": "Jenkins",
  "IAC_PROVIDER": "Terraform"
}
| no | +| [tags](#input\_tags) | Tags to apply to resources. | `map(any)` | 
{
  "iac-management": "CGD-Toolkit",
  "iac-module": "Jenkins",
  "iac-provider": "Terraform"
}
| no | | [vpc\_id](#input\_vpc\_id) | The ID of the existing VPC you would like to deploy the Jenkins service and build farms into. | `string` | n/a | yes | ## Outputs diff --git a/modules/jenkins/examples/complete/dns.tf b/modules/jenkins/examples/complete/dns.tf index c2a984d1..663ef385 100644 --- a/modules/jenkins/examples/complete/dns.tf +++ b/modules/jenkins/examples/complete/dns.tf @@ -26,7 +26,7 @@ resource "aws_acm_certificate" "jenkins" { validation_method = "DNS" tags = { - Environment = "dev" + environment = "dev" } lifecycle { diff --git a/modules/jenkins/local.tf b/modules/jenkins/local.tf index 1debad2a..f088f70d 100644 --- a/modules/jenkins/local.tf +++ b/modules/jenkins/local.tf @@ -4,6 +4,6 @@ locals { name_prefix = "${var.project_prefix}-${var.name}" tags = merge(var.tags, { - "ENVIRONMENT" = var.environment + "environment" = var.environment }) } diff --git a/modules/jenkins/s3.tf b/modules/jenkins/s3.tf index 95bdefc6..26f1079e 100644 --- a/modules/jenkins/s3.tf +++ b/modules/jenkins/s3.tf @@ -19,7 +19,7 @@ resource "aws_s3_bucket" "artifact_buckets" { tags = merge( { - "ENVIRONMENT" = var.environment + "environment" = var.environment }, each.value.tags, ) diff --git a/modules/jenkins/variables.tf b/modules/jenkins/variables.tf index 1126ca2a..b7d418ac 100644 --- a/modules/jenkins/variables.tf +++ b/modules/jenkins/variables.tf @@ -29,9 +29,9 @@ variable "environment" { variable "tags" { type = map(any) default = { - "IAC_MANAGEMENT" = "CGD-Toolkit" - "IAC_MODULE" = "Jenkins" - "IAC_PROVIDER" = "Terraform" + "iac-management" = "CGD-Toolkit" + "iac-module" = "Jenkins" + "iac-provider" = "Terraform" } description = "Tags to apply to resources." } diff --git a/modules/perforce/examples/complete/dns.tf b/modules/perforce/examples/complete/dns.tf index 6c238e68..a3d9a107 100644 --- a/modules/perforce/examples/complete/dns.tf +++ b/modules/perforce/examples/complete/dns.tf @@ -71,7 +71,7 @@ resource "aws_acm_certificate" "helix" { validation_method = "DNS" tags = { - Environment = "dev" + environment = "dev" } lifecycle { diff --git a/modules/perforce/helix-authentication-service/README.md b/modules/perforce/helix-authentication-service/README.md index 05533bc8..3ba933e1 100644 --- a/modules/perforce/helix-authentication-service/README.md +++ b/modules/perforce/helix-authentication-service/README.md @@ -91,7 +91,7 @@ No modules. | [internal](#input\_internal) | Set this flag to true if you do not want the Helix Authentication Service load balancer to have a public IP. | `bool` | `false` | no | | [name](#input\_name) | The name attached to Helix Authentication Service module resources. | `string` | `"helix-auth-svc"` | no | | [project\_prefix](#input\_project\_prefix) | The project prefix for this workload. This is appeneded to the beginning of most resource names. | `string` | `"cgd"` | no | -| [tags](#input\_tags) | Tags to apply to resources. | `map(any)` | 
{
  "IAC_MANAGEMENT": "CGD-Toolkit",
  "IAC_MODULE": "helix-authentication-service",
  "IAC_PROVIDER": "Terraform"
}
| no | +| [tags](#input\_tags) | Tags to apply to resources. | `map(any)` | 
{
  "iac-management": "CGD-Toolkit",
  "iac-module": "helix-authentication-service",
  "iac-provider": "Terraform"
}
| no | | [vpc\_id](#input\_vpc\_id) | The ID of the existing VPC you would like to deploy Helix Authentication Service into. | `string` | n/a | yes | ## Outputs diff --git a/modules/perforce/helix-authentication-service/variables.tf b/modules/perforce/helix-authentication-service/variables.tf index 97b2a8f0..e365b2b0 100644 --- a/modules/perforce/helix-authentication-service/variables.tf +++ b/modules/perforce/helix-authentication-service/variables.tf @@ -28,9 +28,9 @@ variable "environment" { variable "tags" { type = map(any) default = { - "IAC_MANAGEMENT" = "CGD-Toolkit" - "IAC_MODULE" = "helix-authentication-service" - "IAC_PROVIDER" = "Terraform" + "iac-management" = "CGD-Toolkit" + "iac-module" = "helix-authentication-service" + "iac-provider" = "Terraform" } description = "Tags to apply to resources." } diff --git a/modules/perforce/helix-core/README.md b/modules/perforce/helix-core/README.md index 97eeda4e..fd40f79f 100644 --- a/modules/perforce/helix-core/README.md +++ b/modules/perforce/helix-core/README.md @@ -6,17 +6,17 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | 5.68.0 | -| [awscc](#requirement\_awscc) | 1.15.0 | +| [aws](#requirement\_aws) | 5.69.0 | +| [awscc](#requirement\_awscc) | 1.16.1 | | [random](#requirement\_random) | 3.6.3 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.59.0 | -| [awscc](#provider\_awscc) | 1.6.0 | -| [random](#provider\_random) | 3.6.2 | +| [aws](#provider\_aws) | 5.69.0 | +| [awscc](#provider\_awscc) | 1.16.1 | +| [random](#provider\_random) | 3.6.3 | ## Modules @@ -26,26 +26,26 @@ No modules. | Name | Type | |------|------| -| [aws_ebs_volume.depot](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/ebs_volume) | resource | -| [aws_ebs_volume.logs](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/ebs_volume) | resource | -| [aws_ebs_volume.metadata](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/ebs_volume) | resource | -| [aws_eip.helix_core_eip](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/eip) | resource | -| [aws_iam_instance_profile.helix_core_instance_profile](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/iam_instance_profile) | resource | -| [aws_iam_policy.helix_core_default_policy](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/iam_policy) | resource | -| [aws_iam_role.helix_core_default_role](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/iam_role) | resource | -| [aws_instance.helix_core_instance](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/instance) | resource | -| [aws_security_group.helix_core_security_group](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/security_group) | resource | -| [aws_volume_attachment.depot_attachment](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/volume_attachment) | resource | -| [aws_volume_attachment.logs_attachment](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/volume_attachment) | resource | -| [aws_volume_attachment.metadata_attachment](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/volume_attachment) | resource | -| [aws_vpc_security_group_egress_rule.helix_core_internet](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/vpc_security_group_egress_rule) | resource | -| [awscc_secretsmanager_secret.helix_core_super_user_password](https://registry.terraform.io/providers/hashicorp/awscc/1.15.0/docs/resources/secretsmanager_secret) | resource | -| [awscc_secretsmanager_secret.helix_core_super_user_username](https://registry.terraform.io/providers/hashicorp/awscc/1.15.0/docs/resources/secretsmanager_secret) | resource | +| [aws_ebs_volume.depot](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/ebs_volume) | resource | +| [aws_ebs_volume.logs](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/ebs_volume) | resource | +| [aws_ebs_volume.metadata](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/ebs_volume) | resource | +| [aws_eip.helix_core_eip](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/eip) | resource | +| [aws_iam_instance_profile.helix_core_instance_profile](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/iam_instance_profile) | resource | +| [aws_iam_policy.helix_core_default_policy](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/iam_policy) | resource | +| [aws_iam_role.helix_core_default_role](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/iam_role) | resource | +| [aws_instance.helix_core_instance](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/instance) | resource | +| [aws_security_group.helix_core_security_group](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/security_group) | resource | +| [aws_volume_attachment.depot_attachment](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/volume_attachment) | resource | +| [aws_volume_attachment.logs_attachment](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/volume_attachment) | resource | +| [aws_volume_attachment.metadata_attachment](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/volume_attachment) | resource | +| [aws_vpc_security_group_egress_rule.helix_core_internet](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/vpc_security_group_egress_rule) | resource | +| [awscc_secretsmanager_secret.helix_core_super_user_password](https://registry.terraform.io/providers/hashicorp/awscc/1.16.1/docs/resources/secretsmanager_secret) | resource | +| [awscc_secretsmanager_secret.helix_core_super_user_username](https://registry.terraform.io/providers/hashicorp/awscc/1.16.1/docs/resources/secretsmanager_secret) | resource | | [random_string.helix_core](https://registry.terraform.io/providers/hashicorp/random/3.6.3/docs/resources/string) | resource | -| [aws_ami.helix_core_ami](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/data-sources/ami) | data source | -| [aws_iam_policy_document.ec2_trust_relationship](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/data-sources/iam_policy_document) | data source | -| [aws_iam_policy_document.helix_core_default_policy](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/data-sources/iam_policy_document) | data source | -| [aws_subnet.instance_subnet](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/data-sources/subnet) | data source | +| [aws_ami.helix_core_ami](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/data-sources/ami) | data source | +| [aws_iam_policy_document.ec2_trust_relationship](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/data-sources/iam_policy_document) | data source | +| [aws_iam_policy_document.helix_core_default_policy](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/data-sources/iam_policy_document) | data source | +| [aws_subnet.instance_subnet](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/data-sources/subnet) | data source | ## Inputs @@ -72,7 +72,7 @@ No modules. | [project\_prefix](#input\_project\_prefix) | The project prefix for this workload. This is appeneded to the beginning of most resource names. | `string` | `"cgd"` | no | | [server\_type](#input\_server\_type) | The Perforce Helix Core server type. | `string` | n/a | yes | | [storage\_type](#input\_storage\_type) | The type of backing store [EBS, FSxZ] | `string` | n/a | yes | -| [tags](#input\_tags) | Tags to apply to resources. | `map(any)` | 
{
  "IAC_MANAGEMENT": "CGD-Toolkit",
  "IAC_MODULE": "helix-core",
  "IAC_PROVIDER": "Terraform"
}
| no | +| [tags](#input\_tags) | Tags to apply to resources. | `map(any)` | 
{
  "iac-management": "CGD-Toolkit",
  "iac-module": "helix-core",
  "iac-provider": "Terraform"
}
| no | | [vpc\_id](#input\_vpc\_id) | The VPC where Helix Core should be deployed | `string` | n/a | yes | ## Outputs diff --git a/modules/perforce/helix-core/variables.tf b/modules/perforce/helix-core/variables.tf index d867a109..a181bc1a 100644 --- a/modules/perforce/helix-core/variables.tf +++ b/modules/perforce/helix-core/variables.tf @@ -28,9 +28,9 @@ variable "environment" { variable "tags" { type = map(any) default = { - "IAC_MANAGEMENT" = "CGD-Toolkit" - "IAC_MODULE" = "helix-core" - "IAC_PROVIDER" = "Terraform" + "iac-management" = "CGD-Toolkit" + "iac-module" = "helix-core" + "iac-provider" = "Terraform" } description = "Tags to apply to resources." } diff --git a/modules/perforce/helix-swarm/README.md b/modules/perforce/helix-swarm/README.md index c2a1f91a..f2725918 100644 --- a/modules/perforce/helix-swarm/README.md +++ b/modules/perforce/helix-swarm/README.md @@ -77,7 +77,7 @@ No modules. | [enable\_helix\_swarm\_alb\_deletion\_protection](#input\_enable\_helix\_swarm\_alb\_deletion\_protection) | Enables deletion protection for the Helix Swarm ALB. Defaults to true. | `bool` | `true` | no | | [enable\_sso](#input\_enable\_sso) | Set this to true if using SSO for Helix Swarm authentication. | `bool` | `false` | no | | [environment](#input\_environment) | The current environment (e.g. dev, prod, etc.) | `string` | `"dev"` | no | -| [existing\_redis\_connection](#input\_existing\_redis\_connection) | The connection specifications to use for an existing Redis deployment. | 
object({
    host = string
    port = number
  })
| `null` | no | +| [existing\_redis\_connection](#input\_existing\_redis\_connection) | The connection specifications to use for an existing Redis deployment. | 
object({
    host = string
    port = number
  })
| `null` | no | | [existing\_security\_groups](#input\_existing\_security\_groups) | A list of existing security group IDs to attach to the Helix Swarm service load balancer. | `list(string)` | `[]` | no | | [fully\_qualified\_domain\_name](#input\_fully\_qualified\_domain\_name) | The fully qualified domain name that Swarm should use for internal URLs. | `string` | `null` | no | | [helix\_swarm\_alb\_access\_logs\_bucket](#input\_helix\_swarm\_alb\_access\_logs\_bucket) | ID of the S3 bucket for Helix Swarm ALB access log storage. If access logging is enabled and this is null the module creates a bucket. | `string` | `null` | no | @@ -98,7 +98,7 @@ No modules. | [p4d\_swarm\_password\_arn](#input\_p4d\_swarm\_password\_arn) | The ARN of the parameter or secret where the swarm user password is stored. | `string` | n/a | yes | | [p4d\_swarm\_user\_arn](#input\_p4d\_swarm\_user\_arn) | The ARN of the parameter or secret where the swarm user username is stored. | `string` | n/a | yes | | [project\_prefix](#input\_project\_prefix) | The project prefix for this workload. This is appeneded to the beginning of most resource names. | `string` | `"cgd"` | no | -| [tags](#input\_tags) | Tags to apply to resources. | `map(any)` | 
{
  "IAC_MANAGEMENT": "CGD-Toolkit",
  "IAC_MODULE": "swarm",
  "IAC_PROVIDER": "Terraform"
}
| no | +| [tags](#input\_tags) | Tags to apply to resources. | `map(any)` | 
{
  "iac-management": "CGD-Toolkit",
  "iac-module": "swarm",
  "iac-provider": "Terraform"
}
| no | | [vpc\_id](#input\_vpc\_id) | The ID of the existing VPC you would like to deploy swarm into. | `string` | n/a | yes | ## Outputs diff --git a/modules/perforce/helix-swarm/variables.tf b/modules/perforce/helix-swarm/variables.tf index b58dc5c9..b054dc33 100644 --- a/modules/perforce/helix-swarm/variables.tf +++ b/modules/perforce/helix-swarm/variables.tf @@ -28,9 +28,9 @@ variable "environment" { variable "tags" { type = map(any) default = { - "IAC_MANAGEMENT" = "CGD-Toolkit" - "IAC_MODULE" = "swarm" - "IAC_PROVIDER" = "Terraform" + "iac-management" = "CGD-Toolkit" + "iac-module" = "swarm" + "iac-provider" = "Terraform" } description = "Tags to apply to resources." } diff --git a/modules/unreal/horde/README.md b/modules/unreal/horde/README.md index 68c66573..c29f0ce5 100644 --- a/modules/unreal/horde/README.md +++ b/modules/unreal/horde/README.md @@ -104,7 +104,7 @@ No modules. |------|-------------|------|---------|:--------:| | [admin\_claim\_type](#input\_admin\_claim\_type) | The claim type for administrators. | `string` | `null` | no | | [admin\_claim\_value](#input\_admin\_claim\_value) | The claim value for administrators. | `string` | `null` | no | -| [agents](#input\_agents) | Configures autoscaling groups to be used as build agents by Unreal Engine Horde. | 
map(object({
    ami           = string
    instance_type = string
    block_device_mappings = list(
      object({
        device_name = string
        ebs = object({
          volume_size = number
        })
      })
    )
    min_size = optional(number, 0)
    max_size = optional(number, 1)
  }))
| `{}` | no | +| [agents](#input\_agents) | Configures autoscaling groups to be used as build agents by Unreal Engine Horde. | 
map(object({
    ami           = string
    instance_type = string
    block_device_mappings = list(
      object({
        device_name = string
        ebs = object({
          volume_size = number
        })
      })
    )
    min_size = optional(number, 0)
    max_size = optional(number, 1)
  }))
| `{}` | no | | [auth\_method](#input\_auth\_method) | The authentication method for the Horde server. | `string` | `"Anonymous"` | no | | [certificate\_arn](#input\_certificate\_arn) | The TLS certificate ARN for the Unreal Horde load balancer. | `string` | n/a | yes | | [cluster\_name](#input\_cluster\_name) | The name of the cluster to deploy the Unreal Horde into. Defaults to null and a cluster will be created. | `string` | `null` | no | @@ -147,7 +147,7 @@ No modules. | [oidc\_signin\_redirect](#input\_oidc\_signin\_redirect) | The sign-in redirect URL for the OIDC provider. | `string` | `null` | no | | [project\_prefix](#input\_project\_prefix) | The project prefix for this workload. This is appeneded to the beginning of most resource names. | `string` | `"cgd"` | no | | [redis\_connection\_config](#input\_redis\_connection\_config) | The redis connection configuration that Horde should use. | `string` | `null` | no | -| [tags](#input\_tags) | Tags to apply to resources. | `map(any)` | 
{
  "IAC_MANAGEMENT": "CGD-Toolkit",
  "IAC_MODULE": "unreal-horde",
  "IAC_PROVIDER": "Terraform"
}
| no | +| [tags](#input\_tags) | Tags to apply to resources. | `map(any)` | 
{
  "iac-management": "CGD-Toolkit",
  "iac-module": "unreal-horde",
  "iac-provider": "Terraform"
}
| no | | [unreal\_horde\_alb\_access\_logs\_bucket](#input\_unreal\_horde\_alb\_access\_logs\_bucket) | ID of the S3 bucket for Unreal Horde ALB access log storage. If access logging is enabled and this is null the module creates a bucket. | `string` | `null` | no | | [unreal\_horde\_alb\_access\_logs\_prefix](#input\_unreal\_horde\_alb\_access\_logs\_prefix) | Log prefix for Unreal Horde ALB access logs. If null the project prefix and module name are used. | `string` | `null` | no | | [unreal\_horde\_cloudwatch\_log\_retention\_in\_days](#input\_unreal\_horde\_cloudwatch\_log\_retention\_in\_days) | The log retention in days of the cloudwatch log group for Unreal Horde. | `string` | `365` | no | diff --git a/modules/unreal/horde/variables.tf b/modules/unreal/horde/variables.tf index f8f89302..7a2f6d17 100644 --- a/modules/unreal/horde/variables.tf +++ b/modules/unreal/horde/variables.tf @@ -28,9 +28,9 @@ variable "environment" { variable "tags" { type = map(any) default = { - "IAC_MANAGEMENT" = "CGD-Toolkit" - "IAC_MODULE" = "unreal-horde" - "IAC_PROVIDER" = "Terraform" + "iac-management" = "CGD-Toolkit" + "iac-module" = "unreal-horde" + "iac-provider" = "Terraform" } description = "Tags to apply to resources." } diff --git a/samples/simple-build-pipeline/README.md b/samples/simple-build-pipeline/README.md index dcf7c1d1..5364c1e7 100644 --- a/samples/simple-build-pipeline/README.md +++ b/samples/simple-build-pipeline/README.md @@ -4,13 +4,13 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | 5.68.0 | +| [aws](#requirement\_aws) | 5.69.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.66.0 | +| [aws](#provider\_aws) | 5.62.0 | ## Modules @@ -25,41 +25,41 @@ | Name | Type | |------|------| -| [aws_acm_certificate.helix](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/acm_certificate) | resource | -| [aws_acm_certificate.jenkins](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/acm_certificate) | resource | -| [aws_acm_certificate_validation.helix](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/acm_certificate_validation) | resource | -| [aws_acm_certificate_validation.jenkins](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/acm_certificate_validation) | resource | -| [aws_default_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/default_security_group) | resource | -| [aws_ecs_cluster.build_pipeline_cluster](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/ecs_cluster) | resource | -| [aws_ecs_cluster_capacity_providers.providers](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/ecs_cluster_capacity_providers) | resource | -| [aws_eip.nat_gateway_eip](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/eip) | resource | -| [aws_internet_gateway.igw](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/internet_gateway) | resource | -| [aws_nat_gateway.nat_gateway](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/nat_gateway) | resource | -| [aws_route53_record.helix_authentication_service](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route53_record) | resource | -| [aws_route53_record.helix_cert](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route53_record) | resource | -| [aws_route53_record.helix_swarm](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route53_record) | resource | -| [aws_route53_record.jenkins](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route53_record) | resource | -| [aws_route53_record.jenkins_cert](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route53_record) | resource | -| [aws_route53_record.perforce_helix_core](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route53_record) | resource | -| [aws_route53_record.perforce_helix_core_pvt](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route53_record) | resource | -| [aws_route53_zone.helix_private_zone](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route53_zone) | resource | -| [aws_route_table.private_rt](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route_table) | resource | -| [aws_route_table.public_rt](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route_table) | resource | -| [aws_route_table_association.private_rt_asso](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route_table_association) | resource | -| [aws_route_table_association.public_rt_asso](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/route_table_association) | resource | -| [aws_subnet.private_subnets](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/subnet) | resource | -| [aws_subnet.public_subnets](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/subnet) | resource | -| [aws_vpc.build_pipeline_vpc](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/vpc) | resource | -| [aws_vpc_security_group_ingress_rule.helix_auth_access](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/vpc_security_group_ingress_rule) | resource | -| [aws_vpc_security_group_ingress_rule.helix_auth_inbound_core](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/vpc_security_group_ingress_rule) | resource | -| [aws_vpc_security_group_ingress_rule.helix_core_access](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/vpc_security_group_ingress_rule) | resource | -| [aws_vpc_security_group_ingress_rule.helix_core_inbound_build_farm](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/vpc_security_group_ingress_rule) | resource | -| [aws_vpc_security_group_ingress_rule.helix_core_inbound_swarm](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/vpc_security_group_ingress_rule) | resource | -| [aws_vpc_security_group_ingress_rule.helix_swarm_access](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/vpc_security_group_ingress_rule) | resource | -| [aws_vpc_security_group_ingress_rule.helix_swarm_inbound_core](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/vpc_security_group_ingress_rule) | resource | -| [aws_vpc_security_group_ingress_rule.jenkins_access](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/resources/vpc_security_group_ingress_rule) | resource | -| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/data-sources/availability_zones) | data source | -| [aws_route53_zone.root](https://registry.terraform.io/providers/hashicorp/aws/5.68.0/docs/data-sources/route53_zone) | data source | +| [aws_acm_certificate.helix](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/acm_certificate) | resource | +| [aws_acm_certificate.jenkins](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/acm_certificate) | resource | +| [aws_acm_certificate_validation.helix](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/acm_certificate_validation) | resource | +| [aws_acm_certificate_validation.jenkins](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/acm_certificate_validation) | resource | +| [aws_default_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/default_security_group) | resource | +| [aws_ecs_cluster.build_pipeline_cluster](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/ecs_cluster) | resource | +| [aws_ecs_cluster_capacity_providers.providers](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/ecs_cluster_capacity_providers) | resource | +| [aws_eip.nat_gateway_eip](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/eip) | resource | +| [aws_internet_gateway.igw](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/internet_gateway) | resource | +| [aws_nat_gateway.nat_gateway](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/nat_gateway) | resource | +| [aws_route53_record.helix_authentication_service](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route53_record) | resource | +| [aws_route53_record.helix_cert](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route53_record) | resource | +| [aws_route53_record.helix_swarm](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route53_record) | resource | +| [aws_route53_record.jenkins](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route53_record) | resource | +| [aws_route53_record.jenkins_cert](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route53_record) | resource | +| [aws_route53_record.perforce_helix_core](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route53_record) | resource | +| [aws_route53_record.perforce_helix_core_pvt](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route53_record) | resource | +| [aws_route53_zone.helix_private_zone](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route53_zone) | resource | +| [aws_route_table.private_rt](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route_table) | resource | +| [aws_route_table.public_rt](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route_table) | resource | +| [aws_route_table_association.private_rt_asso](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route_table_association) | resource | +| [aws_route_table_association.public_rt_asso](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/route_table_association) | resource | +| [aws_subnet.private_subnets](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/subnet) | resource | +| [aws_subnet.public_subnets](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/subnet) | resource | +| [aws_vpc.build_pipeline_vpc](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/vpc) | resource | +| [aws_vpc_security_group_ingress_rule.helix_auth_access](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/vpc_security_group_ingress_rule) | resource | +| [aws_vpc_security_group_ingress_rule.helix_auth_inbound_core](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/vpc_security_group_ingress_rule) | resource | +| [aws_vpc_security_group_ingress_rule.helix_core_access](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/vpc_security_group_ingress_rule) | resource | +| [aws_vpc_security_group_ingress_rule.helix_core_inbound_build_farm](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/vpc_security_group_ingress_rule) | resource | +| [aws_vpc_security_group_ingress_rule.helix_core_inbound_swarm](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/vpc_security_group_ingress_rule) | resource | +| [aws_vpc_security_group_ingress_rule.helix_swarm_access](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/vpc_security_group_ingress_rule) | resource | +| [aws_vpc_security_group_ingress_rule.helix_swarm_inbound_core](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/vpc_security_group_ingress_rule) | resource | +| [aws_vpc_security_group_ingress_rule.jenkins_access](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/resources/vpc_security_group_ingress_rule) | resource | +| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/data-sources/availability_zones) | data source | +| [aws_route53_zone.root](https://registry.terraform.io/providers/hashicorp/aws/5.69.0/docs/data-sources/route53_zone) | data source | ## Inputs diff --git a/samples/simple-build-pipeline/dns.tf b/samples/simple-build-pipeline/dns.tf index 05ee4b70..aac591b7 100644 --- a/samples/simple-build-pipeline/dns.tf +++ b/samples/simple-build-pipeline/dns.tf @@ -80,7 +80,7 @@ resource "aws_acm_certificate" "jenkins" { validation_method = "DNS" tags = { - Environment = "dev" + environment = "dev" } lifecycle { @@ -123,7 +123,7 @@ resource "aws_acm_certificate" "helix" { validation_method = "DNS" tags = { - Environment = "dev" + environment = "dev" } lifecycle {