diff --git a/modules/cloud-function-v2/README.md b/modules/cloud-function-v2/README.md index 6e6382afd..7025eae7e 100644 --- a/modules/cloud-function-v2/README.md +++ b/modules/cloud-function-v2/README.md @@ -458,9 +458,9 @@ module "cf-http" { |---|---|:---:|:---:|:---:| | [bucket_name](variables.tf#L27) | Name of the bucket that will be used for the function code. It will be created with prefix prepended if bucket_config is not null. | string | ✓ | | | [bundle_config](variables.tf#L51) | Cloud function source. Path can point to a GCS object URI, or a local path. A local path to a zip archive will generate a GCS object using its basename, a folder will be zipped and the GCS object name inferred when not specified. | object({…}) | ✓ | | -| [name](variables.tf#L189) | Name used for cloud function and associated resources. | string | ✓ | | -| [project_id](variables.tf#L204) | Project id used for all resources. | string | ✓ | | -| [region](variables.tf#L209) | Region used for all resources. | string | ✓ | | +| [name](variables.tf#L190) | Name used for cloud function and associated resources. | string | ✓ | | +| [project_id](variables.tf#L205) | Project id used for all resources. | string | ✓ | | +| [region](variables.tf#L210) | Region used for all resources. | string | ✓ | | | [bucket_config](variables.tf#L17) | Enable and configure auto-created bucket. Set fields to null to use defaults. | object({…}) | | null | | [build_environment_variables](variables.tf#L33) | A set of key/value environment variable pairs available during build time. | map(string) | | {} | | [build_service_account](variables.tf#L39) | Build service account email. | string | | null | @@ -471,15 +471,15 @@ module "cf-http" { | [docker_repository_id](variables.tf#L126) | User managed repository created in Artifact Registry. | string | | null | | [environment_variables](variables.tf#L132) | Cloud function environment variables. | map(string) | | {…} | | [function_config](variables.tf#L140) | Cloud function configuration. Defaults to using main as entrypoint, 1 instance with 256MiB of memory, and 180 second timeout. | object({…}) | | {} | -| [iam](variables.tf#L165) | IAM bindings for topic in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | -| [ingress_settings](variables.tf#L171) | Control traffic that reaches the cloud function. Allowed values are ALLOW_ALL, ALLOW_INTERNAL_AND_GCLB and ALLOW_INTERNAL_ONLY . | string | | null | -| [kms_key](variables.tf#L177) | Resource name of a KMS crypto key (managed by the user) used to encrypt/decrypt function resources in key id format. If specified, you must also provide an artifact registry repository using the docker_repository_id field that was created with the same KMS crypto key. | string | | null | -| [labels](variables.tf#L183) | Resource labels. | map(string) | | {} | -| [prefix](variables.tf#L194) | Optional prefix used for resource names. | string | | null | -| [secrets](variables.tf#L214) | Secret Manager secrets. Key is the variable name or mountpoint, volume versions are in version:path format. | map(object({…})) | | {} | +| [iam](variables.tf#L166) | IAM bindings for topic in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | +| [ingress_settings](variables.tf#L172) | Control traffic that reaches the cloud function. Allowed values are ALLOW_ALL, ALLOW_INTERNAL_AND_GCLB and ALLOW_INTERNAL_ONLY . | string | | null | +| [kms_key](variables.tf#L178) | Resource name of a KMS crypto key (managed by the user) used to encrypt/decrypt function resources in key id format. If specified, you must also provide an artifact registry repository using the docker_repository_id field that was created with the same KMS crypto key. | string | | null | +| [labels](variables.tf#L184) | Resource labels. | map(string) | | {} | +| [prefix](variables.tf#L195) | Optional prefix used for resource names. | string | | null | +| [secrets](variables.tf#L215) | Secret Manager secrets. Key is the variable name or mountpoint, volume versions are in version:path format. | map(object({…})) | | {} | | [service_account_config](variables-serviceaccount.tf#L17) | Service account configurations. | object({…}) | | {} | -| [trigger_config](variables.tf#L226) | Function trigger configuration. Leave null for HTTP trigger. | object({…}) | | null | -| [vpc_connector](variables.tf#L244) | VPC connector configuration. Set create to 'true' if a new connector needs to be created. | object({…}) | | {} | +| [trigger_config](variables.tf#L227) | Function trigger configuration. Leave null for HTTP trigger. | object({…}) | | null | +| [vpc_connector](variables.tf#L245) | VPC connector configuration. Set create to 'true' if a new connector needs to be created. | object({…}) | | {} | | [vpc_connector_create](variables-vpcconnector.tf#L17) | VPC connector network configuration. Must be provided if new VPC connector is being created. | object({…}) | | null | ## Outputs diff --git a/modules/cloud-function-v2/main.tf b/modules/cloud-function-v2/main.tf index 38ed98c27..f20b38a95 100644 --- a/modules/cloud-function-v2/main.tf +++ b/modules/cloud-function-v2/main.tf @@ -112,7 +112,7 @@ resource "google_cloudfunctions2_function" "function" { ingress_settings = var.ingress_settings max_instance_count = var.function_config.instance_count max_instance_request_concurrency = var.function_config.max_instance_request_concurrency - min_instance_count = 0 + min_instance_count = var.function_config.min_instance_count service_account_email = local.service_account_email timeout_seconds = var.function_config.timeout_seconds vpc_connector = local.vpc_connector diff --git a/modules/cloud-function-v2/variables.tf b/modules/cloud-function-v2/variables.tf index f6357fc02..61da47af6 100644 --- a/modules/cloud-function-v2/variables.tf +++ b/modules/cloud-function-v2/variables.tf @@ -146,6 +146,7 @@ variable "function_config" { entry_point = optional(string, "main") instance_count = optional(number, 1) max_instance_request_concurrency = optional(number) + min_instance_count = optional(number, 0) memory_mb = optional(number, 256) # Memory in MB on_deploy_update_policy = optional(bool) runtime = optional(string, "python310")