tf fmt

hashicorp · Sep 12, 2023 · 885468d · 885468d
1 parent e375fd0
commit 885468d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 28 deletions.
diff --git a/main.tf b/main.tf
@@ -149,8 +149,8 @@ module "tfe_init_fdo" {
   certificate_secret_id    = var.vm_certificate_secret == null ? null : var.vm_certificate_secret.id
   key_secret_id            = var.vm_key_secret == null ? null : var.vm_key_secret.id
 
-  proxy_ip       = var.proxy_ip
-  proxy_port     = var.proxy_port
+  proxy_ip   = var.proxy_ip
+  proxy_port = var.proxy_port
   extra_no_proxy = [
     "127.0.0.1",
     "169.254.169.254",
@@ -173,7 +173,7 @@ module "docker_compose_config" {
 
   hostname                  = module.load_balancer.fqdn
   tfe_license               = var.hc_license
-  license_reporting_opt_out = "true"
+  license_reporting_opt_out = var.license_reporting_opt_out
   cert_file                 = "/etc/ssl/private/terraform-enterprise/cert.pem"
   key_file                  = "/etc/ssl/private/terraform-enterprise/key.pem"
   operational_mode          = local.active_active ? "active-active" : var.production_type

diff --git a/tests/private-active-active/main.tf b/tests/private-active-active/main.tf
@@ -80,9 +80,10 @@ module "private_active_active" {
   tags           = local.common_tags
 
   # FDO Specific Values
-  is_legacy_deployment = false # var.is_legacy_deployment
-  hc_license           = var.hc_license
-  tfe_image            = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
-  registry_password    = var.registry_password
-  registry_username    = var.registry_username
+  is_legacy_deployment      = false # var.is_legacy_deployment
+  hc_license                = var.hc_license
+  license_reporting_opt_out = true
+  registry_password         = var.registry_password
+  registry_username         = var.registry_username
+  tfe_image                 = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
 }
diff --git a/tests/private-tcp-active-active/main.tf b/tests/private-tcp-active-active/main.tf
@@ -82,9 +82,10 @@ module "private_tcp_active_active" {
   tags           = local.common_tags
 
   # FDO Specific Values
-  is_legacy_deployment = false # var.is_legacy_deployment
-  hc_license           = var.hc_license
-  tfe_image            = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
-  registry_password    = var.registry_password
-  registry_username    = var.registry_username
+  is_legacy_deployment      = false # var.is_legacy_deployment
+  hc_license                = var.hc_license
+  license_reporting_opt_out = true
+  registry_password         = var.registry_password
+  registry_username         = var.registry_username
+  tfe_image                 = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
 }
diff --git a/tests/public-active-active/main.tf b/tests/public-active-active/main.tf
@@ -40,10 +40,11 @@ module "public_active_active" {
   tags = local.common_tags
 
   # FDO Specific Values
-  is_legacy_deployment = false # var.is_legacy_deployment
-  hc_license           = var.hc_license
-  tfe_image            = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
-  registry_password    = var.registry_password
-  registry_username    = var.registry_username
+  is_legacy_deployment      = false # var.is_legacy_deployment
+  hc_license                = var.hc_license
+  license_reporting_opt_out = true
+  registry_password         = var.registry_password
+  registry_username         = var.registry_username
+  tfe_image                 = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
 }
 
diff --git a/tests/standalone-external/main.tf b/tests/standalone-external/main.tf
@@ -54,9 +54,10 @@ module "standalone_external" {
   tags           = local.common_tags
 
   # FDO Specific Values
-  is_legacy_deployment = false # var.is_legacy_deployment
-  hc_license           = var.hc_license
-  tfe_image            = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
-  registry_password    = var.registry_password
-  registry_username    = var.registry_username
+  is_legacy_deployment      = false # var.is_legacy_deployment
+  hc_license                = var.hc_license
+  license_reporting_opt_out = true
+  registry_password         = var.registry_password
+  registry_username         = var.registry_username
+  tfe_image                 = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
 }
diff --git a/tests/standalone-mounted-disk/main.tf b/tests/standalone-mounted-disk/main.tf
@@ -64,11 +64,12 @@ module "standalone_mounted_disk" {
   tags           = local.tags
 
   # FDO Specific Values
-  is_legacy_deployment = false # var.is_legacy_deployment
-  hc_license           = var.hc_license
-  tfe_image            = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
-  registry_password    = var.registry_password
-  registry_username    = var.registry_username
+  is_legacy_deployment      = false # var.is_legacy_deployment
+  hc_license                = var.hc_license
+  license_reporting_opt_out = true
+  registry_password         = var.registry_password
+  registry_username         = var.registry_username
+  tfe_image                 = "quay.io/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
 }
 
 locals {