Fix Cloud Run validation for refactored fields (#3295)
Co-authored-by: Julio Castillo <jccb@google.com>
This commit is contained in:
Wiktor Niesiobędzki
committed by
GitHub
GitHub
parent
c5312d59dc
commit
b20d62815a
@@ -984,15 +984,15 @@ module "worker" {
|
||||
| [labels](variables.tf#L130) | Resource labels. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [launch_stage](variables.tf#L136) | The launch stage as defined by Google Cloud Platform Launch Stages. | <code>string</code> | | <code>null</code> |
|
||||
| [managed_revision](variables.tf#L153) | Whether the Terraform module should control the deployment of revisions. | <code>bool</code> | | <code>true</code> |
|
||||
| [revision](variables.tf#L175) | Revision template configurations. | <code title="object({ gpu_zonal_redundancy_disabled = optional(bool) labels = optional(map(string)) name = optional(string) node_selector = optional(object({ accelerator = string })) 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#L235) | Service account email. Unused if service account is auto-created. | <code>string</code> | | <code>null</code> |
|
||||
| [service_account_create](variables.tf#L241) | Auto-create service account. | <code>bool</code> | | <code>false</code> |
|
||||
| [service_config](variables.tf#L247) | Cloud Run service specific configuration options. | <code title="object({ custom_audiences = optional(list(string), null) eventarc_triggers = optional( object({ audit_log = optional(map(object({ method = string service = string }))) pubsub = optional(map(string)) storage = optional(map(object({ bucket = string path = optional(string) }))) service_account_email = optional(string) }), {}) gen2_execution_environment = optional(bool, false) iap_config = optional(object({ iam = optional(list(string), []) iam_additive = optional(list(string), []) }), null) ingress = optional(string, null) invoker_iam_disabled = optional(bool, false) max_concurrency = optional(number) scaling = optional(object({ max_instance_count = optional(number) min_instance_count = optional(number) })) timeout = optional(string) })">object({…})</code> | | <code>{}</code> |
|
||||
| [tag_bindings](variables.tf#L310) | Tag bindings for this service, in key => tag value id format. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [type](variables.tf#L317) | Type of Cloud Run resource to deploy: JOB, SERVICE or WORKERPOOL. | <code>string</code> | | <code>"SERVICE"</code> |
|
||||
| [volumes](variables.tf#L327) | 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> |
|
||||
| [revision](variables.tf#L175) | Revision template configurations. | <code title="object({ gpu_zonal_redundancy_disabled = optional(bool) labels = optional(map(string)) name = optional(string) node_selector = optional(object({ accelerator = string })) vpc_access = optional(object({ connector = optional(string) egress = optional(string) network = optional(string) subnet = optional(string) tags = optional(list(string)) }), {}) timeout = optional(string) gen2_execution_environment = optional(any) # DEPRECATED job = optional(any) # DEPRECATED max_concurrency = optional(any) # DEPRECATED max_instance_count = optional(any) # DEPRECATED min_instance_count = optional(any) # DEPRECATED })">object({…})</code> | | <code>{}</code> |
|
||||
| [service_account](variables.tf#L236) | Service account email. Unused if service account is auto-created. | <code>string</code> | | <code>null</code> |
|
||||
| [service_account_create](variables.tf#L242) | Auto-create service account. | <code>bool</code> | | <code>false</code> |
|
||||
| [service_config](variables.tf#L248) | Cloud Run service specific configuration options. | <code title="object({ custom_audiences = optional(list(string), null) eventarc_triggers = optional( object({ audit_log = optional(map(object({ method = string service = string }))) pubsub = optional(map(string)) storage = optional(map(object({ bucket = string path = optional(string) }))) service_account_email = optional(string) }), {}) gen2_execution_environment = optional(bool, false) iap_config = optional(object({ iam = optional(list(string), []) iam_additive = optional(list(string), []) }), null) ingress = optional(string, null) invoker_iam_disabled = optional(bool, false) max_concurrency = optional(number) scaling = optional(object({ max_instance_count = optional(number) min_instance_count = optional(number) })) timeout = optional(string) })">object({…})</code> | | <code>{}</code> |
|
||||
| [tag_bindings](variables.tf#L311) | Tag bindings for this service, in key => tag value id format. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [type](variables.tf#L318) | Type of Cloud Run resource to deploy: JOB, SERVICE or WORKERPOOL. | <code>string</code> | | <code>"SERVICE"</code> |
|
||||
| [volumes](variables.tf#L328) | 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> |
|
||||
| [workerpool_config](variables.tf#L361) | Cloud Run Worker Pool specific configuration. | <code title="object({ scaling = optional(object({ manual_instance_count = optional(number) max_instance_count = optional(number) min_instance_count = optional(number) mode = optional(string) })) })">object({…})</code> | | <code>{}</code> |
|
||||
| [workerpool_config](variables.tf#L362) | Cloud Run Worker Pool specific configuration. | <code title="object({ scaling = optional(object({ manual_instance_count = optional(number) max_instance_count = optional(number) min_instance_count = optional(number) mode = optional(string) })) })">object({…})</code> | | <code>{}</code> |
|
||||
|
||||
## Outputs
|
||||
|
||||
|
||||
@@ -189,34 +189,35 @@ variable "revision" {
|
||||
tags = optional(list(string))
|
||||
}), {})
|
||||
timeout = optional(string)
|
||||
# deprecated fields
|
||||
gen2_execution_environment = optional(any) # DEPRECATED
|
||||
job = optional(any) # DEPRECATED
|
||||
max_concurrency = optional(any) # DEPRECATED
|
||||
max_instance_count = optional(any) # DEPRECATED
|
||||
min_instance_count = optional(any) # DEPRECATED
|
||||
})
|
||||
default = {}
|
||||
nullable = false
|
||||
validation {
|
||||
condition = !contains(keys(var.revision), "gen2_execution_environment")
|
||||
error_message = "Field gen2_execution_environment moved to var.service_config."
|
||||
condition = lookup(var.revision, "gen2_execution_environment", null) == null
|
||||
error_message = "Field gen2_execution_environment has moved to var.service_config."
|
||||
}
|
||||
validation {
|
||||
condition = !contains(keys(var.revision), "max_concurrency")
|
||||
error_message = "Field max_concurrency moved to var.service_config."
|
||||
condition = lookup(var.revision, "job", null) == null
|
||||
error_message = "Field job has moved to var.job_config."
|
||||
}
|
||||
validation {
|
||||
condition = !contains(keys(var.revision), "max_concurrency")
|
||||
error_message = "Field max_concurrency moved to var.service_config."
|
||||
condition = lookup(var.revision, "max_concurrency", null) == null
|
||||
error_message = "Field max_concurrency has moved to var.service_config."
|
||||
}
|
||||
validation {
|
||||
condition = !contains(keys(var.revision), "max_instance_count")
|
||||
error_message = "Field max_instance_count moved to var.service_config."
|
||||
condition = lookup(var.revision, "max_instance_count", null) == null
|
||||
error_message = "Field max_instance_count has moved to var.service_config."
|
||||
}
|
||||
validation {
|
||||
condition = !contains(keys(var.revision), "min_instance_count")
|
||||
error_message = "Field min_instance_count moved to var.service_config."
|
||||
condition = lookup(var.revision, "min_instance_count", null) == null
|
||||
error_message = "Field min_instance_count has moved to var.service_config."
|
||||
}
|
||||
validation {
|
||||
condition = !contains(keys(var.revision), "job")
|
||||
error_message = "Field job moved to var.job_config."
|
||||
}
|
||||
|
||||
validation {
|
||||
condition = (
|
||||
try(var.revision.vpc_access.egress, null) == null ? true : contains(
|
||||
|
||||
Reference in New Issue
Block a user