add var.registry to tests

tests/private-active-active/locals.tf

@@ -3,17 +3,17 @@
 
 locals {
   common_tags = {
-    Terraform   = "cloud"
     Environment = "${local.friendly_name_prefix}-test-private-active-active"
     Description = "Private Active/Active"
     Repository  = "hashicorp/terraform-azurerm-terraform-enterprise"
-    Team        = "Terraform Enterprise on Prem"
+    Team        = "Terraform Enterprise"
     OkToDelete  = "True"
   }
 
   friendly_name_prefix      = random_string.friendly_name.id
-  resource_group_name       = module.private_active_active.resource_group_name
+  network_proxy_subnet_cidr = "10.0.80.0/20"
   proxy_user                = "proxyuser"
   proxy_port                = "3128"
-  network_proxy_subnet_cidr = "10.0.80.0/20"
+  registry                  = "quay.io"
+  resource_group_name       = module.private_active_active.resource_group_name
 }

tests/private-active-active/main.tf

@@ -86,7 +86,8 @@ module "private_active_active" {
   http_port                 = 8080
   https_port                = 8443
   license_reporting_opt_out = true
+  registry                  = local.registry
   registry_password         = var.registry_password
   registry_username         = var.registry_username
-  tfe_image                 = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
+  tfe_image                 = "${local.registry}/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
 }

tests/private-active-active/variables.tf

@@ -55,16 +55,16 @@ variable "proxy_public_ssh_key_secret_name" {
   description = "The name of the public SSH key secret for the proxy."
 }
 
-variable "registry_username" {
+variable "registry_password" {
   default     = null
   type        = string
-  description = "(Not needed if is_replicated_deployment is true) The username for the docker registry from which to source the terraform_enterprise container images."
+  description = "(Not needed if is_replicated_deployment is true) The password for the docker registry from which to source the terraform_enterprise container images."
 }
 
-variable "registry_password" {
+variable "registry_username" {
   default     = null
   type        = string
-  description = "(Not needed if is_replicated_deployment is true) The password for the docker registry from which to source the terraform_enterprise container images."
+  description = "(Not needed if is_replicated_deployment is true) The username for the docker registry from which to source the terraform_enterprise container images."
 }
 
 variable "resource_group_name_dns" {

tests/private-tcp-active-active/locals.tf

@@ -3,17 +3,17 @@
 
 locals {
   common_tags = {
-    Terraform   = "cloud"
     Environment = "${local.friendly_name_prefix}-test-private-tcp-active-active"
     Description = "Private TCP Active/Active"
     Repository  = "hashicorp/terraform-azurerm-terraform-enterprise"
-    Team        = "Terraform Enterprise on Prem"
+    Team        = "Terraform Enterprise"
     OkToDelete  = "True"
   }
 
   friendly_name_prefix      = random_string.friendly_name.id
-  resource_group_name       = module.private_tcp_active_active.resource_group_name
+  network_proxy_subnet_cidr = "10.0.80.0/20"
   proxy_user                = "proxyuser"
   proxy_port                = "3128"
-  network_proxy_subnet_cidr = "10.0.80.0/20"
+  registry                  = "quay.io"
+  resource_group_name       = module.private_tcp_active_active.resource_group_name
 }

tests/private-tcp-active-active/main.tf

@@ -87,7 +87,8 @@ module "private_tcp_active_active" {
   http_port                 = 8080
   https_port                = 8443
   license_reporting_opt_out = true
+  registry                  = local.registry
   registry_password         = var.registry_password
   registry_username         = var.registry_username
-  tfe_image                 = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
+  tfe_image                 = "${local.registry}/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
 }

tests/private-tcp-active-active/variables.tf

@@ -60,16 +60,16 @@ variable "proxy_public_ssh_key_secret_name" {
   description = "The name of the public SSH key secret for the proxy."
 }
 
-variable "registry_username" {
+variable "registry_password" {
   default     = null
   type        = string
-  description = "(Not needed if is_replicated_deployment is true) The username for the docker registry from which to source the terraform_enterprise container images."
+  description = "(Not needed if is_replicated_deployment is true) The password for the docker registry from which to source the terraform_enterprise container images."
 }
 
-variable "registry_password" {
+variable "registry_username" {
   default     = null
   type        = string
-  description = "(Not needed if is_replicated_deployment is true) The password for the docker registry from which to source the terraform_enterprise container images."
+  description = "(Not needed if is_replicated_deployment is true) The username for the docker registry from which to source the terraform_enterprise container images."
 }
 
 variable "resource_group_name_dns" {

tests/public-active-active/locals.tf

@@ -3,13 +3,13 @@
 
 locals {
   common_tags = {
-    Terraform   = "cloud"
     Environment = "${local.friendly_name_prefix}-test-public-active-active"
     Description = "Public Active/Active"
     Repository  = "hashicorp/terraform-azurerm-terraform-enterprise"
-    Team        = "Terraform Enterprise on Prem"
+    Team        = "Terraform Enterprise"
     OkToDelete  = "True"
   }
 
   friendly_name_prefix = random_string.friendly_name.id
+  registry             = "quay.io"
 }

tests/public-active-active/main.tf

@@ -45,8 +45,9 @@ module "public_active_active" {
   http_port                 = 8080
   https_port                = 8443
   license_reporting_opt_out = true
+  registry                  = local.registry
   registry_password         = var.registry_password
   registry_username         = var.registry_username
-  tfe_image                 = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
+  tfe_image                 = "${local.registry}/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
 }
 

tests/public-active-active/variables.tf

@@ -45,16 +45,16 @@ variable "key_vault_id" {
   description = "The identity of the Key Vault which contains secrets and certificates."
 }
 
-variable "registry_username" {
+variable "registry_password" {
   default     = null
   type        = string
-  description = "(Not needed if is_replicated_deployment is true) The username for the docker registry from which to source the terraform_enterprise container images."
+  description = "(Not needed if is_replicated_deployment is true) The password for the docker registry from which to source the terraform_enterprise container images."
 }
 
-variable "registry_password" {
+variable "registry_username" {
   default     = null
   type        = string
-  description = "(Not needed if is_replicated_deployment is true) The password for the docker registry from which to source the terraform_enterprise container images."
+  description = "(Not needed if is_replicated_deployment is true) The username for the docker registry from which to source the terraform_enterprise container images."
 }
 
 variable "resource_group_name_dns" {

tests/standalone-external/locals.tf

@@ -3,14 +3,14 @@
 
 locals {
   common_tags = {
-    Terraform   = "False"
     Environment = "${local.friendly_name_prefix}-test-standalone-external"
-    Description = "Standalone, External Services scenario deployed from CircleCI"
+    Description = "Standalone, External Services scenario"
     Repository  = "hashicorp/terraform-azurerm-terraform-enterprise"
-    Team        = "Terraform Enterprise on Prem"
+    Team        = "Terraform Enterprise"
     OkToDelete  = "True"
   }
 
-  utility_module_test  = var.license_file == null
   friendly_name_prefix = random_string.friendly_name.id
+  registry             = "quay.io"
+  utility_module_test  = var.license_file == null
 }

tests/standalone-external/main.tf

@@ -59,7 +59,8 @@ module "standalone_external" {
   http_port                 = 8080
   https_port                = 8443
   license_reporting_opt_out = true
+  registry                  = local.registry
   registry_password         = var.registry_password
   registry_username         = var.registry_username
-  tfe_image                 = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
+  tfe_image                 = "${local.registry}/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
 }

tests/standalone-external/outputs.tf

@@ -7,7 +7,7 @@ output "replicated_console_password" {
 }
 
 output "replicated_console_url" {
-  value       = "${module.standalone_external.tfe_application_url}:8800"
+  value       = module.standalone_mounted_disk.tfe_console_url
   description = "Terraform Enterprise Console URL"
 }
 

tests/standalone-external/variables.tf

@@ -48,16 +48,16 @@ variable "license_file" {
   description = "The local path to the Terraform Enterprise license to be provided by CI."
 }
 
-variable "registry_username" {
+variable "registry_password" {
   default     = null
   type        = string
-  description = "(Not needed if is_replicated_deployment is true) The username for the docker registry from which to source the terraform_enterprise container images."
+  description = "(Not needed if is_replicated_deployment is true) The password for the docker registry from which to source the terraform_enterprise container images."
 }
 
-variable "registry_password" {
+variable "registry_username" {
   default     = null
   type        = string
-  description = "(Not needed if is_replicated_deployment is true) The password for the docker registry from which to source the terraform_enterprise container images."
+  description = "(Not needed if is_replicated_deployment is true) The username for the docker registry from which to source the terraform_enterprise container images."
 }
 
 variable "resource_group_name_dns" {

tests/standalone-mounted-disk/locals.tf

@@ -6,7 +6,7 @@ locals {
     Environment = "${local.friendly_name_prefix}-test-standalone-mounted-disk"
     Description = "Standalone, Mounted Disk scenario"
     Repository  = "hashicorp/terraform-azurerm-terraform-enterprise"
-    Team        = "Terraform Enterprise on Prem"
+    Team        = "Terraform Enterprise"
     OkToDelete  = "True"
   }
   vm_image_id = (
@@ -40,8 +40,7 @@ locals {
     var.vm_image_version != null
   ) ? var.vm_image_version : null
 
-  utility_module_test  = var.license_file == null
   friendly_name_prefix = random_string.friendly_name.id
-  # registry             = "quay.io"
-  registry = "images.releases.hashicorp.com"
+  registry             = "quay.io"
+  utility_module_test  = var.license_file == null
 }

tests/standalone-mounted-disk/outputs.tf

@@ -7,7 +7,7 @@ output "replicated_console_password" {
 }
 
 output "replicated_console_url" {
-  value       = module.standalone_mounted_disk.replicated_console_url
+  value       = module.standalone_mounted_disk.tfe_console_url
   description = "Terraform Enterprise Console URL"
 }