feat: adds support for direct cloud run iap
This commit is contained in:
Maciej Sikora
committed by
Wiktor Niesiobędzki
Wiktor Niesiobędzki
parent
3ba695b0ed
commit
c0bac5acc0
@@ -813,9 +813,9 @@ module "cloud_run" {
|
||||
|
||||
| name | description | type | required | default |
|
||||
|---|---|:---:|:---:|:---:|
|
||||
| [name](variables.tf#L181) | Name used for Cloud Run service. | <code>string</code> | ✓ | |
|
||||
| [project_id](variables.tf#L196) | Project id used for all resources. | <code>string</code> | ✓ | |
|
||||
| [region](variables.tf#L201) | Region used for all resources. | <code>string</code> | ✓ | |
|
||||
| [name](variables.tf#L223) | Name used for Cloud Run service. | <code>string</code> | ✓ | |
|
||||
| [project_id](variables.tf#L238) | Project id used for all resources. | <code>string</code> | ✓ | |
|
||||
| [region](variables.tf#L243) | Region used for all resources. | <code>string</code> | ✓ | |
|
||||
| [containers](variables.tf#L17) | Containers in name => attributes format. | <code title="map(object({ image = string depends_on = optional(list(string)) command = optional(list(string)) args = optional(list(string)) env = optional(map(string)) env_from_key = optional(map(object({ secret = string version = string }))) liveness_probe = optional(object({ grpc = optional(object({ port = optional(number) service = optional(string) })) http_get = optional(object({ http_headers = optional(map(string)) path = optional(string) port = optional(number) })) failure_threshold = optional(number) initial_delay_seconds = optional(number) period_seconds = optional(number) timeout_seconds = optional(number) })) ports = optional(map(object({ container_port = optional(number) name = optional(string) }))) resources = optional(object({ limits = optional(object({ cpu = string memory = string })) cpu_idle = optional(bool) startup_cpu_boost = optional(bool) })) startup_probe = optional(object({ grpc = optional(object({ port = optional(number) service = optional(string) })) http_get = optional(object({ http_headers = optional(map(string)) path = optional(string) port = optional(number) })) tcp_socket = optional(object({ port = optional(number) })) failure_threshold = optional(number) initial_delay_seconds = optional(number) period_seconds = optional(number) timeout_seconds = optional(number) })) volume_mounts = optional(map(string)) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [create_job](variables.tf#L80) | Create Cloud Run Job instead of Service. | <code>bool</code> | | <code>false</code> |
|
||||
| [custom_audiences](variables.tf#L86) | Custom audiences for service. | <code>list(string)</code> | | <code>null</code> |
|
||||
@@ -823,17 +823,19 @@ module "cloud_run" {
|
||||
| [encryption_key](variables.tf#L98) | The full resource name of the Cloud KMS CryptoKey. | <code>string</code> | | <code>null</code> |
|
||||
| [eventarc_triggers](variables.tf#L104) | Event arc triggers for different sources. | <code title="object({ audit_log = optional(map(object({ method = string service = string }))) pubsub = optional(map(string)) service_account_email = optional(string) service_account_create = optional(bool, false) })">object({…})</code> | | <code>{}</code> |
|
||||
| [iam](variables.tf#L122) | IAM bindings for Cloud Run service in {ROLE => [MEMBERS]} format. | <code>map(list(string))</code> | | <code>{}</code> |
|
||||
| [ingress](variables.tf#L128) | Ingress settings. | <code>string</code> | | <code>null</code> |
|
||||
| [invoker_iam_disabled](variables.tf#L145) | Disables IAM permission check for run.routes.invoke for callers of this service. | <code>bool</code> | | <code>false</code> |
|
||||
| [labels](variables.tf#L151) | Resource labels. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [launch_stage](variables.tf#L157) | The launch stage as defined by Google Cloud Platform Launch Stages. | <code>string</code> | | <code>null</code> |
|
||||
| [managed_revision](variables.tf#L174) | Whether the Terraform module should control the deployment of revisions. | <code>bool</code> | | <code>true</code> |
|
||||
| [prefix](variables.tf#L186) | Optional prefix used for resource names. | <code>string</code> | | <code>null</code> |
|
||||
| [revision](variables.tf#L206) | Revision template configurations. | <code title="object({ labels = optional(map(string)) name = optional(string) gen2_execution_environment = optional(bool) max_concurrency = optional(number) max_instance_count = optional(number) min_instance_count = optional(number) job = optional(object({ max_retries = optional(number) task_count = optional(number) }), {}) vpc_access = optional(object({ connector = optional(string) egress = optional(string) network = optional(string) subnet = optional(string) tags = optional(list(string)) }), {}) timeout = optional(string) })">object({…})</code> | | <code>{}</code> |
|
||||
| [service_account](variables.tf#L245) | Service account email. Unused if service account is auto-created. | <code>string</code> | | <code>null</code> |
|
||||
| [service_account_create](variables.tf#L251) | Auto-create service account. | <code>bool</code> | | <code>false</code> |
|
||||
| [tag_bindings](variables.tf#L257) | Tag bindings for this service, in key => tag value id format. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [volumes](variables.tf#L264) | Named volumes in containers in name => attributes format. | <code title="map(object({ secret = optional(object({ name = string default_mode = optional(string) path = optional(string) version = optional(string) mode = optional(string) })) cloud_sql_instances = optional(list(string)) empty_dir_size = optional(string) gcs = optional(object({ bucket = string is_read_only = optional(bool) })) nfs = optional(object({ server = string path = optional(string) is_read_only = optional(bool) })) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [iap_enabled](variables.tf#L128) | <<-EOT Enables Identity-Aware Proxy (IAP) for this service. IAP can only be enabled for Cloud Run services (create_job = false). EOT | <code>bool</code> | | <code>false</code> |
|
||||
| [iap_http_resource_accessors_config](variables.tf#L142) | <<-EOT IAP HTTP resource accessors configuration. When authoritative_mode is true, the google_iap_web_cloud_run_service_iam_binding resource is used which replaces any existing IAM policy attached to the IAP web service. When authoritative_mode is false (default), the google_iap_web_cloud_run_service_iam_member resource is used which adds the IAM policies to the service. EOT | <code title="object({ iam_emails = list(string) authoritative_mode = optional(bool, false) })">object({…})</code> | | <code>null</code> |
|
||||
| [ingress](variables.tf#L166) | Ingress settings. | <code>string</code> | | <code>null</code> |
|
||||
| [invoker_iam_disabled](variables.tf#L183) | Disables IAM permission check for run.routes.invoke for callers of this service. | <code>bool</code> | | <code>false</code> |
|
||||
| [labels](variables.tf#L189) | Resource labels. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [launch_stage](variables.tf#L195) | The launch stage as defined by Google Cloud Platform Launch Stages. | <code>string</code> | | <code>null</code> |
|
||||
| [managed_revision](variables.tf#L216) | Whether the Terraform module should control the deployment of revisions. | <code>bool</code> | | <code>true</code> |
|
||||
| [prefix](variables.tf#L228) | Optional prefix used for resource names. | <code>string</code> | | <code>null</code> |
|
||||
| [revision](variables.tf#L248) | Revision template configurations. | <code title="object({ labels = optional(map(string)) name = optional(string) gen2_execution_environment = optional(bool) max_concurrency = optional(number) max_instance_count = optional(number) min_instance_count = optional(number) job = optional(object({ max_retries = optional(number) task_count = optional(number) }), {}) vpc_access = optional(object({ connector = optional(string) egress = optional(string) network = optional(string) subnet = optional(string) tags = optional(list(string)) }), {}) timeout = optional(string) })">object({…})</code> | | <code>{}</code> |
|
||||
| [service_account](variables.tf#L287) | Service account email. Unused if service account is auto-created. | <code>string</code> | | <code>null</code> |
|
||||
| [service_account_create](variables.tf#L293) | Auto-create service account. | <code>bool</code> | | <code>false</code> |
|
||||
| [tag_bindings](variables.tf#L299) | Tag bindings for this service, in key => tag value id format. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [volumes](variables.tf#L306) | Named volumes in containers in name => attributes format. | <code title="map(object({ secret = optional(object({ name = string default_mode = optional(string) path = optional(string) version = optional(string) mode = optional(string) })) cloud_sql_instances = optional(list(string)) empty_dir_size = optional(string) gcs = optional(object({ bucket = string is_read_only = optional(bool) })) nfs = optional(object({ server = string path = optional(string) is_read_only = optional(bool) })) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [vpc_connector_create](variables-vpcconnector.tf#L17) | Populate this to create a Serverless VPC Access connector. | <code title="object({ ip_cidr_range = optional(string) machine_type = optional(string) name = optional(string) network = optional(string) instances = optional(object({ max = optional(number) min = optional(number) }), {} ) throughput = optional(object({ max = optional(number) min = optional(number) }), {} ) subnet = optional(object({ name = optional(string) project_id = optional(string) }), {}) })">object({…})</code> | | <code>null</code> |
|
||||
|
||||
## Outputs
|
||||
|
||||
@@ -30,6 +30,7 @@ resource "google_cloud_run_v2_service" "service" {
|
||||
launch_stage = var.launch_stage
|
||||
custom_audiences = var.custom_audiences
|
||||
deletion_protection = var.deletion_protection
|
||||
iap_enabled = var.iap_enabled
|
||||
|
||||
template {
|
||||
labels = var.revision.labels
|
||||
@@ -274,6 +275,7 @@ resource "google_cloud_run_v2_service" "service_unmanaged" {
|
||||
launch_stage = var.launch_stage
|
||||
custom_audiences = var.custom_audiences
|
||||
deletion_protection = var.deletion_protection
|
||||
iap_enabled = var.iap_enabled
|
||||
|
||||
template {
|
||||
labels = var.revision.labels
|
||||
@@ -522,3 +524,39 @@ resource "google_cloud_run_v2_service_iam_binding" "binding" {
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
locals {
|
||||
use_iap_member = (
|
||||
!var.create_job &&
|
||||
var.iap_http_resource_accessors_config != null &&
|
||||
!var.iap_http_resource_accessors_config.authoritative_mode
|
||||
)
|
||||
|
||||
iap_member_list = local.use_iap_member ? toset(var.iap_http_resource_accessors_config.iam_emails) : []
|
||||
|
||||
use_iap_iam_binding = (
|
||||
!var.create_job &&
|
||||
var.iap_http_resource_accessors_config != null &&
|
||||
var.iap_http_resource_accessors_config.authoritative_mode
|
||||
)
|
||||
iap_binding_dict = local.use_iap_iam_binding ? { "iap" = var.iap_http_resource_accessors_config.iam_emails } : {}
|
||||
|
||||
}
|
||||
|
||||
resource "google_iap_web_cloud_run_service_iam_member" "member" {
|
||||
for_each = local.iap_member_list
|
||||
project = local.service.project
|
||||
location = local.service.location
|
||||
cloud_run_service_name = local.service.name
|
||||
role = "roles/iap.httpsResourceAccessor"
|
||||
member = each.key
|
||||
}
|
||||
|
||||
resource "google_iap_web_cloud_run_service_iam_binding" "binding" {
|
||||
for_each = local.iap_binding_dict
|
||||
project = local.service.project
|
||||
location = local.service.location
|
||||
cloud_run_service_name = local.service.name
|
||||
role = "roles/iap.httpsResourceAccessor"
|
||||
members = each.value
|
||||
}
|
||||
@@ -125,6 +125,44 @@ variable "iam" {
|
||||
default = {}
|
||||
}
|
||||
|
||||
variable "iap_enabled" {
|
||||
description = <<-EOT
|
||||
Enables Identity-Aware Proxy (IAP) for this service.
|
||||
IAP can only be enabled for Cloud Run services (create_job = false).
|
||||
EOT
|
||||
type = bool
|
||||
default = false
|
||||
|
||||
validation {
|
||||
condition = !var.iap_enabled || (var.iap_enabled && !var.create_job)
|
||||
error_message = "IAP can only be enabled for Cloud Run services (create_job = false), not for jobs."
|
||||
}
|
||||
}
|
||||
|
||||
variable "iap_http_resource_accessors_config" {
|
||||
description = <<-EOT
|
||||
IAP HTTP resource accessors configuration.
|
||||
When authoritative_mode is true, the google_iap_web_cloud_run_service_iam_binding resource is used
|
||||
which replaces any existing IAM policy attached to the IAP web service.
|
||||
When authoritative_mode is false (default), the google_iap_web_cloud_run_service_iam_member resource is used
|
||||
which adds the IAM policies to the service.
|
||||
EOT
|
||||
type = object({
|
||||
iam_emails = list(string)
|
||||
authoritative_mode = optional(bool, false)
|
||||
})
|
||||
default = null
|
||||
|
||||
validation {
|
||||
condition = var.iap_http_resource_accessors_config == null || var.iap_enabled
|
||||
error_message = "iap_http_resource_accessors_config can only be set when iap_enabled = true."
|
||||
}
|
||||
validation {
|
||||
condition = var.iap_http_resource_accessors_config == null || (var.iap_http_resource_accessors_config != null && length(var.iap_http_resource_accessors_config.iam_emails) > 0)
|
||||
error_message = "When iap_http_resource_accessors_config is set, iam_emails must not be empty."
|
||||
}
|
||||
}
|
||||
|
||||
variable "ingress" {
|
||||
description = "Ingress settings."
|
||||
type = string
|
||||
@@ -169,6 +207,10 @@ variable "launch_stage" {
|
||||
BETA, GA, DEPRECATED.
|
||||
EOF
|
||||
}
|
||||
validation {
|
||||
condition = !var.iap_enabled || (var.iap_enabled && var.launch_stage == "BETA")
|
||||
error_message = "When IAP is enabled (iap_enabled = true), launch_stage must be set to 'BETA'."
|
||||
}
|
||||
}
|
||||
|
||||
variable "managed_revision" {
|
||||
|
||||
Reference in New Issue
Block a user