Merge remote-tracking branch 'origin/master' into fast-dev
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -49,8 +49,8 @@ resource "google_compute_backend_service" "default" {
|
||||
? var.project_id
|
||||
: each.value.project_id
|
||||
)
|
||||
name = "${var.name}-${each.key}"
|
||||
description = var.description
|
||||
name = coalesce(each.value.name, "${var.name}-${each.key}")
|
||||
description = each.value.description
|
||||
affinity_cookie_ttl_sec = each.value.affinity_cookie_ttl_sec
|
||||
compression_mode = each.value.compression_mode
|
||||
connection_draining_timeout_sec = each.value.connection_draining_timeout_sec
|
||||
|
||||
@@ -24,7 +24,7 @@ resource "google_compute_health_check" "default" {
|
||||
? var.project_id
|
||||
: each.value.project_id
|
||||
)
|
||||
name = "${var.name}-${each.key}"
|
||||
name = coalesce(each.value.name, "${var.name}-${each.key}")
|
||||
description = each.value.description
|
||||
check_interval_sec = each.value.check_interval_sec
|
||||
healthy_threshold = each.value.healthy_threshold
|
||||
|
||||
@@ -46,7 +46,7 @@ resource "google_compute_global_forwarding_rule" "default" {
|
||||
for_each = var.forwarding_rules_config
|
||||
project = var.project_id
|
||||
name = coalesce(each.value.name, local.fwd_rule_names[each.key])
|
||||
description = coalesce(each.value.description, var.description)
|
||||
description = each.value.description
|
||||
ip_address = each.value.address
|
||||
ip_protocol = "TCP"
|
||||
ip_version = each.value.address != null ? null : each.value.ipv6 == true ? "IPV6" : "IPV4" # do not set if address is provided
|
||||
@@ -73,7 +73,7 @@ resource "google_compute_ssl_certificate" "default" {
|
||||
resource "google_compute_managed_ssl_certificate" "default" {
|
||||
for_each = var.ssl_certificates.managed_configs
|
||||
project = var.project_id
|
||||
name = "${var.name}-${each.key}"
|
||||
name = coalesce(each.value.name, "${var.name}-${each.key}")
|
||||
description = each.value.description
|
||||
managed {
|
||||
domains = each.value.domains
|
||||
@@ -93,8 +93,8 @@ resource "google_compute_target_http_proxy" "default" {
|
||||
resource "google_compute_target_https_proxy" "default" {
|
||||
count = var.protocol == "HTTPS" ? 1 : 0
|
||||
project = var.project_id
|
||||
name = var.name
|
||||
description = var.description
|
||||
name = coalesce(var.https_proxy_config.name, var.name)
|
||||
description = var.https_proxy_config.description
|
||||
certificate_map = var.https_proxy_config.certificate_map
|
||||
certificate_manager_certificates = var.https_proxy_config.certificate_manager_certificates
|
||||
quic_override = var.https_proxy_config.quic_override
|
||||
|
||||
@@ -27,7 +27,7 @@ resource "google_compute_url_map" "default" {
|
||||
provider = google-beta
|
||||
project = var.project_id
|
||||
name = var.name
|
||||
description = var.description
|
||||
description = var.urlmap_config.description
|
||||
default_service = (
|
||||
var.urlmap_config.default_service == null ? null : lookup(
|
||||
local.backend_ids,
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
variable "backend_service_configs" {
|
||||
description = "Backend service level configuration."
|
||||
type = map(object({
|
||||
name = optional(string)
|
||||
description = optional(string, "Terraform managed.")
|
||||
affinity_cookie_ttl_sec = optional(number)
|
||||
compression_mode = optional(string)
|
||||
connection_draining_timeout_sec = optional(number)
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
variable "health_check_configs" {
|
||||
description = "Optional auto-created health check configurations, use the output self-link to set it in the auto healing policy. Refer to examples for usage."
|
||||
type = map(object({
|
||||
name = optional(string)
|
||||
check_interval_sec = optional(number)
|
||||
description = optional(string, "Terraform managed.")
|
||||
enable_logging = optional(bool, false)
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
variable "urlmap_config" {
|
||||
description = "The URL map configuration."
|
||||
type = object({
|
||||
description = optional(string, "Terraform managed.")
|
||||
default_custom_error_response_policy = optional(object({
|
||||
error_service = optional(string)
|
||||
error_response_rules = optional(list(object({
|
||||
|
||||
@@ -57,7 +57,7 @@ variable "forwarding_rules_config" {
|
||||
description = "The optional forwarding rules configuration."
|
||||
type = map(object({
|
||||
address = optional(string)
|
||||
description = optional(string)
|
||||
description = optional(string, "Terraform managed.")
|
||||
ipv6 = optional(bool, false)
|
||||
name = optional(string)
|
||||
ports = optional(list(number), null)
|
||||
@@ -89,6 +89,8 @@ variable "group_configs" {
|
||||
variable "https_proxy_config" {
|
||||
description = "HTTPS proxy connfiguration."
|
||||
type = object({
|
||||
name = optional(string)
|
||||
description = optional(string, "Terraform managed.")
|
||||
certificate_manager_certificates = optional(list(string))
|
||||
certificate_map = optional(string)
|
||||
quic_override = optional(string)
|
||||
@@ -228,6 +230,7 @@ variable "ssl_certificates" {
|
||||
private_key = string
|
||||
})), {})
|
||||
managed_configs = optional(map(object({
|
||||
name = optional(string)
|
||||
domains = list(string)
|
||||
description = optional(string)
|
||||
})), {})
|
||||
|
||||
Reference in New Issue
Block a user