FAQ | This is a LIVE service | Changelog

Commit 5bc41a2a authored by Dr Abraham Martin's avatar Dr Abraham Martin
Browse files

Merge branch 'master' into 'v4'

Merge master into v4

See merge request !42
parents 257eae6b 3fd10fe7
Pipeline #111844 passed with stage
in 46 seconds
......@@ -57,13 +57,13 @@ locals {
monitor_hosts = var.disable_monitoring ? {} : merge(
{
trimsuffix(trimprefix(google_cloud_run_service.webapp.status[0].url, "https://"), "/") = {
"enable_auth_proxy" = !var.allow_unauthenticated_invocations || var.allowed_ingress != "all",
"enable_egress_connector" = var.allowed_ingress != "all"
"enable_auth_proxy" = !var.allow_unauthenticated_invocations || local.webapp_allowed_ingress != "all",
"enable_egress_connector" = local.webapp_allowed_ingress != "all"
},
},
local.can_monitor_custom_dns ? { (var.dns_name) = {
"enable_auth_proxy" = var.allowed_ingress == "internal",
"enable_egress_connector" = var.allowed_ingress == "internal"
"enable_auth_proxy" = local.webapp_allowed_ingress == "internal",
"enable_egress_connector" = local.webapp_allowed_ingress == "internal"
} } : {}
)
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment