diff --git a/AGENTS.md b/AGENTS.md new file mode 120000 index 000000000..e3c5a92d9 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1 @@ +GEMINI.md \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index c6883fce4..4662667d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,34 @@ All notable changes to this project will be documented in this file. -## [Unreleased] +## [Unreleased] + +## [49.2.0] - 2025-12-08 + +### FAST + +- [[#3568](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3568)] Cursed knowledge for `ignore_changes` ([wiktorn](https://github.com/wiktorn)) +- [[#3562](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3562)] Updates to GKE modules to support Secret Sync ([woodham1](https://github.com/woodham1)) +- [[#3565](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3565)] Update stage 0 README ([ludoo](https://github.com/ludoo)) +- [[#3554](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3554)] Re-enable billing budget association in project factory for projects and extend to folders ([ludoo](https://github.com/ludoo)) + +### MODULES + +- [[#3572](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3572)] add labels support to dns module ([borijani](https://github.com/borijani)) +- [[#3569](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3569)] fix e2e tests - move c4* tests to c zone ([wiktorn](https://github.com/wiktorn)) +- [[#3567](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3567)] Add Direct VPC Egress support to `modules/cloud-function-v2` ([juliocc](https://github.com/juliocc)) +- [[#3562](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3562)] Updates to GKE modules to support Secret Sync ([woodham1](https://github.com/woodham1)) +- [[#3564](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3564)] feat(net-lb-app): support Google-Managed IAP and add tests ([drebes](https://github.com/drebes)) +- [[#3558](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3558)] Add support for CMEK in logging bucket, big query dataset and gke notifications ([vannicktrinquier](https://github.com/vannicktrinquier)) +- [[#3560](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3560)] Added PSC connection id to outputs, which is required, for instance f… ([apichick](https://github.com/apichick)) +- [[#3554](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3554)] Re-enable billing budget association in project factory for projects and extend to folders ([ludoo](https://github.com/ludoo)) +- [[#3552](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3552)] Auto-grant editor role for cloudservices in project module, expand project ids context in project factory module ([ludoo](https://github.com/ludoo)) +- [[#3551](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3551)] fix http2 and ssl health-checks for load balancers ([wiktorn](https://github.com/wiktorn)) + +### TOOLS + +- [[#3562](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3562)] Updates to GKE modules to support Secret Sync ([woodham1](https://github.com/woodham1)) +- [[#3563](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3563)] Add GEMINI.md file ([drebes](https://github.com/drebes)) ## [49.1.0] - 2025-11-24 @@ -1958,7 +1985,8 @@ Project templates are still following the old project factory schemas, and will - [[#2163](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/2163)] feat: add e2e test for pubsub module ([andybubu](https://github.com/andybubu)) -[Unreleased]: https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/compare/v49.1.0...HEAD +[Unreleased]: https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/compare/v49.2.0...HEAD +[49.2.0]: https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/compare/v49.2.0...49.1.0 [49.1.0]: https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/compare/v49.1.0...49.0.0 [49.0.0]: https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/compare/v49.0.0...48.1.0 [48.1.0]: https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/compare/v48.1.0...48.0.0 diff --git a/CURSED_KNOWLEDGE.md b/CURSED_KNOWLEDGE.md index f3c1859a5..a914fce7a 100644 --- a/CURSED_KNOWLEDGE.md +++ b/CURSED_KNOWLEDGE.md @@ -4,6 +4,7 @@ | date | item | |------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| 2025-12-06 | When using `ignore_changes` bear in mind, that terraform reads ignored values during plan and uses values from the plan during apply for ignored arguments. If another resource is touching `ignore_changes` argument, there is no guarantee that results will be correct. For example, do not mix `google_access_context_manager_service_perimeter` with `ignore_changes` on resources and `google_access_context_manager_service_perimeter_resource` within the same Terraform state | | 2025-11-06 | Result of `try(local.partially_known_after_apply, [])` is ``. Using `local.partially_known_after_apply == null ? [] : local.partially_known_after_apply` will preserve that variable is partially known. This is important for resource `for_each` using maps, where keys needs to be known during plan, `try(...)` will make the whole map known after apply and this errors out | | 2025-10-23 | Some [service agents](https://cloud.google.com/iam/docs/service-agents) are not created upon API activation nor calling `google_project_service_identity`. Since we have no way of knowing if they exist, we avoid automatically granting their respective roles in the project module. The list of agents for which we do not perform automatic grants can be found in the [tools/build_service_agents.py](./tools/build_service_agents.py) script. | | 2025-10-23 | Use `terraform plan` after `terraform apply` to confirm that the plan is empty after applying the changes. Non-empty plan is a sign of potential bug in either Terraform code or provider and suggests, that configuration might not have been applied as expected or potential problems when implementing future changes | | diff --git a/GEMINI.md b/GEMINI.md new file mode 100644 index 000000000..eb62612d9 --- /dev/null +++ b/GEMINI.md @@ -0,0 +1,82 @@ +# Cloud Foundation Fabric (CFF) + +## Project Overview +Cloud Foundation Fabric is a comprehensive suite of Terraform modules and end-to-end blueprints designed for Google Cloud Platform (GCP). It serves two primary purposes: + +1. **Modules:** A library of composable, production-ready Terraform modules (e.g., `project`, `net-vpc`, `gke-cluster`). +2. **FAST (Fabric FAST):** An opinionated, stage-based landing zone toolkit for bootstrapping enterprise-grade GCP organizations. + +## Key Components + +### 1. Modules (`/modules`) +* **Philosophy:** Lean, composable, and close to the underlying provider resources. +* **Structure:** + * Standardized interfaces for IAM, logging, and organization policies. + * Self-contained: Dependency injection is preferred over complex remote state lookups within modules. + * **Naming:** Avoid random suffixes; use explicit `prefix` variables. +* **Usage:** Modules are designed to be forked/owned or referenced via Git tags (e.g., `source = "github.com/...//modules/project?ref=v30.0.0"`). + +### 2. FAST (`/fast`) +* **Purpose:** Rapidly set up a secure, scalable GCP organization. +* **Architecture:** Divided into sequential "stages" (0-bootstrap, 1-resman, 2-networking, etc.). +* **Factories:** Uses YAML-based "factories" (e.g., Project Factory) to drive configuration at scale. + +### 3. Tools (`/tools`) +* Python-based utility scripts for documentation, linting, and CI/CD tasks. +* **Key Scripts:** + * `tfdoc.py`: Auto-generates input/output tables in `README.md` files. + * `check_boilerplate.py`: Enforces license headers. + * `check_documentation.py`: Verifies README consistency. + +## Development Workflow + +### Prerequisites +* **Terraform** (or OpenTofu) +* **Python 3.10+** +* **Dependencies:** + ```bash + pip install -r tests/requirements.txt + pip install -r tools/requirements.txt + ``` + +### Common Tasks + +#### 1. Formatting & Linting +Always format code and update documentation before committing. +```bash +# Format Terraform code +terraform fmt -recursive + +# Update module documentation (variables/outputs tables) +./tools/tfdoc.py modules/ + +# Run all lint checks (wraps pre-commit hooks) +./tools/lint.sh +``` + +#### 2. Testing +Tests are written in Python using `pytest` and the `tftest` library. +```bash +# Run all tests +pytest tests + +# Run specific module examples +pytest -k 'modules and :' tests/examples + +# Run tests from a specific file +pytest tests/examples/test_plan.py +``` +**Note:** `TF_PLUGIN_CACHE_DIR` is recommended to speed up tests. + +#### 3. Contributing +* **Branching:** Use `username/feature-name`. +* **Commits:** Atomic commits with clear messages. +* **Docs:** Do not manually edit the variables/outputs tables in READMEs; use `tfdoc.py`. + +## Architecture & Conventions +* **Variables:** Prefer object variables (e.g., `iam = { ... }`) over many individual scalar variables. +* **IAM:** Implemented within resources (authoritative `_binding` or additive `_member`) via standard interfaces. +* **Outputs:** Explicitly depend on internal resources to ensure proper ordering (`depends_on`). +* **File Structure:** + * Move away from `main.tf`, `variables.tf`, `outputs.tf`. + * Use descriptive filenames: `iam.tf`, `gcs.tf`, `mounts.tf`. diff --git a/default-versions.tf b/default-versions.tf index 1c891f47a..6d44d07ea 100644 --- a/default-versions.tf +++ b/default-versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/path:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/path:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/path:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/path:v49.2.0-tf" } } diff --git a/default-versions.tofu b/default-versions.tofu index 7b9eb536f..a1969870b 100644 --- a/default-versions.tofu +++ b/default-versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/path:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/path:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/path:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/path:v49.2.0-tofu" } } diff --git a/fast/project-templates/managed-kafka/versions.tf b/fast/project-templates/managed-kafka/versions.tf index bd18aba60..4dee4971c 100644 --- a/fast/project-templates/managed-kafka/versions.tf +++ b/fast/project-templates/managed-kafka/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/fast/project-templates/managed-kafka:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/fast/project-templates/managed-kafka:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/fast/project-templates/managed-kafka:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/fast/project-templates/managed-kafka:v49.2.0-tf" } } diff --git a/fast/stages/0-org-setup/README.md b/fast/stages/0-org-setup/README.md index 3ea39f2d7..5eb773ba5 100644 --- a/fast/stages/0-org-setup/README.md +++ b/fast/stages/0-org-setup/README.md @@ -7,6 +7,7 @@ - [Configure defaults](#configure-defaults) - [Initial user permissions](#initial-user-permissions) - [First apply cycle](#first-apply-cycle) + - [Default project](#default-project) - [Importing org policies](#importing-org-policies) - [Local output files storage](#local-output-files-storage) - [Init and apply the stage](#init-and-apply-the-stage) @@ -158,6 +159,20 @@ If you are using an externally managed billing account, make sure user has Billi ### First apply cycle +#### Default project + +If the user applying this stage is starting new on GCP without any pre-existing project configured as default in `gcloud`, org policy creation will fail as the platform will be unable to track API usage quota. In those cases, manually create a temporary project, then enable the services need to bootstrap, and configure the project as default in `gcloud`. Once the first apply has run successfully, the `gcloud` default should be reset to the `iac-0` project, and the temporary one can be deleted. + +Create the project via the cloud console, which ensures a unique id is chosen and allows associating a billing account. Once the project has been created, copy its project id (not the name) and use it in the commands below. + +```bash +gcloud config set project [project id] +gcloud services enable \ + bigquery.googleapis.com cloudbilling.googleapis.com cloudresourcemanager.googleapis.com \ + essentialcontacts.googleapis.com iam.googleapis.com logging.googleapis.com \ + orgpolicy.googleapis.com serviceusage.googleapis.com +``` + #### Importing org policies If your dataset includes org policies which are already set in the organization, you must either comment them out in the relevant YAML files or configure this stage to import them. To figure out which policies are set, run `gcloud org-policies list --organization [your org id]`, then set the `org_policies_imports` variable in your tfvars file. The following is an example. @@ -172,8 +187,13 @@ compute.disableSerialPortAccess - SET ```tfvars # create or edit the 0-org-setup.auto.tfvars.file org_policies_imports = [ - 'iam.allowedPolicyMemberDomains', - 'compute.disableSerialPortAccess' + "constraints/compute.managed.restrictProtocolForwardingCreationForTypes", + "constraints/essentialcontacts.managed.allowedContactDomains", + "constraints/iam.allowedPolicyMemberDomains", + "constraints/iam.automaticIamGrantsForDefaultServiceAccounts", + "constraints/iam.managed.disableServiceAccountKeyCreation", + "constraints/iam.managed.disableServiceAccountKeyUpload", + "constraints/storage.uniformBucketLevelAccess" ] ``` @@ -236,6 +256,12 @@ gcloud storage cp gs://test0-prod-iac-core-0-iac-outputs/providers/0-org-setup-p gcloud storage cp gs://test0-prod-iac-core-0-iac-outputs/0-org-setup.auto.tfvars ./ ``` +If you had previously configured a temporary project in `gcloud`, you should now set the `iac-0` project as default. + +```bash +gcloud config set project [iac-0 project id] +``` + Once the provider file has been setup, migrate local state to the GCS backend and re-run apply. ```bash diff --git a/fast/stages/0-org-setup/fast_version.txt b/fast/stages/0-org-setup/fast_version.txt index 59e24df44..841f1c827 100644 --- a/fast/stages/0-org-setup/fast_version.txt +++ b/fast/stages/0-org-setup/fast_version.txt @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# FAST release: v49.1.0 \ No newline at end of file +# FAST release: v49.2.0 \ No newline at end of file diff --git a/fast/stages/0-org-setup/schemas/folder.schema.json b/fast/stages/0-org-setup/schemas/folder.schema.json index 837e33538..907b2dff1 100644 --- a/fast/stages/0-org-setup/schemas/folder.schema.json +++ b/fast/stages/0-org-setup/schemas/folder.schema.json @@ -74,6 +74,12 @@ } } }, + "billing_budgets": { + "type": "array", + "items": { + "type": "string" + } + }, "contacts": { "type": "object", "additionalProperties": false, diff --git a/fast/stages/1-vpcsc/README.md b/fast/stages/1-vpcsc/README.md index c22a0830e..90e3c1c08 100644 --- a/fast/stages/1-vpcsc/README.md +++ b/fast/stages/1-vpcsc/README.md @@ -83,13 +83,32 @@ This only supports sinks defined in the bootstrap stage, but it can easily be us The set of resources protected by each perimeter can be defined in two main ways: -- authoritatively, where protected resources are only defined in this stage -- cooperatively, where some resources are defined in this stage, and additional resources can be added separately (e.g. by a project factory) +- central and authoritative, where protected resources are only defined in this stage +- delegated and additive, where perimeter is defined in this stage and resources are added separately (e.g. by a project factory) The first approach is more secure as it does not require granting editing permission to other actors, but it's also operationally heavier as it requires adding projects to the perimeter right after creation, before many operations can be run. For example, Shared VPC attachment for a service project cannot happen until the project is in the same perimeter as its host project. The main advantage of this approach is being able to leverage the resource discovery features provided by this stage. The second approach is more flexible, but requires delegating a measure of control over perimeters to other actors, and losing control over perimeter membership which stops being enforced by Terraform. +When using the second approach, after applying this stage, provide perimeter information in your `defaults.yaml` file, for example: + +```yaml +projects: + overrides: + vpc_sc: + perimeter_name: accessPolicies/12345/servicePerimeters/default +``` + +And then apply `0-org-setup` stage again. For later stages (such as networking, project factory), add the perimeter in a similar way, but there you can use context to provide perimeter: +```yaml +projects: + overrides: + vpc_sc: + perimeter_name: default +``` + +> [!CAUTION] +> Do not add any resources to the perimeter in this stage when using the second approach. Any resources added in this stage will not be properly removed from perimeter, if the `terraform apply` is also changing the perimeter definition. #### Resource discovery If the first approach is desired in combination with resource discovery, you can simply tweak exclusions via the `resource_discovery` variable as the feature is enabled by default. diff --git a/fast/stages/1-vpcsc/fast_version.txt b/fast/stages/1-vpcsc/fast_version.txt index 59e24df44..841f1c827 100644 --- a/fast/stages/1-vpcsc/fast_version.txt +++ b/fast/stages/1-vpcsc/fast_version.txt @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# FAST release: v49.1.0 \ No newline at end of file +# FAST release: v49.2.0 \ No newline at end of file diff --git a/fast/stages/2-networking/fast_version.txt b/fast/stages/2-networking/fast_version.txt index 59e24df44..841f1c827 100644 --- a/fast/stages/2-networking/fast_version.txt +++ b/fast/stages/2-networking/fast_version.txt @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# FAST release: v49.1.0 \ No newline at end of file +# FAST release: v49.2.0 \ No newline at end of file diff --git a/fast/stages/2-networking/schemas/folder.schema.json b/fast/stages/2-networking/schemas/folder.schema.json index 837e33538..907b2dff1 100644 --- a/fast/stages/2-networking/schemas/folder.schema.json +++ b/fast/stages/2-networking/schemas/folder.schema.json @@ -74,6 +74,12 @@ } } }, + "billing_budgets": { + "type": "array", + "items": { + "type": "string" + } + }, "contacts": { "type": "object", "additionalProperties": false, diff --git a/fast/stages/2-project-factory/fast_version.txt b/fast/stages/2-project-factory/fast_version.txt index 59e24df44..841f1c827 100644 --- a/fast/stages/2-project-factory/fast_version.txt +++ b/fast/stages/2-project-factory/fast_version.txt @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# FAST release: v49.1.0 \ No newline at end of file +# FAST release: v49.2.0 \ No newline at end of file diff --git a/fast/stages/2-project-factory/schemas/folder.schema.json b/fast/stages/2-project-factory/schemas/folder.schema.json index 837e33538..907b2dff1 100644 --- a/fast/stages/2-project-factory/schemas/folder.schema.json +++ b/fast/stages/2-project-factory/schemas/folder.schema.json @@ -74,6 +74,12 @@ } } }, + "billing_budgets": { + "type": "array", + "items": { + "type": "string" + } + }, "contacts": { "type": "object", "additionalProperties": false, diff --git a/fast/stages/2-security/fast_version.txt b/fast/stages/2-security/fast_version.txt index 59e24df44..841f1c827 100644 --- a/fast/stages/2-security/fast_version.txt +++ b/fast/stages/2-security/fast_version.txt @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# FAST release: v49.1.0 \ No newline at end of file +# FAST release: v49.2.0 \ No newline at end of file diff --git a/fast/stages/2-security/schemas/folder.schema.json b/fast/stages/2-security/schemas/folder.schema.json index 837e33538..907b2dff1 100644 --- a/fast/stages/2-security/schemas/folder.schema.json +++ b/fast/stages/2-security/schemas/folder.schema.json @@ -74,6 +74,12 @@ } } }, + "billing_budgets": { + "type": "array", + "items": { + "type": "string" + } + }, "contacts": { "type": "object", "additionalProperties": false, diff --git a/fast/stages/3-data-platform-dev/fast_version.txt b/fast/stages/3-data-platform-dev/fast_version.txt index 59e24df44..841f1c827 100644 --- a/fast/stages/3-data-platform-dev/fast_version.txt +++ b/fast/stages/3-data-platform-dev/fast_version.txt @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# FAST release: v49.1.0 \ No newline at end of file +# FAST release: v49.2.0 \ No newline at end of file diff --git a/fast/stages/3-gcve-dev/fast_version.txt b/fast/stages/3-gcve-dev/fast_version.txt index 59e24df44..841f1c827 100644 --- a/fast/stages/3-gcve-dev/fast_version.txt +++ b/fast/stages/3-gcve-dev/fast_version.txt @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# FAST release: v49.1.0 \ No newline at end of file +# FAST release: v49.2.0 \ No newline at end of file diff --git a/fast/stages/3-gke-dev/fast_version.txt b/fast/stages/3-gke-dev/fast_version.txt index 59e24df44..841f1c827 100644 --- a/fast/stages/3-gke-dev/fast_version.txt +++ b/fast/stages/3-gke-dev/fast_version.txt @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# FAST release: v49.1.0 \ No newline at end of file +# FAST release: v49.2.0 \ No newline at end of file diff --git a/fast/stages/3-secops-dev/fast_version.txt b/fast/stages/3-secops-dev/fast_version.txt index 59e24df44..841f1c827 100644 --- a/fast/stages/3-secops-dev/fast_version.txt +++ b/fast/stages/3-secops-dev/fast_version.txt @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# FAST release: v49.1.0 \ No newline at end of file +# FAST release: v49.2.0 \ No newline at end of file diff --git a/modules/__experimental_deprecated/alloydb-instance/versions.tf b/modules/__experimental_deprecated/alloydb-instance/versions.tf index e7756bc17..c6543be7f 100644 --- a/modules/__experimental_deprecated/alloydb-instance/versions.tf +++ b/modules/__experimental_deprecated/alloydb-instance/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/alloydb-instance:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/alloydb-instance:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/alloydb-instance:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/alloydb-instance:v49.2.0-tf" } } diff --git a/modules/__experimental_deprecated/alloydb-instance/versions.tofu b/modules/__experimental_deprecated/alloydb-instance/versions.tofu index 60096b31c..3e9323547 100644 --- a/modules/__experimental_deprecated/alloydb-instance/versions.tofu +++ b/modules/__experimental_deprecated/alloydb-instance/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/alloydb-instance:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/alloydb-instance:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/alloydb-instance:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/alloydb-instance:v49.2.0-tofu" } } diff --git a/modules/__experimental_deprecated/net-neg/versions.tf b/modules/__experimental_deprecated/net-neg/versions.tf index 895b50fbf..136f0db0e 100644 --- a/modules/__experimental_deprecated/net-neg/versions.tf +++ b/modules/__experimental_deprecated/net-neg/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/net-neg:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/net-neg:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/net-neg:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/net-neg:v49.2.0-tf" } } diff --git a/modules/__experimental_deprecated/net-neg/versions.tofu b/modules/__experimental_deprecated/net-neg/versions.tofu index 7d403ebfb..f8c0cb7ff 100644 --- a/modules/__experimental_deprecated/net-neg/versions.tofu +++ b/modules/__experimental_deprecated/net-neg/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/net-neg:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/net-neg:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/net-neg:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/net-neg:v49.2.0-tofu" } } diff --git a/modules/__experimental_deprecated/project-iam-magic/versions.tf b/modules/__experimental_deprecated/project-iam-magic/versions.tf index 76ccd88c8..56e2421e7 100644 --- a/modules/__experimental_deprecated/project-iam-magic/versions.tf +++ b/modules/__experimental_deprecated/project-iam-magic/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/project-iam-magic:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/project-iam-magic:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/project-iam-magic:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/project-iam-magic:v49.2.0-tf" } } diff --git a/modules/__experimental_deprecated/project-iam-magic/versions.tofu b/modules/__experimental_deprecated/project-iam-magic/versions.tofu index d6bf86350..9f8f859d2 100644 --- a/modules/__experimental_deprecated/project-iam-magic/versions.tofu +++ b/modules/__experimental_deprecated/project-iam-magic/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/project-iam-magic:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/project-iam-magic:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/project-iam-magic:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/__experimental_deprecated/project-iam-magic:v49.2.0-tofu" } } diff --git a/modules/agent-engine/versions.tf b/modules/agent-engine/versions.tf index 8f158aacc..50c6dce96 100644 --- a/modules/agent-engine/versions.tf +++ b/modules/agent-engine/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/agent-engine:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/agent-engine:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/agent-engine:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/agent-engine:v49.2.0-tf" } } diff --git a/modules/agent-engine/versions.tofu b/modules/agent-engine/versions.tofu index 5e25e069b..82d707019 100644 --- a/modules/agent-engine/versions.tofu +++ b/modules/agent-engine/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/agent-engine:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/agent-engine:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/agent-engine:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/agent-engine:v49.2.0-tofu" } } diff --git a/modules/ai-applications/versions.tf b/modules/ai-applications/versions.tf index 647eadb54..e33eacde4 100644 --- a/modules/ai-applications/versions.tf +++ b/modules/ai-applications/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/ai-applications:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/ai-applications:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/ai-applications:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/ai-applications:v49.2.0-tf" } } diff --git a/modules/ai-applications/versions.tofu b/modules/ai-applications/versions.tofu index 5c67b893a..1f23843d2 100644 --- a/modules/ai-applications/versions.tofu +++ b/modules/ai-applications/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/ai-applications:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/ai-applications:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/ai-applications:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/ai-applications:v49.2.0-tofu" } } diff --git a/modules/alloydb/versions.tf b/modules/alloydb/versions.tf index 43e46a71b..748e15cef 100644 --- a/modules/alloydb/versions.tf +++ b/modules/alloydb/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/alloydb:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/alloydb:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/alloydb:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/alloydb:v49.2.0-tf" } } diff --git a/modules/alloydb/versions.tofu b/modules/alloydb/versions.tofu index 2e8ae2ec5..00d243fcf 100644 --- a/modules/alloydb/versions.tofu +++ b/modules/alloydb/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/alloydb:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/alloydb:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/alloydb:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/alloydb:v49.2.0-tofu" } } diff --git a/modules/analytics-hub/versions.tf b/modules/analytics-hub/versions.tf index 94f4c4a46..4bbe53996 100644 --- a/modules/analytics-hub/versions.tf +++ b/modules/analytics-hub/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/analytics-hub:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/analytics-hub:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/analytics-hub:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/analytics-hub:v49.2.0-tf" } } diff --git a/modules/analytics-hub/versions.tofu b/modules/analytics-hub/versions.tofu index b49c96ab7..28b85169a 100644 --- a/modules/analytics-hub/versions.tofu +++ b/modules/analytics-hub/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/analytics-hub:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/analytics-hub:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/analytics-hub:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/analytics-hub:v49.2.0-tofu" } } diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf index 7a22f8c75..f55277131 100644 --- a/modules/api-gateway/versions.tf +++ b/modules/api-gateway/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/api-gateway:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/api-gateway:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/api-gateway:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/api-gateway:v49.2.0-tf" } } diff --git a/modules/api-gateway/versions.tofu b/modules/api-gateway/versions.tofu index b4021c96c..8ca05c498 100644 --- a/modules/api-gateway/versions.tofu +++ b/modules/api-gateway/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/api-gateway:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/api-gateway:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/api-gateway:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/api-gateway:v49.2.0-tofu" } } diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf index 1f1885ce0..45770be28 100644 --- a/modules/apigee/versions.tf +++ b/modules/apigee/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/apigee:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/apigee:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/apigee:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/apigee:v49.2.0-tf" } } diff --git a/modules/apigee/versions.tofu b/modules/apigee/versions.tofu index 100ca3112..04a844c1b 100644 --- a/modules/apigee/versions.tofu +++ b/modules/apigee/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/apigee:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/apigee:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/apigee:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/apigee:v49.2.0-tofu" } } diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf index 20355a532..74f89e3fa 100644 --- a/modules/artifact-registry/versions.tf +++ b/modules/artifact-registry/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/artifact-registry:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/artifact-registry:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/artifact-registry:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/artifact-registry:v49.2.0-tf" } } diff --git a/modules/artifact-registry/versions.tofu b/modules/artifact-registry/versions.tofu index 4e4a4ffb9..36070618a 100644 --- a/modules/artifact-registry/versions.tofu +++ b/modules/artifact-registry/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/artifact-registry:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/artifact-registry:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/artifact-registry:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/artifact-registry:v49.2.0-tofu" } } diff --git a/modules/backup-dr/versions.tf b/modules/backup-dr/versions.tf index 10bbc546e..d170f2510 100644 --- a/modules/backup-dr/versions.tf +++ b/modules/backup-dr/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/backup-dr:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/backup-dr:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/backup-dr:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/backup-dr:v49.2.0-tf" } } diff --git a/modules/backup-dr/versions.tofu b/modules/backup-dr/versions.tofu index d40027d0d..1c34f72c4 100644 --- a/modules/backup-dr/versions.tofu +++ b/modules/backup-dr/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/backup-dr:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/backup-dr:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/backup-dr:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/backup-dr:v49.2.0-tofu" } } diff --git a/modules/bigquery-connection/versions.tf b/modules/bigquery-connection/versions.tf index 8a3cdafc9..527e18455 100644 --- a/modules/bigquery-connection/versions.tf +++ b/modules/bigquery-connection/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-connection:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-connection:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-connection:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-connection:v49.2.0-tf" } } diff --git a/modules/bigquery-connection/versions.tofu b/modules/bigquery-connection/versions.tofu index 40e8f7b06..1f083b410 100644 --- a/modules/bigquery-connection/versions.tofu +++ b/modules/bigquery-connection/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-connection:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-connection:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-connection:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-connection:v49.2.0-tofu" } } diff --git a/modules/bigquery-dataset/README.md b/modules/bigquery-dataset/README.md index 44f25427c..cd9433052 100644 --- a/modules/bigquery-dataset/README.md +++ b/modules/bigquery-dataset/README.md @@ -353,27 +353,27 @@ module "bigquery-dataset" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [id](variables.tf#L111) | Dataset id. | string | ✓ | | -| [project_id](variables.tf#L175) | Id of the project where datasets will be created. | string | ✓ | | +| [id](variables.tf#L112) | Dataset id. | string | ✓ | | +| [project_id](variables.tf#L176) | Id of the project where datasets will be created. | string | ✓ | | | [access](variables.tf#L17) | Map of access rules with role and identity type. Keys are arbitrary and must match those in the `access_identities` variable, types are `domain`, `group`, `special_group`, `user`, `view`. | map(object({…})) | | {} | | [access_identities](variables.tf#L33) | Map of access identities used for basic access roles. View identities have the format 'project_id\|dataset_id\|table_id'. | map(string) | | {} | | [authorized_datasets](variables.tf#L39) | An array of datasets to be authorized on the dataset. | list(object({…})) | | [] | | [authorized_routines](variables.tf#L48) | An array of routines to be authorized on the dataset. | list(object({…})) | | [] | | [authorized_views](variables.tf#L58) | An array of views to be authorized on the dataset. | list(object({…})) | | [] | -| [context](variables.tf#L68) | Context-specific interpolations. | object({…}) | | {} | -| [dataset_access](variables.tf#L81) | Set access in the dataset resource instead of using separate resources. | bool | | false | -| [description](variables.tf#L87) | Optional description. | string | | "Terraform managed." | -| [encryption_key](variables.tf#L93) | Self link of the KMS key that will be used to protect destination table. | string | | null | -| [friendly_name](variables.tf#L99) | Dataset friendly name. | string | | null | -| [iam](variables.tf#L105) | IAM bindings in {ROLE => [MEMBERS]} format. Mutually exclusive with the access_* variables used for basic roles. | map(list(string)) | | {} | -| [labels](variables.tf#L116) | Dataset labels. | map(string) | | {} | -| [location](variables.tf#L122) | Dataset location. | string | | "EU" | -| [materialized_views](variables.tf#L128) | Materialized views definitions. | map(object({…})) | | {} | -| [options](variables.tf#L161) | Dataset options. | object({…}) | | {} | -| [routines](variables.tf#L180) | Routine definitions. | map(object({…})) | | {} | -| [tables](variables.tf#L219) | Table definitions. Options and partitioning default to null. Partitioning can only use `range` or `time`, set the unused one to null. | map(object({…})) | | {} | -| [tag_bindings](variables.tf#L304) | Tag bindings for this dataset, in key => tag value id format. | map(string) | | {} | -| [views](variables.tf#L311) | View definitions. | map(object({…})) | | {} | +| [context](variables.tf#L68) | Context-specific interpolations. | object({…}) | | {} | +| [dataset_access](variables.tf#L82) | Set access in the dataset resource instead of using separate resources. | bool | | false | +| [description](variables.tf#L88) | Optional description. | string | | "Terraform managed." | +| [encryption_key](variables.tf#L94) | Self link of the KMS key that will be used to protect destination table. | string | | null | +| [friendly_name](variables.tf#L100) | Dataset friendly name. | string | | null | +| [iam](variables.tf#L106) | IAM bindings in {ROLE => [MEMBERS]} format. Mutually exclusive with the access_* variables used for basic roles. | map(list(string)) | | {} | +| [labels](variables.tf#L117) | Dataset labels. | map(string) | | {} | +| [location](variables.tf#L123) | Dataset location. | string | | "EU" | +| [materialized_views](variables.tf#L129) | Materialized views definitions. | map(object({…})) | | {} | +| [options](variables.tf#L162) | Dataset options. | object({…}) | | {} | +| [routines](variables.tf#L181) | Routine definitions. | map(object({…})) | | {} | +| [tables](variables.tf#L220) | Table definitions. Options and partitioning default to null. Partitioning can only use `range` or `time`, set the unused one to null. | map(object({…})) | | {} | +| [tag_bindings](variables.tf#L305) | Tag bindings for this dataset, in key => tag value id format. | map(string) | | {} | +| [views](variables.tf#L312) | View definitions. | map(object({…})) | | {} | ## Outputs diff --git a/modules/bigquery-dataset/main.tf b/modules/bigquery-dataset/main.tf index 17b676848..20a5fd520 100644 --- a/modules/bigquery-dataset/main.tf +++ b/modules/bigquery-dataset/main.tf @@ -43,7 +43,8 @@ locals { for kk, vv in v : "${local.ctx_p}${k}:${kk}" => vv } if k != "condition_vars" } - ctx_p = "$" + ctx_p = "$" + ctx_kms_keys = try(local.ctx.kms_keys, {}) identities_view = { for k, v in local.access_view : k => try( zipmap( @@ -144,7 +145,11 @@ resource "google_bigquery_dataset" "default" { dynamic "default_encryption_configuration" { for_each = var.encryption_key == null ? [] : [""] content { - kms_key_name = var.encryption_key + kms_key_name = lookup( + local.ctx_kms_keys, + var.encryption_key, + var.encryption_key + ) } } } @@ -255,7 +260,11 @@ resource "google_bigquery_table" "default" { dynamic "encryption_configuration" { for_each = each.value.options.encryption_key != null ? [""] : [] content { - kms_key_name = each.value.options.encryption_key + kms_key_name = lookup( + local.ctx_kms_keys, + each.value.options.encryption_key, + each.value.options.encryption_key + ) } } diff --git a/modules/bigquery-dataset/variables.tf b/modules/bigquery-dataset/variables.tf index 9e797b3f4..dac68063f 100644 --- a/modules/bigquery-dataset/variables.tf +++ b/modules/bigquery-dataset/variables.tf @@ -69,6 +69,7 @@ variable "context" { description = "Context-specific interpolations." type = object({ custom_roles = optional(map(string), {}) + kms_keys = optional(map(string), {}) iam_principals = optional(map(string), {}) locations = optional(map(string), {}) project_ids = optional(map(string), {}) diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf index c7360a8c3..9d3a6867b 100644 --- a/modules/bigquery-dataset/versions.tf +++ b/modules/bigquery-dataset/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-dataset:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-dataset:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-dataset:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-dataset:v49.2.0-tf" } } diff --git a/modules/bigquery-dataset/versions.tofu b/modules/bigquery-dataset/versions.tofu index 9b354e94a..0c953751a 100644 --- a/modules/bigquery-dataset/versions.tofu +++ b/modules/bigquery-dataset/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-dataset:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-dataset:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-dataset:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigquery-dataset:v49.2.0-tofu" } } diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf index 77d79f585..2a815295e 100644 --- a/modules/bigtable-instance/versions.tf +++ b/modules/bigtable-instance/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigtable-instance:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigtable-instance:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigtable-instance:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigtable-instance:v49.2.0-tf" } } diff --git a/modules/bigtable-instance/versions.tofu b/modules/bigtable-instance/versions.tofu index 6bf999d83..ecc8fec3c 100644 --- a/modules/bigtable-instance/versions.tofu +++ b/modules/bigtable-instance/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigtable-instance:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigtable-instance:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigtable-instance:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/bigtable-instance:v49.2.0-tofu" } } diff --git a/modules/billing-account/README.md b/modules/billing-account/README.md index 6b71127a8..b3950fa15 100644 --- a/modules/billing-account/README.md +++ b/modules/billing-account/README.md @@ -277,17 +277,17 @@ update_rules: | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [id](variables.tf#L145) | Billing account id. | string | ✓ | | +| [id](variables.tf#L147) | Billing account id. | string | ✓ | | | [budget_notification_channels](variables.tf#L17) | Notification channels used by budget alerts. | map(object({…})) | | {} | -| [budgets](variables.tf#L47) | Billing budgets. Notification channels are either keys in corresponding variable, or external ids. | map(object({…})) | | {} | -| [context](variables.tf#L122) | Context-specific interpolations. | object({…}) | | {} | -| [factories_config](variables.tf#L136) | Path to folder containing budget alerts data files. | object({…}) | | {} | +| [budgets](variables.tf#L47) | Billing budgets. Notification channels are either keys in corresponding variable, or external ids. | map(object({…})) | | {} | +| [context](variables.tf#L122) | Context-specific interpolations. | object({…}) | | {} | +| [factories_config](variables.tf#L138) | Path to folder containing budget alerts data files. | object({…}) | | {} | | [iam](variables-iam.tf#L17) | IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | | [iam_bindings](variables-iam.tf#L24) | Authoritative IAM bindings in {KEY => {role = ROLE, members = [], condition = {}}}. Keys are arbitrary. | map(object({…})) | | {} | | [iam_bindings_additive](variables-iam.tf#L39) | Individual additive IAM bindings. Keys are arbitrary. | map(object({…})) | | {} | | [iam_by_principals](variables-iam.tf#L54) | Authoritative IAM binding in {PRINCIPAL => [ROLES]} format. Principals need to be statically defined to avoid cycle errors. Merged internally with the `iam` variable. | map(list(string)) | | {} | -| [logging_sinks](variables.tf#L150) | Logging sinks to create for the billing account. | map(object({…})) | | {} | -| [projects](variables.tf#L183) | Projects associated with this billing account. | list(string) | | [] | +| [logging_sinks](variables.tf#L152) | Logging sinks to create for the billing account. | map(object({…})) | | {} | +| [projects](variables.tf#L185) | Projects associated with this billing account. | list(string) | | [] | ## Outputs diff --git a/modules/billing-account/budgets.tf b/modules/billing-account/budgets.tf index 0e381f00b..aaa38ae1a 100644 --- a/modules/billing-account/budgets.tf +++ b/modules/billing-account/budgets.tf @@ -48,6 +48,19 @@ resource "google_monitoring_notification_channel" "default" { } } +# resource "terraform_data" "defaults_preconditions" { +# lifecycle { +# precondition { +# condition = local.factory_budgets == null +# error_message = yamlencode(local.factory_budgets) +# } +# precondition { +# condition = local.factory_budgets == null +# error_message = yamlencode(local.ctx.project_sets) +# } +# } +# } + resource "google_billing_budget" "default" { for_each = merge(local.factory_budgets, var.budgets) billing_account = var.id @@ -83,14 +96,20 @@ resource "google_billing_budget" "default" { labels = each.value.filter.label == null ? null : { (each.value.filter.label.key) = each.value.filter.label.value } - projects = each.value.filter.projects == null ? [] : [ - for v in each.value.filter.projects : - lookup(local.ctx.project_ids, v, v) - ] - resource_ancestors = each.value.filter.resource_ancestors == null ? [] : [ - for v in each.value.filter.resource_ancestors : - lookup(local.ctx.folder_ids, v, v) - ] + projects = concat( + [ + for v in each.value.filter.projects : + lookup(local.ctx.project_ids, v, v) + ], + lookup(local.ctx.project_sets, "$project_sets:${each.key}", []) + ) + resource_ancestors = concat( + [ + for v in each.value.filter.resource_ancestors : + lookup(local.ctx.folder_ids, v, v) + ], + lookup(local.ctx.folder_sets, "$folder_sets:${each.key}", []) + ) services = each.value.filter.services subaccounts = each.value.filter.subaccounts dynamic "custom_period" { diff --git a/modules/billing-account/factory.tf b/modules/billing-account/factory.tf index 343cfdca8..2092f1605 100644 --- a/modules/billing-account/factory.tf +++ b/modules/billing-account/factory.tf @@ -45,8 +45,8 @@ locals { ) ) label = try(v.filter.label, null) - projects = try(v.filter.projects, null) - resource_ancestors = try(v.filter.resource_ancestors, null) + projects = try(v.filter.projects, []) + resource_ancestors = try(v.filter.resource_ancestors, []) services = try(v.filter.services, null) subaccounts = try(v.filter.subaccounts, null) } diff --git a/modules/billing-account/variables.tf b/modules/billing-account/variables.tf index f9d736edd..061767540 100644 --- a/modules/billing-account/variables.tf +++ b/modules/billing-account/variables.tf @@ -79,8 +79,8 @@ variable "budgets" { })) })) })) - projects = optional(list(string)) - resource_ancestors = optional(list(string)) + projects = optional(list(string), []) + resource_ancestors = optional(list(string), []) services = optional(list(string)) subaccounts = optional(list(string)) })) @@ -124,9 +124,11 @@ variable "context" { type = object({ custom_roles = optional(map(string), {}) folder_ids = optional(map(string), {}) + folder_sets = optional(map(list(string)), {}) iam_principals = optional(map(string), {}) notification_channels = optional(map(string), {}) project_ids = optional(map(string), {}) + project_sets = optional(map(list(string)), {}) storage_buckets = optional(map(string), {}) }) default = {} diff --git a/modules/billing-account/versions.tf b/modules/billing-account/versions.tf index e605da93c..e01bee46e 100644 --- a/modules/billing-account/versions.tf +++ b/modules/billing-account/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/billing-account:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/billing-account:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/billing-account:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/billing-account:v49.2.0-tf" } } diff --git a/modules/billing-account/versions.tofu b/modules/billing-account/versions.tofu index 587ae737b..b3e135a3c 100644 --- a/modules/billing-account/versions.tofu +++ b/modules/billing-account/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/billing-account:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/billing-account:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/billing-account:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/billing-account:v49.2.0-tofu" } } diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf index 54574a95b..777f9ef77 100644 --- a/modules/binauthz/versions.tf +++ b/modules/binauthz/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/binauthz:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/binauthz:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/binauthz:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/binauthz:v49.2.0-tf" } } diff --git a/modules/binauthz/versions.tofu b/modules/binauthz/versions.tofu index d062025dc..8327073e5 100644 --- a/modules/binauthz/versions.tofu +++ b/modules/binauthz/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/binauthz:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/binauthz:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/binauthz:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/binauthz:v49.2.0-tofu" } } diff --git a/modules/certificate-authority-service/versions.tf b/modules/certificate-authority-service/versions.tf index 92e40f2cb..2f563abbe 100644 --- a/modules/certificate-authority-service/versions.tf +++ b/modules/certificate-authority-service/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-authority-service:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-authority-service:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-authority-service:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-authority-service:v49.2.0-tf" } } diff --git a/modules/certificate-authority-service/versions.tofu b/modules/certificate-authority-service/versions.tofu index ab0057fda..899fb667f 100644 --- a/modules/certificate-authority-service/versions.tofu +++ b/modules/certificate-authority-service/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-authority-service:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-authority-service:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-authority-service:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-authority-service:v49.2.0-tofu" } } diff --git a/modules/certificate-manager/versions.tf b/modules/certificate-manager/versions.tf index f40360d49..90d46f4c5 100644 --- a/modules/certificate-manager/versions.tf +++ b/modules/certificate-manager/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-manager:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-manager:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-manager:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-manager:v49.2.0-tf" } } diff --git a/modules/certificate-manager/versions.tofu b/modules/certificate-manager/versions.tofu index 56c10eed9..aaccab2b7 100644 --- a/modules/certificate-manager/versions.tofu +++ b/modules/certificate-manager/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-manager:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-manager:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-manager:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/certificate-manager:v49.2.0-tofu" } } diff --git a/modules/cloud-build-v2-connection/versions.tf b/modules/cloud-build-v2-connection/versions.tf index cd29ae5c5..576779dc9 100644 --- a/modules/cloud-build-v2-connection/versions.tf +++ b/modules/cloud-build-v2-connection/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-build-v2-connection:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-build-v2-connection:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-build-v2-connection:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-build-v2-connection:v49.2.0-tf" } } diff --git a/modules/cloud-build-v2-connection/versions.tofu b/modules/cloud-build-v2-connection/versions.tofu index 7739a0201..223b0881b 100644 --- a/modules/cloud-build-v2-connection/versions.tofu +++ b/modules/cloud-build-v2-connection/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-build-v2-connection:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-build-v2-connection:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-build-v2-connection:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-build-v2-connection:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/__need_fixing/onprem/versions.tf b/modules/cloud-config-container/__need_fixing/onprem/versions.tf index 43f0b7f16..354e89b4d 100644 --- a/modules/cloud-config-container/__need_fixing/onprem/versions.tf +++ b/modules/cloud-config-container/__need_fixing/onprem/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/onprem:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/onprem:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/onprem:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/onprem:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/__need_fixing/onprem/versions.tofu b/modules/cloud-config-container/__need_fixing/onprem/versions.tofu index c8b1accb6..c6a807aff 100644 --- a/modules/cloud-config-container/__need_fixing/onprem/versions.tofu +++ b/modules/cloud-config-container/__need_fixing/onprem/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/onprem:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/onprem:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/onprem:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/onprem:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/__need_fixing/squid/versions.tf b/modules/cloud-config-container/__need_fixing/squid/versions.tf index ad6515a39..387ac429c 100644 --- a/modules/cloud-config-container/__need_fixing/squid/versions.tf +++ b/modules/cloud-config-container/__need_fixing/squid/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/squid:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/squid:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/squid:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/squid:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/__need_fixing/squid/versions.tofu b/modules/cloud-config-container/__need_fixing/squid/versions.tofu index 6aa8e3154..599eacaea 100644 --- a/modules/cloud-config-container/__need_fixing/squid/versions.tofu +++ b/modules/cloud-config-container/__need_fixing/squid/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/squid:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/squid:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/squid:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/__need_fixing/squid:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/bindplane/versions.tf b/modules/cloud-config-container/bindplane/versions.tf index 84271b427..ebaa6f771 100644 --- a/modules/cloud-config-container/bindplane/versions.tf +++ b/modules/cloud-config-container/bindplane/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/bindplane:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/bindplane:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/bindplane:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/bindplane:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/bindplane/versions.tofu b/modules/cloud-config-container/bindplane/versions.tofu index fecdeebe3..f0e1f3f7c 100644 --- a/modules/cloud-config-container/bindplane/versions.tofu +++ b/modules/cloud-config-container/bindplane/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/bindplane:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/bindplane:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/bindplane:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/bindplane:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf index f33fe1549..a1b20a658 100644 --- a/modules/cloud-config-container/coredns/versions.tf +++ b/modules/cloud-config-container/coredns/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/coredns:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/coredns:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/coredns:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/coredns:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/coredns/versions.tofu b/modules/cloud-config-container/coredns/versions.tofu index 3aafb74fa..62459c3e3 100644 --- a/modules/cloud-config-container/coredns/versions.tofu +++ b/modules/cloud-config-container/coredns/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/coredns:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/coredns:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/coredns:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/coredns:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/cos-generic-metadata/versions.tf b/modules/cloud-config-container/cos-generic-metadata/versions.tf index aabbed104..f7e7d01d2 100644 --- a/modules/cloud-config-container/cos-generic-metadata/versions.tf +++ b/modules/cloud-config-container/cos-generic-metadata/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/cos-generic-metadata:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/cos-generic-metadata:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/cos-generic-metadata:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/cos-generic-metadata:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/cos-generic-metadata/versions.tofu b/modules/cloud-config-container/cos-generic-metadata/versions.tofu index aa6aea85e..00f8811ab 100644 --- a/modules/cloud-config-container/cos-generic-metadata/versions.tofu +++ b/modules/cloud-config-container/cos-generic-metadata/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/cos-generic-metadata:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/cos-generic-metadata:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/cos-generic-metadata:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/cos-generic-metadata:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf b/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf index 67737ced8..4fadeedbf 100644 --- a/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf +++ b/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tofu b/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tofu index b7046b053..51ac2b837 100644 --- a/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tofu +++ b/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/envoy-traffic-director/versions.tf b/modules/cloud-config-container/envoy-traffic-director/versions.tf index 375a96ff4..973b59cbc 100644 --- a/modules/cloud-config-container/envoy-traffic-director/versions.tf +++ b/modules/cloud-config-container/envoy-traffic-director/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-traffic-director:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-traffic-director:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-traffic-director:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-traffic-director:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/envoy-traffic-director/versions.tofu b/modules/cloud-config-container/envoy-traffic-director/versions.tofu index ee729fb08..5c2c2eeb4 100644 --- a/modules/cloud-config-container/envoy-traffic-director/versions.tofu +++ b/modules/cloud-config-container/envoy-traffic-director/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-traffic-director:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-traffic-director:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-traffic-director:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/envoy-traffic-director:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf index f2b858542..6c991d766 100644 --- a/modules/cloud-config-container/mysql/versions.tf +++ b/modules/cloud-config-container/mysql/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/mysql:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/mysql:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/mysql:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/mysql:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/mysql/versions.tofu b/modules/cloud-config-container/mysql/versions.tofu index a410e4454..53785be47 100644 --- a/modules/cloud-config-container/mysql/versions.tofu +++ b/modules/cloud-config-container/mysql/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/mysql:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/mysql:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/mysql:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/mysql:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/nginx-tls/versions.tf b/modules/cloud-config-container/nginx-tls/versions.tf index 0dc83366a..e30b21fa5 100644 --- a/modules/cloud-config-container/nginx-tls/versions.tf +++ b/modules/cloud-config-container/nginx-tls/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx-tls:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx-tls:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx-tls:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx-tls:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/nginx-tls/versions.tofu b/modules/cloud-config-container/nginx-tls/versions.tofu index 2e10d0ba7..1f54d0d12 100644 --- a/modules/cloud-config-container/nginx-tls/versions.tofu +++ b/modules/cloud-config-container/nginx-tls/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx-tls:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx-tls:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx-tls:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx-tls:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf index 05f7e94ea..b970097fc 100644 --- a/modules/cloud-config-container/nginx/versions.tf +++ b/modules/cloud-config-container/nginx/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/nginx/versions.tofu b/modules/cloud-config-container/nginx/versions.tofu index 316b8c981..e738e85f8 100644 --- a/modules/cloud-config-container/nginx/versions.tofu +++ b/modules/cloud-config-container/nginx/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/nginx:v49.2.0-tofu" } } diff --git a/modules/cloud-config-container/simple-nva/versions.tf b/modules/cloud-config-container/simple-nva/versions.tf index 2681af0ed..33b26975c 100644 --- a/modules/cloud-config-container/simple-nva/versions.tf +++ b/modules/cloud-config-container/simple-nva/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/simple-nva:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/simple-nva:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/simple-nva:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/simple-nva:v49.2.0-tf" } } diff --git a/modules/cloud-config-container/simple-nva/versions.tofu b/modules/cloud-config-container/simple-nva/versions.tofu index c36fd78a5..d8c0aced1 100644 --- a/modules/cloud-config-container/simple-nva/versions.tofu +++ b/modules/cloud-config-container/simple-nva/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/simple-nva:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/simple-nva:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/simple-nva:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-config-container/simple-nva:v49.2.0-tofu" } } diff --git a/modules/cloud-deploy/versions.tf b/modules/cloud-deploy/versions.tf index 7368006db..d58db31ad 100644 --- a/modules/cloud-deploy/versions.tf +++ b/modules/cloud-deploy/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-deploy:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-deploy:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-deploy:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-deploy:v49.2.0-tf" } } diff --git a/modules/cloud-deploy/versions.tofu b/modules/cloud-deploy/versions.tofu index 305d6ff3d..5d3d7af7e 100644 --- a/modules/cloud-deploy/versions.tofu +++ b/modules/cloud-deploy/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-deploy:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-deploy:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-deploy:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-deploy:v49.2.0-tofu" } } diff --git a/modules/cloud-function-v1/versions.tf b/modules/cloud-function-v1/versions.tf index 5751b8278..a75c05c2e 100644 --- a/modules/cloud-function-v1/versions.tf +++ b/modules/cloud-function-v1/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v1:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v1:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v1:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v1:v49.2.0-tf" } } diff --git a/modules/cloud-function-v1/versions.tofu b/modules/cloud-function-v1/versions.tofu index b5542634e..e12a7d6c1 100644 --- a/modules/cloud-function-v1/versions.tofu +++ b/modules/cloud-function-v1/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v1:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v1:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v1:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v1:v49.2.0-tofu" } } diff --git a/modules/cloud-function-v2/README.md b/modules/cloud-function-v2/README.md index c8b41cc05..f56990774 100644 --- a/modules/cloud-function-v2/README.md +++ b/modules/cloud-function-v2/README.md @@ -15,6 +15,7 @@ Cloud Function management, with support for IAM roles, optional bucket creation - [Multiple Cloud Functions within project](#multiple-cloud-functions-within-project) - [Mounting secrets from Secret Manager](#mounting-secrets-from-secret-manager) - [VPC Access Connector](#vpc-access-connector) + - [Direct VPC Egress](#direct-vpc-egress) - [Variables](#variables) - [Outputs](#outputs) - [Fixtures](#fixtures) @@ -405,6 +406,30 @@ module "cf_http" { } # tftest fixtures=fixtures/shared-vpc.tf inventory=service-vpc-access-connector-create-sharedvpc.yaml ``` + +### Direct VPC Egress + +You can also configure Direct VPC Egress instead of using a VPC Access Connector. + +```hcl +module "cf_http" { + source = "./fabric/modules/cloud-function-v2" + project_id = var.project_id + region = var.region + name = "direct-vpc-egress" + bucket_name = var.bucket + bundle_config = { + path = "assets/sample-function/" + } + direct_vpc_egress = { + network = var.vpc.self_link + subnetwork = var.subnet.self_link + tags = ["tag1", "tag2"] + mode = "VPC_EGRESS_ALL_TRAFFIC" + } +} +# tftest inventory=direct-vpc-egress.yaml +``` ## Variables @@ -412,27 +437,28 @@ 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#L167) | Name used for cloud function and associated resources. | string | ✓ | | -| [project_id](variables.tf#L182) | Project id used for all resources. | string | ✓ | | -| [region](variables.tf#L187) | Region used for all resources. | string | ✓ | | +| [name](variables.tf#L185) | Name used for cloud function and associated resources. | string | ✓ | | +| [project_id](variables.tf#L200) | Project id used for all resources. | string | ✓ | | +| [region](variables.tf#L205) | 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 | | [build_worker_pool](variables.tf#L45) | Build worker pool, in projects//locations//workerPools/ format. | string | | null | | [context](variables.tf#L84) | Context-specific interpolations. | object({…}) | | {} | | [description](variables.tf#L102) | Optional description. | string | | "Terraform managed." | -| [docker_repository_id](variables.tf#L108) | User managed repository created in Artifact Registry. | string | | null | -| [environment_variables](variables.tf#L114) | Cloud function environment variables. | map(string) | | {…} | -| [function_config](variables.tf#L122) | Cloud function configuration. Defaults to using main as entrypoint, 1 instance with 256MiB of memory, and 180 second timeout. | object({…}) | | {…} | -| [iam](variables.tf#L143) | IAM bindings for topic in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | -| [ingress_settings](variables.tf#L149) | 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#L155) | 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#L161) | Resource labels. | map(string) | | {} | -| [prefix](variables.tf#L172) | Optional prefix used for resource names. | string | | null | -| [secrets](variables.tf#L192) | Secret Manager secrets. Key is the variable name or mountpoint, volume versions are in version:path format. | map(object({…})) | | {} | +| [direct_vpc_egress](variables.tf#L108) | Direct VPC egress configuration. | object({…}) | | null | +| [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#L161) | IAM bindings for topic in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | +| [ingress_settings](variables.tf#L167) | 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#L173) | 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#L179) | Resource labels. | map(string) | | {} | +| [prefix](variables.tf#L190) | Optional prefix used for resource names. | string | | null | +| [secrets](variables.tf#L210) | 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#L204) | Function trigger configuration. Leave null for HTTP trigger. | object({…}) | | null | -| [vpc_connector](variables.tf#L222) | VPC connector configuration. Set create to 'true' if a new connector needs to be created. | object({…}) | | {} | +| [trigger_config](variables.tf#L222) | Function trigger configuration. Leave null for HTTP trigger. | object({…}) | | null | +| [vpc_connector](variables.tf#L240) | 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 e1273aecc..37ff45447 100644 --- a/modules/cloud-function-v2/main.tf +++ b/modules/cloud-function-v2/main.tf @@ -105,6 +105,22 @@ resource "google_cloudfunctions2_function" "function" { timeout_seconds = var.function_config.timeout_seconds vpc_connector = local.vpc_connector vpc_connector_egress_settings = var.vpc_connector.egress_settings + direct_vpc_egress = try(var.direct_vpc_egress.mode, null) + + dynamic "direct_vpc_network_interface" { + for_each = var.direct_vpc_egress == null ? [] : [""] + content { + network = lookup( + local.ctx.networks, var.direct_vpc_egress.network, + var.direct_vpc_egress.network + ) + subnetwork = lookup( + local.ctx.subnets, var.direct_vpc_egress.subnetwork, + var.direct_vpc_egress.subnetwork + ) + tags = var.direct_vpc_egress.tags + } + } dynamic "secret_environment_variables" { for_each = { for k, v in var.secrets : k => v if !v.is_volume } diff --git a/modules/cloud-function-v2/variables.tf b/modules/cloud-function-v2/variables.tf index d8a115e23..1ed7d86ae 100644 --- a/modules/cloud-function-v2/variables.tf +++ b/modules/cloud-function-v2/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -105,6 +105,24 @@ variable "description" { default = "Terraform managed." } +variable "direct_vpc_egress" { + description = "Direct VPC egress configuration." + type = object({ + mode = string + network = string + subnetwork = string + tags = optional(list(string)) + }) + default = null + validation { + condition = var.direct_vpc_egress == null || contains( + ["VPC_EGRESS_ALL_TRAFFIC", "VPC_EGRESS_PRIVATE_RANGES_ONLY"], + try(var.direct_vpc_egress.mode, "") + ) + error_message = "Direct VPC egress mode must be one of VPC_EGRESS_ALL_TRAFFIC, VPC_EGRESS_PRIVATE_RANGES_ONLY." + } +} + variable "docker_repository_id" { description = "User managed repository created in Artifact Registry." type = string diff --git a/modules/cloud-function-v2/versions.tf b/modules/cloud-function-v2/versions.tf index d16ea3392..ad5587fa1 100644 --- a/modules/cloud-function-v2/versions.tf +++ b/modules/cloud-function-v2/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v2:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v2:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v2:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v2:v49.2.0-tf" } } diff --git a/modules/cloud-function-v2/versions.tofu b/modules/cloud-function-v2/versions.tofu index 744c7e1ba..17570dda9 100644 --- a/modules/cloud-function-v2/versions.tofu +++ b/modules/cloud-function-v2/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v2:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v2:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v2:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-function-v2:v49.2.0-tofu" } } diff --git a/modules/cloud-identity-group/versions.tf b/modules/cloud-identity-group/versions.tf index deaad900e..1eb5acd59 100644 --- a/modules/cloud-identity-group/versions.tf +++ b/modules/cloud-identity-group/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-identity-group:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-identity-group:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-identity-group:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-identity-group:v49.2.0-tf" } } diff --git a/modules/cloud-identity-group/versions.tofu b/modules/cloud-identity-group/versions.tofu index 94192ca58..18e048b1f 100644 --- a/modules/cloud-identity-group/versions.tofu +++ b/modules/cloud-identity-group/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-identity-group:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-identity-group:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-identity-group:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-identity-group:v49.2.0-tofu" } } diff --git a/modules/cloud-run-v2/versions.tf b/modules/cloud-run-v2/versions.tf index 3f8ed0ad3..9f712fdb3 100644 --- a/modules/cloud-run-v2/versions.tf +++ b/modules/cloud-run-v2/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-run-v2:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-run-v2:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-run-v2:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-run-v2:v49.2.0-tf" } } diff --git a/modules/cloud-run-v2/versions.tofu b/modules/cloud-run-v2/versions.tofu index 3ecd2508d..2c39eb317 100644 --- a/modules/cloud-run-v2/versions.tofu +++ b/modules/cloud-run-v2/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-run-v2:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-run-v2:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-run-v2:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloud-run-v2:v49.2.0-tofu" } } diff --git a/modules/cloudsql-instance/versions.tf b/modules/cloudsql-instance/versions.tf index 66efdc4ea..d8daddb33 100644 --- a/modules/cloudsql-instance/versions.tf +++ b/modules/cloudsql-instance/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloudsql-instance:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloudsql-instance:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloudsql-instance:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloudsql-instance:v49.2.0-tf" } } diff --git a/modules/cloudsql-instance/versions.tofu b/modules/cloudsql-instance/versions.tofu index f7c275861..f40c2927b 100644 --- a/modules/cloudsql-instance/versions.tofu +++ b/modules/cloudsql-instance/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloudsql-instance:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloudsql-instance:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloudsql-instance:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/cloudsql-instance:v49.2.0-tofu" } } diff --git a/modules/compute-mig/versions.tf b/modules/compute-mig/versions.tf index 7bbb1442e..57aef1851 100644 --- a/modules/compute-mig/versions.tf +++ b/modules/compute-mig/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-mig:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-mig:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-mig:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-mig:v49.2.0-tf" } } diff --git a/modules/compute-mig/versions.tofu b/modules/compute-mig/versions.tofu index ae18ddf1b..339413f56 100644 --- a/modules/compute-mig/versions.tofu +++ b/modules/compute-mig/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-mig:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-mig:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-mig:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-mig:v49.2.0-tofu" } } diff --git a/modules/compute-vm/README.md b/modules/compute-vm/README.md index a28d69385..57de76849 100644 --- a/modules/compute-vm/README.md +++ b/modules/compute-vm/README.md @@ -323,7 +323,7 @@ resource "google_compute_storage_pool" "default" { pool_provisioned_iops = "10000" pool_provisioned_throughput = 1024 storage_pool_type = "hyperdisk-balanced" - zone = "${var.region}-b" + zone = "${var.region}-c" deletion_protection = false } @@ -331,7 +331,7 @@ resource "google_compute_storage_pool" "default" { module "vm-disk-options-example" { source = "./fabric/modules/compute-vm" project_id = var.project_id - zone = "${var.region}-b" + zone = "${var.region}-c" name = "test" instance_type = "c4d-standard-2" network_interfaces = [ @@ -392,7 +392,7 @@ For hyperdisks there are additional options available to configure performance. module "vm-arm" { source = "./fabric/modules/compute-vm" project_id = var.project_id - zone = "${var.region}-b" + zone = "${var.region}-c" name = "test" instance_type = "c4a-standard-1" network_interfaces = [{ diff --git a/modules/compute-vm/versions.tf b/modules/compute-vm/versions.tf index 0e9bf99f6..599fb0ba2 100644 --- a/modules/compute-vm/versions.tf +++ b/modules/compute-vm/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-vm:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-vm:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-vm:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-vm:v49.2.0-tf" } } diff --git a/modules/compute-vm/versions.tofu b/modules/compute-vm/versions.tofu index f4957f083..69ce3f06d 100644 --- a/modules/compute-vm/versions.tofu +++ b/modules/compute-vm/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-vm:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-vm:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-vm:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/compute-vm:v49.2.0-tofu" } } diff --git a/modules/container-registry/versions.tf b/modules/container-registry/versions.tf index b3c2f36cb..8806c9568 100644 --- a/modules/container-registry/versions.tf +++ b/modules/container-registry/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/container-registry:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/container-registry:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/container-registry:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/container-registry:v49.2.0-tf" } } diff --git a/modules/container-registry/versions.tofu b/modules/container-registry/versions.tofu index 3351b284e..f6a8496af 100644 --- a/modules/container-registry/versions.tofu +++ b/modules/container-registry/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/container-registry:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/container-registry:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/container-registry:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/container-registry:v49.2.0-tofu" } } diff --git a/modules/data-catalog-policy-tag/versions.tf b/modules/data-catalog-policy-tag/versions.tf index 64ebaf2db..d2e1db541 100644 --- a/modules/data-catalog-policy-tag/versions.tf +++ b/modules/data-catalog-policy-tag/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-policy-tag:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-policy-tag:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-policy-tag:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-policy-tag:v49.2.0-tf" } } diff --git a/modules/data-catalog-policy-tag/versions.tofu b/modules/data-catalog-policy-tag/versions.tofu index 3f787d486..9307a06ca 100644 --- a/modules/data-catalog-policy-tag/versions.tofu +++ b/modules/data-catalog-policy-tag/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-policy-tag:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-policy-tag:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-policy-tag:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-policy-tag:v49.2.0-tofu" } } diff --git a/modules/data-catalog-tag-template/versions.tf b/modules/data-catalog-tag-template/versions.tf index c4ddd1ad8..aac832573 100644 --- a/modules/data-catalog-tag-template/versions.tf +++ b/modules/data-catalog-tag-template/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag-template:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag-template:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag-template:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag-template:v49.2.0-tf" } } diff --git a/modules/data-catalog-tag-template/versions.tofu b/modules/data-catalog-tag-template/versions.tofu index 21173cb1f..eddf815b8 100644 --- a/modules/data-catalog-tag-template/versions.tofu +++ b/modules/data-catalog-tag-template/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag-template:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag-template:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag-template:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag-template:v49.2.0-tofu" } } diff --git a/modules/data-catalog-tag/versions.tf b/modules/data-catalog-tag/versions.tf index 3d2273897..724a3d145 100644 --- a/modules/data-catalog-tag/versions.tf +++ b/modules/data-catalog-tag/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag:v49.2.0-tf" } } diff --git a/modules/data-catalog-tag/versions.tofu b/modules/data-catalog-tag/versions.tofu index cf6b26739..9712059be 100644 --- a/modules/data-catalog-tag/versions.tofu +++ b/modules/data-catalog-tag/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/data-catalog-tag:v49.2.0-tofu" } } diff --git a/modules/dataform-repository/versions.tf b/modules/dataform-repository/versions.tf index 87739f5fd..70c2ad4e1 100644 --- a/modules/dataform-repository/versions.tf +++ b/modules/dataform-repository/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataform-repository:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataform-repository:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataform-repository:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataform-repository:v49.2.0-tf" } } diff --git a/modules/dataform-repository/versions.tofu b/modules/dataform-repository/versions.tofu index fb4cd681f..63ca3fcef 100644 --- a/modules/dataform-repository/versions.tofu +++ b/modules/dataform-repository/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataform-repository:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataform-repository:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataform-repository:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataform-repository:v49.2.0-tofu" } } diff --git a/modules/datafusion/versions.tf b/modules/datafusion/versions.tf index 5990e70f8..95dae055e 100644 --- a/modules/datafusion/versions.tf +++ b/modules/datafusion/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/datafusion:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/datafusion:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/datafusion:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/datafusion:v49.2.0-tf" } } diff --git a/modules/datafusion/versions.tofu b/modules/datafusion/versions.tofu index a5b910610..9078a7a78 100644 --- a/modules/datafusion/versions.tofu +++ b/modules/datafusion/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/datafusion:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/datafusion:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/datafusion:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/datafusion:v49.2.0-tofu" } } diff --git a/modules/dataplex-aspect-types/versions.tf b/modules/dataplex-aspect-types/versions.tf index cae07055c..2faf13fb1 100644 --- a/modules/dataplex-aspect-types/versions.tf +++ b/modules/dataplex-aspect-types/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-aspect-types:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-aspect-types:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-aspect-types:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-aspect-types:v49.2.0-tf" } } diff --git a/modules/dataplex-aspect-types/versions.tofu b/modules/dataplex-aspect-types/versions.tofu index 3393e123f..377d42a19 100644 --- a/modules/dataplex-aspect-types/versions.tofu +++ b/modules/dataplex-aspect-types/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-aspect-types:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-aspect-types:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-aspect-types:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-aspect-types:v49.2.0-tofu" } } diff --git a/modules/dataplex-datascan/versions.tf b/modules/dataplex-datascan/versions.tf index 961619b6b..d7633220b 100644 --- a/modules/dataplex-datascan/versions.tf +++ b/modules/dataplex-datascan/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-datascan:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-datascan:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-datascan:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-datascan:v49.2.0-tf" } } diff --git a/modules/dataplex-datascan/versions.tofu b/modules/dataplex-datascan/versions.tofu index 63b6ff6bc..1eeffaff9 100644 --- a/modules/dataplex-datascan/versions.tofu +++ b/modules/dataplex-datascan/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-datascan:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-datascan:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-datascan:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex-datascan:v49.2.0-tofu" } } diff --git a/modules/dataplex/versions.tf b/modules/dataplex/versions.tf index c7915f4e0..fa7192074 100644 --- a/modules/dataplex/versions.tf +++ b/modules/dataplex/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex:v49.2.0-tf" } } diff --git a/modules/dataplex/versions.tofu b/modules/dataplex/versions.tofu index 471329b15..b3583cf93 100644 --- a/modules/dataplex/versions.tofu +++ b/modules/dataplex/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataplex:v49.2.0-tofu" } } diff --git a/modules/dataproc/versions.tf b/modules/dataproc/versions.tf index 7d78c3ea1..379761b61 100644 --- a/modules/dataproc/versions.tf +++ b/modules/dataproc/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataproc:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataproc:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataproc:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataproc:v49.2.0-tf" } } diff --git a/modules/dataproc/versions.tofu b/modules/dataproc/versions.tofu index a3820955a..4962eb638 100644 --- a/modules/dataproc/versions.tofu +++ b/modules/dataproc/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataproc:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataproc:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataproc:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dataproc:v49.2.0-tofu" } } diff --git a/modules/dns-response-policy/versions.tf b/modules/dns-response-policy/versions.tf index 07a0d53c5..0a0864765 100644 --- a/modules/dns-response-policy/versions.tf +++ b/modules/dns-response-policy/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns-response-policy:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns-response-policy:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns-response-policy:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns-response-policy:v49.2.0-tf" } } diff --git a/modules/dns-response-policy/versions.tofu b/modules/dns-response-policy/versions.tofu index 42fac5f52..63aec7dd5 100644 --- a/modules/dns-response-policy/versions.tofu +++ b/modules/dns-response-policy/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns-response-policy:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns-response-policy:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns-response-policy:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns-response-policy:v49.2.0-tofu" } } diff --git a/modules/dns/README.md b/modules/dns/README.md index c1a68f4b2..c358709e0 100644 --- a/modules/dns/README.md +++ b/modules/dns/README.md @@ -190,14 +190,15 @@ module "public-dns" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [name](variables.tf#L47) | Zone name, must be unique within the project. | string | ✓ | | -| [project_id](variables.tf#L52) | Project id for the zone. | string | ✓ | | +| [name](variables.tf#L53) | Zone name, must be unique within the project. | string | ✓ | | +| [project_id](variables.tf#L58) | Project id for the zone. | string | ✓ | | | [context](variables.tf#L17) | Context-specific interpolations. | object({…}) | | {} | | [description](variables.tf#L29) | Domain description. | string | | "Terraform managed." | | [force_destroy](variables.tf#L35) | Set this to true to delete all records in the zone upon zone destruction. | bool | | null | | [iam](variables.tf#L41) | IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | null | -| [recordsets](variables.tf#L57) | Map of DNS recordsets in \"type name\" => {ttl, [records]} format. | map(object({…})) | | {} | -| [zone_config](variables.tf#L114) | DNS zone configuration. | object({…}) | | null | +| [labels](variables.tf#L47) | Labels to be assigned to the zone. | map(string) | | {} | +| [recordsets](variables.tf#L63) | Map of DNS recordsets in \"type name\" => {ttl, [records]} format. | map(object({…})) | | {} | +| [zone_config](variables.tf#L120) | DNS zone configuration. | object({…}) | | null | ## Outputs diff --git a/modules/dns/main.tf b/modules/dns/main.tf index b00997766..f17c72234 100644 --- a/modules/dns/main.tf +++ b/modules/dns/main.tf @@ -69,6 +69,7 @@ resource "google_dns_managed_zone" "dns_managed_zone" { dns_name = var.zone_config.domain description = var.description force_destroy = var.force_destroy + labels = var.labels visibility = local.visibility reverse_lookup = var.zone_config.private == null ? false : var.zone_config.private.reverse_managed diff --git a/modules/dns/variables.tf b/modules/dns/variables.tf index b80188608..4b08a9c1f 100644 --- a/modules/dns/variables.tf +++ b/modules/dns/variables.tf @@ -44,6 +44,12 @@ variable "iam" { default = null } +variable "labels" { + description = "Labels to be assigned to the zone." + type = map(string) + default = {} +} + variable "name" { description = "Zone name, must be unique within the project." type = string diff --git a/modules/dns/versions.tf b/modules/dns/versions.tf index 89b152923..7d96e841d 100644 --- a/modules/dns/versions.tf +++ b/modules/dns/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns:v49.2.0-tf" } } diff --git a/modules/dns/versions.tofu b/modules/dns/versions.tofu index 5d17817fb..70dca7d97 100644 --- a/modules/dns/versions.tofu +++ b/modules/dns/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/dns:v49.2.0-tofu" } } diff --git a/modules/endpoints/versions.tf b/modules/endpoints/versions.tf index e4f320527..248825257 100644 --- a/modules/endpoints/versions.tf +++ b/modules/endpoints/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/endpoints:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/endpoints:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/endpoints:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/endpoints:v49.2.0-tf" } } diff --git a/modules/endpoints/versions.tofu b/modules/endpoints/versions.tofu index 3390de855..f25bbc81a 100644 --- a/modules/endpoints/versions.tofu +++ b/modules/endpoints/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/endpoints:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/endpoints:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/endpoints:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/endpoints:v49.2.0-tofu" } } diff --git a/modules/firestore/versions.tf b/modules/firestore/versions.tf index aa143d14d..dc58eb321 100644 --- a/modules/firestore/versions.tf +++ b/modules/firestore/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/firestore:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/firestore:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/firestore:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/firestore:v49.2.0-tf" } } diff --git a/modules/firestore/versions.tofu b/modules/firestore/versions.tofu index 1789592fa..bc2cf8ded 100644 --- a/modules/firestore/versions.tofu +++ b/modules/firestore/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/firestore:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/firestore:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/firestore:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/firestore:v49.2.0-tofu" } } diff --git a/modules/folder/versions.tf b/modules/folder/versions.tf index b903656cd..e8416c317 100644 --- a/modules/folder/versions.tf +++ b/modules/folder/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/folder:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/folder:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/folder:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/folder:v49.2.0-tf" } } diff --git a/modules/folder/versions.tofu b/modules/folder/versions.tofu index 555432c23..51f22e1d1 100644 --- a/modules/folder/versions.tofu +++ b/modules/folder/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/folder:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/folder:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/folder:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/folder:v49.2.0-tofu" } } diff --git a/modules/gcs/versions.tf b/modules/gcs/versions.tf index 792847bbd..76097fc15 100644 --- a/modules/gcs/versions.tf +++ b/modules/gcs/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcs:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcs:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcs:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcs:v49.2.0-tf" } } diff --git a/modules/gcs/versions.tofu b/modules/gcs/versions.tofu index a46aa39cc..aee960c8b 100644 --- a/modules/gcs/versions.tofu +++ b/modules/gcs/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcs:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcs:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcs:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcs:v49.2.0-tofu" } } diff --git a/modules/gcve-private-cloud/versions.tf b/modules/gcve-private-cloud/versions.tf index 14cbc32e9..dbcc94738 100644 --- a/modules/gcve-private-cloud/versions.tf +++ b/modules/gcve-private-cloud/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcve-private-cloud:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcve-private-cloud:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcve-private-cloud:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcve-private-cloud:v49.2.0-tf" } } diff --git a/modules/gcve-private-cloud/versions.tofu b/modules/gcve-private-cloud/versions.tofu index 281d3f9a7..942217d3a 100644 --- a/modules/gcve-private-cloud/versions.tofu +++ b/modules/gcve-private-cloud/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcve-private-cloud:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcve-private-cloud:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcve-private-cloud:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gcve-private-cloud:v49.2.0-tofu" } } diff --git a/modules/gke-cluster-autopilot/README.md b/modules/gke-cluster-autopilot/README.md index 29098884c..788a8626c 100644 --- a/modules/gke-cluster-autopilot/README.md +++ b/modules/gke-cluster-autopilot/README.md @@ -10,6 +10,7 @@ This module offers a way to create and manage Google Kubernetes Engine (GKE) [Au - [Backup for GKE](#backup-for-gke) - [Allowing access from Google Cloud services](#allowing-access-from-google-cloud-services) - [Disable PSC endpoint creation](#disable-psc-endpoint-creation) +- [Upgrade notifications](#upgrade-notifications) - [Variables](#variables) - [Outputs](#outputs) @@ -263,31 +264,56 @@ module "cluster-1" { } # tftest modules=1 resources=1 inventory=no-ip-access.yaml ``` + +## Upgrade notifications + +Upgrade notifications are configured via the `enable_features.upgrade_notifications`. An existing PubSub topic can be defined via its `topic` attribute, or a new one can be created if the attribute is not set. The `event_types` attribute can be used to control which event types are sent. The `kms_key_name` attribute can be used to control which KMS key is used to encrypt the notification messages. + +```hcl +module "cluster-1" { + source = "./fabric/modules/gke-cluster-autopilot" + project_id = var.project_id + name = "cluster-1" + location = "europe-west1" + vpc_config = { + network = var.vpc.self_link + subnetwork = var.subnet.self_link + secondary_range_names = {} + } + enable_features = { + upgrade_notifications = { + event_types = ["SECURITY_BULLETIN_EVENT", "UPGRADE_EVENT"] + kms_key_name = "projects/myproject/locations/global/keyRings/mykeyring/cryptoKeys/mykey" + } + } +} +# tftest modules=1 resources=2 inventory=notifications.yaml +``` ## Variables | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [location](variables.tf#L172) | Autopilot clusters are always regional. | string | ✓ | | -| [name](variables.tf#L251) | Cluster name. | string | ✓ | | -| [project_id](variables.tf#L284) | Cluster project ID. | string | ✓ | | -| [vpc_config](variables.tf#L300) | VPC-level configuration. | object({…}) | ✓ | | +| [location](variables.tf#L180) | Autopilot clusters are always regional. | string | ✓ | | +| [name](variables.tf#L259) | Cluster name. | string | ✓ | | +| [project_id](variables.tf#L292) | Cluster project ID. | string | ✓ | | +| [vpc_config](variables.tf#L308) | VPC-level configuration. | object({…}) | ✓ | | | [access_config](variables.tf#L17) | Control plane endpoint and nodes access configurations. | object({…}) | | {} | | [backup_configs](variables.tf#L45) | Configuration for Backup for GKE. | object({…}) | | {} | | [deletion_protection](variables.tf#L67) | Whether or not to allow Terraform to destroy the cluster. Unless this field is set to false in Terraform state, a terraform destroy or terraform apply that would delete the cluster will fail. | bool | | true | | [description](variables.tf#L74) | Cluster description. | string | | null | | [enable_addons](variables.tf#L80) | Addons enabled in the cluster (true means enabled). | object({…}) | | {} | -| [enable_features](variables.tf#L94) | Enable cluster-level features. Certain features allow configuration. | object({…}) | | {} | -| [fleet_project](variables.tf#L154) | The name of the fleet host project where this cluster will be registered. | string | | null | -| [issue_client_certificate](variables.tf#L160) | Enable issuing client certificate. | bool | | false | -| [labels](variables.tf#L166) | Cluster resource labels. | map(string) | | null | -| [logging_config](variables.tf#L177) | Logging configuration. | object({…}) | | {} | -| [maintenance_config](variables.tf#L188) | Maintenance window configuration. | object({…}) | | {…} | -| [min_master_version](variables.tf#L211) | Minimum version of the master, defaults to the version of the most recent official release. | string | | null | -| [monitoring_config](variables.tf#L217) | Monitoring configuration. System metrics collection cannot be disabled. Control plane metrics are optional. Kube state metrics are optional. Google Cloud Managed Service for Prometheus is enabled by default. | object({…}) | | {} | -| [node_config](variables.tf#L256) | Configuration for nodes and nodepools. | object({…}) | | {} | -| [node_locations](variables.tf#L277) | Zones in which the cluster's nodes are located. | list(string) | | [] | -| [release_channel](variables.tf#L289) | Release channel for GKE upgrades. Clusters created in the Autopilot mode must use a release channel. Choose between \"RAPID\", \"REGULAR\", and \"STABLE\". | string | | "REGULAR" | +| [enable_features](variables.tf#L94) | Enable cluster-level features. Certain features allow configuration. | object({…}) | | {} | +| [fleet_project](variables.tf#L162) | The name of the fleet host project where this cluster will be registered. | string | | null | +| [issue_client_certificate](variables.tf#L168) | Enable issuing client certificate. | bool | | false | +| [labels](variables.tf#L174) | Cluster resource labels. | map(string) | | null | +| [logging_config](variables.tf#L185) | Logging configuration. | object({…}) | | {} | +| [maintenance_config](variables.tf#L196) | Maintenance window configuration. | object({…}) | | {…} | +| [min_master_version](variables.tf#L219) | Minimum version of the master, defaults to the version of the most recent official release. | string | | null | +| [monitoring_config](variables.tf#L225) | Monitoring configuration. System metrics collection cannot be disabled. Control plane metrics are optional. Kube state metrics are optional. Google Cloud Managed Service for Prometheus is enabled by default. | object({…}) | | {} | +| [node_config](variables.tf#L264) | Configuration for nodes and nodepools. | object({…}) | | {} | +| [node_locations](variables.tf#L285) | Zones in which the cluster's nodes are located. | list(string) | | [] | +| [release_channel](variables.tf#L297) | Release channel for GKE upgrades. Clusters created in the Autopilot mode must use a release channel. Choose between \"RAPID\", \"REGULAR\", and \"STABLE\". | string | | "REGULAR" | ## Outputs diff --git a/modules/gke-cluster-autopilot/main.tf b/modules/gke-cluster-autopilot/main.tf index 7c88fe180..1ec7ee9ae 100644 --- a/modules/gke-cluster-autopilot/main.tf +++ b/modules/gke-cluster-autopilot/main.tf @@ -343,6 +343,19 @@ resource "google_container_cluster" "cluster" { enabled = var.enable_features.secret_manager_config } } + dynamic "secret_sync_config" { + for_each = var.enable_features.secret_sync_config != null ? [""] : [] + content { + enabled = var.enable_features.secret_sync_config.enabled + dynamic "rotation_config" { + for_each = try(var.enable_features.secret_sync_config.rotation_config, null) != null ? [""] : [] + content { + enabled = var.enable_features.secret_sync_config.rotation_config.enabled + rotation_interval = var.enable_features.secret_sync_config.rotation_config.rotation_interval + } + } + } + } dynamic "security_posture_config" { for_each = var.enable_features.security_posture_config != null ? [""] : [] content { @@ -438,4 +451,5 @@ resource "google_pubsub_topic" "notifications" { labels = { content = "gke-notifications" } + kms_key_name = try(var.enable_features.upgrade_notifications.kms_key_name, null) } diff --git a/modules/gke-cluster-autopilot/variables.tf b/modules/gke-cluster-autopilot/variables.tf index 108bdf0e4..b3d41a9b3 100644 --- a/modules/gke-cluster-autopilot/variables.tf +++ b/modules/gke-cluster-autopilot/variables.tf @@ -117,6 +117,13 @@ variable "enable_features" { enable_insecure_binding_system_unauthenticated = optional(bool) enable_insecure_binding_system_authenticated = optional(bool) })) + secret_sync_config = optional(object({ + enabled = bool + rotation_config = optional(object({ + enabled = optional(bool) + rotation_interval = optional(string) + })) + })) secret_manager_config = optional(bool) security_posture_config = optional(object({ mode = string @@ -131,9 +138,10 @@ variable "enable_features" { service_external_ips = optional(bool, true) tpu = optional(bool, false) upgrade_notifications = optional(object({ - enabled = optional(bool, true) - event_types = optional(list(string), []) - topic_id = optional(string) + enabled = optional(bool, true) + event_types = optional(list(string), []) + topic_id = optional(string) + kms_key_name = optional(string) })) vertical_pod_autoscaling = optional(bool, false) enterprise_cluster = optional(bool) diff --git a/modules/gke-cluster-autopilot/versions.tf b/modules/gke-cluster-autopilot/versions.tf index c93c6e16f..46b1d0b99 100644 --- a/modules/gke-cluster-autopilot/versions.tf +++ b/modules/gke-cluster-autopilot/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-autopilot:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-autopilot:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-autopilot:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-autopilot:v49.2.0-tf" } } diff --git a/modules/gke-cluster-autopilot/versions.tofu b/modules/gke-cluster-autopilot/versions.tofu index 878781c8c..4747992f7 100644 --- a/modules/gke-cluster-autopilot/versions.tofu +++ b/modules/gke-cluster-autopilot/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-autopilot:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-autopilot:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-autopilot:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-autopilot:v49.2.0-tofu" } } diff --git a/modules/gke-cluster-standard/README.md b/modules/gke-cluster-standard/README.md index 49600d0b3..0e9516240 100644 --- a/modules/gke-cluster-standard/README.md +++ b/modules/gke-cluster-standard/README.md @@ -225,7 +225,7 @@ module "cluster-1" { ## Upgrade notifications -Upgrade notifications are configured via the `enable_features.upgrade_notifications`. An existing PubSub topic can be defined via its `topic` attribute, or a new one can be created if the attribute is not set. The `event_types` attribute can be used to control which event types are sent. +Upgrade notifications are configured via the `enable_features.upgrade_notifications`. An existing PubSub topic can be defined via its `topic` attribute, or a new one can be created if the attribute is not set. The `event_types` attribute can be used to control which event types are sent. The `kms_key_name` attribute can be used to control which KMS key is used to encrypt the notification messages. ```hcl module "cluster-1" { @@ -240,7 +240,8 @@ module "cluster-1" { } enable_features = { upgrade_notifications = { - event_types = ["SECURITY_BULLETIN_EVENT", "UPGRADE_EVENT"] + event_types = ["SECURITY_BULLETIN_EVENT", "UPGRADE_EVENT"] + kms_key_name = "projects/myproject/locations/global/keyRings/mykeyring/cryptoKeys/mykey" } } } @@ -510,10 +511,10 @@ module "cluster-1" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [location](variables.tf#L292) | Cluster zone or region. | string | ✓ | | -| [name](variables.tf#L407) | Cluster name. | string | ✓ | | -| [project_id](variables.tf#L459) | Cluster project id. | string | ✓ | | -| [vpc_config](variables.tf#L470) | VPC-level configuration. | object({…}) | ✓ | | +| [location](variables.tf#L300) | Cluster zone or region. | string | ✓ | | +| [name](variables.tf#L415) | Cluster name. | string | ✓ | | +| [project_id](variables.tf#L467) | Cluster project id. | string | ✓ | | +| [vpc_config](variables.tf#L478) | VPC-level configuration. | object({…}) | ✓ | | | [access_config](variables.tf#L17) | Control plane endpoint and nodes access configurations. | object({…}) | | {} | | [backup_configs](variables.tf#L45) | Configuration for Backup for GKE. | object({…}) | | {} | | [cluster_autoscaling](variables.tf#L68) | Enable and configure limits for Node Auto-Provisioning with Cluster Autoscaler. | object({…}) | | null | @@ -521,19 +522,19 @@ module "cluster-1" { | [deletion_protection](variables.tf#L166) | Whether or not to allow Terraform to destroy the cluster. Unless this field is set to false in Terraform state, a terraform destroy or terraform apply that would delete the cluster will fail. | bool | | true | | [description](variables.tf#L173) | Cluster description. | string | | null | | [enable_addons](variables.tf#L179) | Addons enabled in the cluster (true means enabled). | object({…}) | | {} | -| [enable_features](variables.tf#L201) | Enable cluster-level features. Certain features allow configuration. | object({…}) | | {} | -| [fleet_project](variables.tf#L273) | The name of the fleet host project where this cluster will be registered. | string | | null | -| [issue_client_certificate](variables.tf#L279) | Enable issuing client certificate. | bool | | false | -| [labels](variables.tf#L285) | Cluster resource labels. | map(string) | | {} | -| [logging_config](variables.tf#L297) | Logging configuration. | object({…}) | | {} | -| [maintenance_config](variables.tf#L318) | Maintenance window configuration. | object({…}) | | {…} | -| [max_pods_per_node](variables.tf#L341) | Maximum number of pods per node in this cluster. | number | | 110 | -| [min_master_version](variables.tf#L347) | Minimum version of the master, defaults to the version of the most recent official release. | string | | null | -| [monitoring_config](variables.tf#L353) | Monitoring configuration. Google Cloud Managed Service for Prometheus is enabled by default. | object({…}) | | {} | -| [node_config](variables.tf#L412) | Node-level configuration. | object({…}) | | {} | -| [node_locations](variables.tf#L435) | Zones in which the cluster's nodes are located. | list(string) | | [] | -| [node_pool_auto_config](variables.tf#L442) | Node pool configs that apply to auto-provisioned node pools in autopilot clusters and node auto-provisioning-enabled clusters. | object({…}) | | {} | -| [release_channel](variables.tf#L464) | Release channel for GKE upgrades. | string | | null | +| [enable_features](variables.tf#L201) | Enable cluster-level features. Certain features allow configuration. | object({…}) | | {} | +| [fleet_project](variables.tf#L281) | The name of the fleet host project where this cluster will be registered. | string | | null | +| [issue_client_certificate](variables.tf#L287) | Enable issuing client certificate. | bool | | false | +| [labels](variables.tf#L293) | Cluster resource labels. | map(string) | | {} | +| [logging_config](variables.tf#L305) | Logging configuration. | object({…}) | | {} | +| [maintenance_config](variables.tf#L326) | Maintenance window configuration. | object({…}) | | {…} | +| [max_pods_per_node](variables.tf#L349) | Maximum number of pods per node in this cluster. | number | | 110 | +| [min_master_version](variables.tf#L355) | Minimum version of the master, defaults to the version of the most recent official release. | string | | null | +| [monitoring_config](variables.tf#L361) | Monitoring configuration. Google Cloud Managed Service for Prometheus is enabled by default. | object({…}) | | {} | +| [node_config](variables.tf#L420) | Node-level configuration. | object({…}) | | {} | +| [node_locations](variables.tf#L443) | Zones in which the cluster's nodes are located. | list(string) | | [] | +| [node_pool_auto_config](variables.tf#L450) | Node pool configs that apply to auto-provisioned node pools in autopilot clusters and node auto-provisioning-enabled clusters. | object({…}) | | {} | +| [release_channel](variables.tf#L472) | Release channel for GKE upgrades. | string | | null | ## Outputs diff --git a/modules/gke-cluster-standard/main.tf b/modules/gke-cluster-standard/main.tf index 35800b993..edc7f44d0 100644 --- a/modules/gke-cluster-standard/main.tf +++ b/modules/gke-cluster-standard/main.tf @@ -561,6 +561,19 @@ resource "google_container_cluster" "cluster" { enabled = var.enable_features.secret_manager_config } } + dynamic "secret_sync_config" { + for_each = var.enable_features.secret_sync_config != null ? [""] : [] + content { + enabled = var.enable_features.secret_sync_config.enabled + dynamic "rotation_config" { + for_each = try(var.enable_features.secret_sync_config.rotation_config, null) != null ? [""] : [] + content { + enabled = var.enable_features.secret_sync_config.rotation_config.enabled + rotation_interval = var.enable_features.secret_sync_config.rotation_config.rotation_interval + } + } + } + } dynamic "security_posture_config" { for_each = var.enable_features.security_posture_config != null ? [""] : [] content { @@ -689,4 +702,5 @@ resource "google_pubsub_topic" "notifications" { labels = { content = "gke-notifications" } + kms_key_name = try(var.enable_features.upgrade_notifications.kms_key_name, null) } diff --git a/modules/gke-cluster-standard/variables.tf b/modules/gke-cluster-standard/variables.tf index 7d41db0f9..0f80701be 100644 --- a/modules/gke-cluster-standard/variables.tf +++ b/modules/gke-cluster-standard/variables.tf @@ -230,6 +230,13 @@ variable "enable_features" { enable_insecure_binding_system_authenticated = optional(bool) })) secret_manager_config = optional(bool) + secret_sync_config = optional(object({ + enabled = bool + rotation_config = optional(object({ + enabled = optional(bool) + rotation_interval = optional(string) + })) + })) security_posture_config = optional(object({ mode = string vulnerability_mode = string @@ -243,9 +250,10 @@ variable "enable_features" { shielded_nodes = optional(bool, false) tpu = optional(bool, false) upgrade_notifications = optional(object({ - enabled = optional(bool, true) - event_types = optional(list(string), []) - topic_id = optional(string) + enabled = optional(bool, true) + event_types = optional(list(string), []) + topic_id = optional(string) + kms_key_name = optional(string) })) vertical_pod_autoscaling = optional(bool, false) workload_identity = optional(bool, true) diff --git a/modules/gke-cluster-standard/versions.tf b/modules/gke-cluster-standard/versions.tf index f670f6e9e..383df79a1 100644 --- a/modules/gke-cluster-standard/versions.tf +++ b/modules/gke-cluster-standard/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-standard:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-standard:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-standard:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-standard:v49.2.0-tf" } } diff --git a/modules/gke-cluster-standard/versions.tofu b/modules/gke-cluster-standard/versions.tofu index ae9cd075a..88810227c 100644 --- a/modules/gke-cluster-standard/versions.tofu +++ b/modules/gke-cluster-standard/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-standard:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-standard:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-standard:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-cluster-standard:v49.2.0-tofu" } } diff --git a/modules/gke-hub/versions.tf b/modules/gke-hub/versions.tf index f3c4d925b..9c9ba9832 100644 --- a/modules/gke-hub/versions.tf +++ b/modules/gke-hub/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-hub:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-hub:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-hub:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-hub:v49.2.0-tf" } } diff --git a/modules/gke-hub/versions.tofu b/modules/gke-hub/versions.tofu index 5ab424220..553586417 100644 --- a/modules/gke-hub/versions.tofu +++ b/modules/gke-hub/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-hub:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-hub:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-hub:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-hub:v49.2.0-tofu" } } diff --git a/modules/gke-nodepool/versions.tf b/modules/gke-nodepool/versions.tf index ddad02e3d..a90f48ec8 100644 --- a/modules/gke-nodepool/versions.tf +++ b/modules/gke-nodepool/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-nodepool:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-nodepool:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-nodepool:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-nodepool:v49.2.0-tf" } } diff --git a/modules/gke-nodepool/versions.tofu b/modules/gke-nodepool/versions.tofu index d1e31fa3d..9b6462a3c 100644 --- a/modules/gke-nodepool/versions.tofu +++ b/modules/gke-nodepool/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-nodepool:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-nodepool:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-nodepool:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/gke-nodepool:v49.2.0-tofu" } } diff --git a/modules/iam-service-account/versions.tf b/modules/iam-service-account/versions.tf index 0f6782314..e405af3a5 100644 --- a/modules/iam-service-account/versions.tf +++ b/modules/iam-service-account/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/iam-service-account:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/iam-service-account:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/iam-service-account:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/iam-service-account:v49.2.0-tf" } } diff --git a/modules/iam-service-account/versions.tofu b/modules/iam-service-account/versions.tofu index 128b75aa4..97af5b859 100644 --- a/modules/iam-service-account/versions.tofu +++ b/modules/iam-service-account/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/iam-service-account:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/iam-service-account:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/iam-service-account:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/iam-service-account:v49.2.0-tofu" } } diff --git a/modules/kms/versions.tf b/modules/kms/versions.tf index 2e99622d5..5ecc598ee 100644 --- a/modules/kms/versions.tf +++ b/modules/kms/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/kms:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/kms:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/kms:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/kms:v49.2.0-tf" } } diff --git a/modules/kms/versions.tofu b/modules/kms/versions.tofu index 7994744dc..dc186fd41 100644 --- a/modules/kms/versions.tofu +++ b/modules/kms/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/kms:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/kms:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/kms:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/kms:v49.2.0-tofu" } } diff --git a/modules/logging-bucket/README.md b/modules/logging-bucket/README.md index 6eb5bf579..c8ad5d8d2 100644 --- a/modules/logging-bucket/README.md +++ b/modules/logging-bucket/README.md @@ -118,17 +118,17 @@ module "bucket" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [name](variables.tf#L60) | Name of the logging bucket. | string | ✓ | | -| [parent](variables.tf#L65) | ID of the parent resource containing the bucket in the format 'project_id' 'folders/folder_id', 'organizations/organization_id' or 'billing_account_id'. | string | ✓ | | -| [context](variables.tf#L17) | Context-specific interpolations. | object({…}) | | {} | -| [description](variables.tf#L31) | Human-readable description for the logging bucket. | string | | null | -| [kms_key_name](variables.tf#L37) | To enable CMEK for a project logging bucket, set this field to a valid name. The associated service account requires cloudkms.cryptoKeyEncrypterDecrypter roles assigned for the key. | string | | null | -| [location](variables.tf#L43) | Location of the bucket. | string | | "global" | -| [log_analytics](variables.tf#L49) | Enable and configure Analytics Log. | object({…}) | | {} | -| [parent_type](variables.tf#L73) | Parent object type for the bucket (project, folder, organization, billing_account). | string | | "project" | -| [retention](variables.tf#L80) | Retention time in days for the logging bucket. | number | | 30 | -| [tag_bindings](variables.tf#L86) | Tag bindings for this bucket, in key => tag value id format. | map(string) | | {} | -| [views](variables.tf#L93) | Log views for this bucket. | map(object({…})) | | {} | +| [name](variables.tf#L61) | Name of the logging bucket. | string | ✓ | | +| [parent](variables.tf#L66) | ID of the parent resource containing the bucket in the format 'project_id' 'folders/folder_id', 'organizations/organization_id' or 'billing_account_id'. | string | ✓ | | +| [context](variables.tf#L17) | Context-specific interpolations. | object({…}) | | {} | +| [description](variables.tf#L32) | Human-readable description for the logging bucket. | string | | null | +| [kms_key_name](variables.tf#L38) | To enable CMEK for a project logging bucket, set this field to a valid name. The associated service account requires cloudkms.cryptoKeyEncrypterDecrypter roles assigned for the key. | string | | null | +| [location](variables.tf#L44) | Location of the bucket. | string | | "global" | +| [log_analytics](variables.tf#L50) | Enable and configure Analytics Log. | object({…}) | | {} | +| [parent_type](variables.tf#L74) | Parent object type for the bucket (project, folder, organization, billing_account). | string | | "project" | +| [retention](variables.tf#L81) | Retention time in days for the logging bucket. | number | | 30 | +| [tag_bindings](variables.tf#L87) | Tag bindings for this bucket, in key => tag value id format. | map(string) | | {} | +| [views](variables.tf#L94) | Log views for this bucket. | map(object({…})) | | {} | ## Outputs diff --git a/modules/logging-bucket/main.tf b/modules/logging-bucket/main.tf index 65178511c..c5f2bca6c 100644 --- a/modules/logging-bucket/main.tf +++ b/modules/logging-bucket/main.tf @@ -42,6 +42,7 @@ locals { } } + resource "google_logging_project_bucket_config" "bucket" { count = var.parent_type == "project" ? 1 : 0 project = local.parent_id @@ -53,7 +54,7 @@ resource "google_logging_project_bucket_config" "bucket" { dynamic "cmek_settings" { for_each = var.kms_key_name == null ? [] : [""] content { - kms_key_name = var.kms_key_name + kms_key_name = lookup(local.ctx.kms_keys, var.kms_key_name, var.kms_key_name) } } } diff --git a/modules/logging-bucket/variables.tf b/modules/logging-bucket/variables.tf index 644412c95..c5938c818 100644 --- a/modules/logging-bucket/variables.tf +++ b/modules/logging-bucket/variables.tf @@ -20,6 +20,7 @@ variable "context" { custom_roles = optional(map(string), {}) folder_ids = optional(map(string), {}) iam_principals = optional(map(string), {}) + kms_keys = optional(map(string), {}) locations = optional(map(string), {}) project_ids = optional(map(string), {}) tag_values = optional(map(string), {}) diff --git a/modules/logging-bucket/versions.tf b/modules/logging-bucket/versions.tf index 8976372b1..f61ae0422 100644 --- a/modules/logging-bucket/versions.tf +++ b/modules/logging-bucket/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/logging-bucket:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/logging-bucket:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/logging-bucket:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/logging-bucket:v49.2.0-tf" } } diff --git a/modules/logging-bucket/versions.tofu b/modules/logging-bucket/versions.tofu index 51a909609..e3a8a478b 100644 --- a/modules/logging-bucket/versions.tofu +++ b/modules/logging-bucket/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/logging-bucket:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/logging-bucket:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/logging-bucket:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/logging-bucket:v49.2.0-tofu" } } diff --git a/modules/looker-core/versions.tf b/modules/looker-core/versions.tf index daa7ef2c1..873430428 100644 --- a/modules/looker-core/versions.tf +++ b/modules/looker-core/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/looker-core:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/looker-core:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/looker-core:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/looker-core:v49.2.0-tf" } } diff --git a/modules/looker-core/versions.tofu b/modules/looker-core/versions.tofu index 7340cce65..ab5f89366 100644 --- a/modules/looker-core/versions.tofu +++ b/modules/looker-core/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/looker-core:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/looker-core:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/looker-core:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/looker-core:v49.2.0-tofu" } } diff --git a/modules/managed-kafka/versions.tf b/modules/managed-kafka/versions.tf index 3dd5a28a8..12a9766f8 100644 --- a/modules/managed-kafka/versions.tf +++ b/modules/managed-kafka/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/managed-kafka:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/managed-kafka:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/managed-kafka:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/managed-kafka:v49.2.0-tf" } } diff --git a/modules/managed-kafka/versions.tofu b/modules/managed-kafka/versions.tofu index 846bb974f..acf24c268 100644 --- a/modules/managed-kafka/versions.tofu +++ b/modules/managed-kafka/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/managed-kafka:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/managed-kafka:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/managed-kafka:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/managed-kafka:v49.2.0-tofu" } } diff --git a/modules/ncc-spoke-ra/versions.tf b/modules/ncc-spoke-ra/versions.tf index 47465020f..c5a16d752 100644 --- a/modules/ncc-spoke-ra/versions.tf +++ b/modules/ncc-spoke-ra/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/ncc-spoke-ra:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/ncc-spoke-ra:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/ncc-spoke-ra:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/ncc-spoke-ra:v49.2.0-tf" } } diff --git a/modules/ncc-spoke-ra/versions.tofu b/modules/ncc-spoke-ra/versions.tofu index 6b2e79f02..5fc0d5940 100644 --- a/modules/ncc-spoke-ra/versions.tofu +++ b/modules/ncc-spoke-ra/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/ncc-spoke-ra:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/ncc-spoke-ra:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/ncc-spoke-ra:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/ncc-spoke-ra:v49.2.0-tofu" } } diff --git a/modules/net-address/README.md b/modules/net-address/README.md index 6de24e55e..9bd21af4c 100644 --- a/modules/net-address/README.md +++ b/modules/net-address/README.md @@ -250,7 +250,7 @@ module "addresses" { | [network_attachment_ids](outputs.tf#L49) | IDs of network attachments. | | | [psa_addresses](outputs.tf#L57) | Allocated internal addresses for PSA endpoints. | | | [psc](outputs.tf#L65) | Allocated resources for PSC endpoints. | | -| [psc_addresses](outputs.tf#L99) | Allocated internal addresses for PSC endpoints. | | +| [psc_addresses](outputs.tf#L101) | Allocated internal addresses for PSC endpoints. | | ## Fixtures diff --git a/modules/net-address/outputs.tf b/modules/net-address/outputs.tf index 5e117ff62..abca88674 100644 --- a/modules/net-address/outputs.tf +++ b/modules/net-address/outputs.tf @@ -74,8 +74,9 @@ output "psc" { name = google_compute_global_address.psc[k].name } forwarding_rule = { - id = try(google_compute_global_forwarding_rule.psc_consumer[k].id, null) - name = try(google_compute_global_forwarding_rule.psc_consumer[k].name, null) + id = try(google_compute_global_forwarding_rule.psc_consumer[k].id, null) + name = try(google_compute_global_forwarding_rule.psc_consumer[k].name, null) + psc_connection_id = try(google_compute_global_forwarding_rule.psc_consumer[k].psc_connection_id, null) } } }, @@ -88,8 +89,9 @@ output "psc" { name = google_compute_address.psc[k].name } forwarding_rule = { - id = try(google_compute_forwarding_rule.psc_consumer[k].id, null) - name = try(google_compute_forwarding_rule.psc_consumer[k].name, null) + id = try(google_compute_forwarding_rule.psc_consumer[k].id, null) + name = try(google_compute_forwarding_rule.psc_consumer[k].name, null) + psc_connection_id = try(google_compute_global_forwarding_rule.psc_consumer[k].psc_connection_id, null) } } } diff --git a/modules/net-address/versions.tf b/modules/net-address/versions.tf index 240d90805..dd1c470d7 100644 --- a/modules/net-address/versions.tf +++ b/modules/net-address/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-address:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-address:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-address:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-address:v49.2.0-tf" } } diff --git a/modules/net-address/versions.tofu b/modules/net-address/versions.tofu index 7f01d0c10..d127e3fdc 100644 --- a/modules/net-address/versions.tofu +++ b/modules/net-address/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-address:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-address:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-address:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-address:v49.2.0-tofu" } } diff --git a/modules/net-cloudnat/versions.tf b/modules/net-cloudnat/versions.tf index 305cfa53f..9caed1cbc 100644 --- a/modules/net-cloudnat/versions.tf +++ b/modules/net-cloudnat/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-cloudnat:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-cloudnat:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-cloudnat:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-cloudnat:v49.2.0-tf" } } diff --git a/modules/net-cloudnat/versions.tofu b/modules/net-cloudnat/versions.tofu index 8b7d99f5e..4104c1ba6 100644 --- a/modules/net-cloudnat/versions.tofu +++ b/modules/net-cloudnat/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-cloudnat:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-cloudnat:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-cloudnat:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-cloudnat:v49.2.0-tofu" } } diff --git a/modules/net-firewall-policy/versions.tf b/modules/net-firewall-policy/versions.tf index 749419702..5110936f6 100644 --- a/modules/net-firewall-policy/versions.tf +++ b/modules/net-firewall-policy/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-firewall-policy:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-firewall-policy:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-firewall-policy:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-firewall-policy:v49.2.0-tf" } } diff --git a/modules/net-firewall-policy/versions.tofu b/modules/net-firewall-policy/versions.tofu index 00c7c3289..e62b80a08 100644 --- a/modules/net-firewall-policy/versions.tofu +++ b/modules/net-firewall-policy/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-firewall-policy:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-firewall-policy:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-firewall-policy:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-firewall-policy:v49.2.0-tofu" } } diff --git a/modules/net-ipsec-over-interconnect/versions.tf b/modules/net-ipsec-over-interconnect/versions.tf index 01266a5ec..859e28218 100644 --- a/modules/net-ipsec-over-interconnect/versions.tf +++ b/modules/net-ipsec-over-interconnect/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-ipsec-over-interconnect:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-ipsec-over-interconnect:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-ipsec-over-interconnect:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-ipsec-over-interconnect:v49.2.0-tf" } } diff --git a/modules/net-ipsec-over-interconnect/versions.tofu b/modules/net-ipsec-over-interconnect/versions.tofu index 49418e2b0..53cad89d3 100644 --- a/modules/net-ipsec-over-interconnect/versions.tofu +++ b/modules/net-ipsec-over-interconnect/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-ipsec-over-interconnect:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-ipsec-over-interconnect:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-ipsec-over-interconnect:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-ipsec-over-interconnect:v49.2.0-tofu" } } diff --git a/modules/net-lb-app-ext-regional/backend-service.tf b/modules/net-lb-app-ext-regional/backend-service.tf index b40258bdf..f002a39d6 100644 --- a/modules/net-lb-app-ext-regional/backend-service.tf +++ b/modules/net-lb-app-ext-regional/backend-service.tf @@ -197,9 +197,9 @@ resource "google_compute_region_backend_service" "default" { for_each = each.value.iap_config == null ? [] : [each.value.iap_config] content { enabled = true - oauth2_client_id = iap.value.oauth2_client_id - oauth2_client_secret = iap.value.oauth2_client_secret - oauth2_client_secret_sha256 = iap.value.oauth2_client_secret_sha256 + oauth2_client_id = try(iap.value.oauth2_client_id, null) + oauth2_client_secret = try(iap.value.oauth2_client_secret, null) + oauth2_client_secret_sha256 = try(iap.value.oauth2_client_secret_sha256, null) } } diff --git a/modules/net-lb-app-ext-regional/versions.tf b/modules/net-lb-app-ext-regional/versions.tf index fd30b2016..9527ff599 100644 --- a/modules/net-lb-app-ext-regional/versions.tf +++ b/modules/net-lb-app-ext-regional/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext-regional:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext-regional:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext-regional:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext-regional:v49.2.0-tf" } } diff --git a/modules/net-lb-app-ext-regional/versions.tofu b/modules/net-lb-app-ext-regional/versions.tofu index c66a10667..8523f2cfe 100644 --- a/modules/net-lb-app-ext-regional/versions.tofu +++ b/modules/net-lb-app-ext-regional/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext-regional:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext-regional:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext-regional:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext-regional:v49.2.0-tofu" } } diff --git a/modules/net-lb-app-ext/backend-service.tf b/modules/net-lb-app-ext/backend-service.tf index 9854e4925..ec9cfabbe 100644 --- a/modules/net-lb-app-ext/backend-service.tf +++ b/modules/net-lb-app-ext/backend-service.tf @@ -202,9 +202,9 @@ resource "google_compute_backend_service" "default" { for_each = each.value.iap_config == null ? [] : [each.value.iap_config] content { enabled = true - oauth2_client_id = iap.value.oauth2_client_id - oauth2_client_secret = iap.value.oauth2_client_secret - oauth2_client_secret_sha256 = iap.value.oauth2_client_secret_sha256 + oauth2_client_id = try(iap.value.oauth2_client_id, null) + oauth2_client_secret = try(iap.value.oauth2_client_secret, null) + oauth2_client_secret_sha256 = try(iap.value.oauth2_client_secret_sha256, null) } } diff --git a/modules/net-lb-app-ext/versions.tf b/modules/net-lb-app-ext/versions.tf index 4c9928e03..dbf86d050 100644 --- a/modules/net-lb-app-ext/versions.tf +++ b/modules/net-lb-app-ext/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext:v49.2.0-tf" } } diff --git a/modules/net-lb-app-ext/versions.tofu b/modules/net-lb-app-ext/versions.tofu index e93eaefe9..ba1fd3b80 100644 --- a/modules/net-lb-app-ext/versions.tofu +++ b/modules/net-lb-app-ext/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-ext:v49.2.0-tofu" } } diff --git a/modules/net-lb-app-int-cross-region/backend-service.tf b/modules/net-lb-app-int-cross-region/backend-service.tf index f72fb3918..200971fd7 100644 --- a/modules/net-lb-app-int-cross-region/backend-service.tf +++ b/modules/net-lb-app-int-cross-region/backend-service.tf @@ -143,9 +143,9 @@ resource "google_compute_backend_service" "default" { for_each = each.value.iap_config == null ? [] : [each.value.iap_config] content { enabled = true - oauth2_client_id = iap.value.oauth2_client_id - oauth2_client_secret = iap.value.oauth2_client_secret - oauth2_client_secret_sha256 = iap.value.oauth2_client_secret_sha256 + oauth2_client_id = try(iap.value.oauth2_client_id, null) + oauth2_client_secret = try(iap.value.oauth2_client_secret, null) + oauth2_client_secret_sha256 = try(iap.value.oauth2_client_secret_sha256, null) } } diff --git a/modules/net-lb-app-int-cross-region/versions.tf b/modules/net-lb-app-int-cross-region/versions.tf index 656ca37a6..815de7330 100644 --- a/modules/net-lb-app-int-cross-region/versions.tf +++ b/modules/net-lb-app-int-cross-region/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int-cross-region:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int-cross-region:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int-cross-region:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int-cross-region:v49.2.0-tf" } } diff --git a/modules/net-lb-app-int-cross-region/versions.tofu b/modules/net-lb-app-int-cross-region/versions.tofu index ca8240002..64fbafd9a 100644 --- a/modules/net-lb-app-int-cross-region/versions.tofu +++ b/modules/net-lb-app-int-cross-region/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int-cross-region:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int-cross-region:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int-cross-region:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int-cross-region:v49.2.0-tofu" } } diff --git a/modules/net-lb-app-int/backend-service.tf b/modules/net-lb-app-int/backend-service.tf index 95072ba33..58864adaf 100644 --- a/modules/net-lb-app-int/backend-service.tf +++ b/modules/net-lb-app-int/backend-service.tf @@ -164,9 +164,9 @@ resource "google_compute_region_backend_service" "default" { for_each = each.value.iap_config == null ? [] : [each.value.iap_config] content { enabled = true - oauth2_client_id = iap.value.oauth2_client_id - oauth2_client_secret = iap.value.oauth2_client_secret - oauth2_client_secret_sha256 = iap.value.oauth2_client_secret_sha256 + oauth2_client_id = try(iap.value.oauth2_client_id, null) + oauth2_client_secret = try(iap.value.oauth2_client_secret, null) + oauth2_client_secret_sha256 = try(iap.value.oauth2_client_secret_sha256, null) } } diff --git a/modules/net-lb-app-int/versions.tf b/modules/net-lb-app-int/versions.tf index b151cb0db..638b4cf6e 100644 --- a/modules/net-lb-app-int/versions.tf +++ b/modules/net-lb-app-int/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int:v49.2.0-tf" } } diff --git a/modules/net-lb-app-int/versions.tofu b/modules/net-lb-app-int/versions.tofu index 33405d3a8..b257fd2a2 100644 --- a/modules/net-lb-app-int/versions.tofu +++ b/modules/net-lb-app-int/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-app-int:v49.2.0-tofu" } } diff --git a/modules/net-lb-ext/health-check.tf b/modules/net-lb-ext/health-check.tf index 250058056..cc03d96c3 100644 --- a/modules/net-lb-ext/health-check.tf +++ b/modules/net-lb-ext/health-check.tf @@ -66,13 +66,13 @@ resource "google_compute_region_health_check" "default" { dynamic "http2_health_check" { for_each = local.hc_http2 ? [""] : [] content { - host = local.hc.http.host - port = local.hc.http.port - port_name = local.hc.http.port_name - port_specification = local.hc.http.port_specification - proxy_header = local.hc.http.proxy_header - request_path = local.hc.http.request_path - response = local.hc.http.response + host = local.hc.http2.host + port = local.hc.http2.port + port_name = local.hc.http2.port_name + port_specification = local.hc.http2.port_specification + proxy_header = local.hc.http2.proxy_header + request_path = local.hc.http2.request_path + response = local.hc.http2.response } } @@ -92,12 +92,12 @@ resource "google_compute_region_health_check" "default" { dynamic "ssl_health_check" { for_each = local.hc_ssl ? [""] : [] content { - port = local.hc.tcp.port - port_name = local.hc.tcp.port_name - port_specification = local.hc.tcp.port_specification - proxy_header = local.hc.tcp.proxy_header - request = local.hc.tcp.request - response = local.hc.tcp.response + port = local.hc.ssl.port + port_name = local.hc.ssl.port_name + port_specification = local.hc.ssl.port_specification + proxy_header = local.hc.ssl.proxy_header + request = local.hc.ssl.request + response = local.hc.ssl.response } } diff --git a/modules/net-lb-ext/versions.tf b/modules/net-lb-ext/versions.tf index fcc1f2690..c0f4e3b94 100644 --- a/modules/net-lb-ext/versions.tf +++ b/modules/net-lb-ext/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-ext:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-ext:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-ext:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-ext:v49.2.0-tf" } } diff --git a/modules/net-lb-ext/versions.tofu b/modules/net-lb-ext/versions.tofu index 90b7a25cc..94b30c03d 100644 --- a/modules/net-lb-ext/versions.tofu +++ b/modules/net-lb-ext/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-ext:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-ext:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-ext:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-ext:v49.2.0-tofu" } } diff --git a/modules/net-lb-int/health-check.tf b/modules/net-lb-int/health-check.tf index 18bc4ccac..063c86824 100644 --- a/modules/net-lb-int/health-check.tf +++ b/modules/net-lb-int/health-check.tf @@ -65,13 +65,13 @@ resource "google_compute_health_check" "default" { dynamic "http2_health_check" { for_each = local.hc_http2 ? [""] : [] content { - host = local.hc.http.host - port = local.hc.http.port - port_name = local.hc.http.port_name - port_specification = local.hc.http.port_specification - proxy_header = local.hc.http.proxy_header - request_path = local.hc.http.request_path - response = local.hc.http.response + host = local.hc.http2.host + port = local.hc.http2.port + port_name = local.hc.http2.port_name + port_specification = local.hc.http2.port_specification + proxy_header = local.hc.http2.proxy_header + request_path = local.hc.http2.request_path + response = local.hc.http2.response } } @@ -91,12 +91,12 @@ resource "google_compute_health_check" "default" { dynamic "ssl_health_check" { for_each = local.hc_ssl ? [""] : [] content { - port = local.hc.tcp.port - port_name = local.hc.tcp.port_name - port_specification = local.hc.tcp.port_specification - proxy_header = local.hc.tcp.proxy_header - request = local.hc.tcp.request - response = local.hc.tcp.response + port = local.hc.ssl.port + port_name = local.hc.ssl.port_name + port_specification = local.hc.ssl.port_specification + proxy_header = local.hc.ssl.proxy_header + request = local.hc.ssl.request + response = local.hc.ssl.response } } diff --git a/modules/net-lb-int/versions.tf b/modules/net-lb-int/versions.tf index 4778310df..e920f3e66 100644 --- a/modules/net-lb-int/versions.tf +++ b/modules/net-lb-int/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-int:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-int:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-int:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-int:v49.2.0-tf" } } diff --git a/modules/net-lb-int/versions.tofu b/modules/net-lb-int/versions.tofu index 5d07ea8d4..ce6961c7e 100644 --- a/modules/net-lb-int/versions.tofu +++ b/modules/net-lb-int/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-int:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-int:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-int:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-int:v49.2.0-tofu" } } diff --git a/modules/net-lb-proxy-int/versions.tf b/modules/net-lb-proxy-int/versions.tf index 06b4972f5..a8362a425 100644 --- a/modules/net-lb-proxy-int/versions.tf +++ b/modules/net-lb-proxy-int/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-proxy-int:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-proxy-int:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-proxy-int:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-proxy-int:v49.2.0-tf" } } diff --git a/modules/net-lb-proxy-int/versions.tofu b/modules/net-lb-proxy-int/versions.tofu index 962cc0359..0ee0fc417 100644 --- a/modules/net-lb-proxy-int/versions.tofu +++ b/modules/net-lb-proxy-int/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-proxy-int:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-proxy-int:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-proxy-int:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-lb-proxy-int:v49.2.0-tofu" } } diff --git a/modules/net-swp/versions.tf b/modules/net-swp/versions.tf index 490937985..a968c9244 100644 --- a/modules/net-swp/versions.tf +++ b/modules/net-swp/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-swp:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-swp:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-swp:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-swp:v49.2.0-tf" } } diff --git a/modules/net-swp/versions.tofu b/modules/net-swp/versions.tofu index 2319b96c8..c082d4051 100644 --- a/modules/net-swp/versions.tofu +++ b/modules/net-swp/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-swp:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-swp:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-swp:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-swp:v49.2.0-tofu" } } diff --git a/modules/net-vlan-attachment/versions.tf b/modules/net-vlan-attachment/versions.tf index fd3300d9b..c4c623454 100644 --- a/modules/net-vlan-attachment/versions.tf +++ b/modules/net-vlan-attachment/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vlan-attachment:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vlan-attachment:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vlan-attachment:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vlan-attachment:v49.2.0-tf" } } diff --git a/modules/net-vlan-attachment/versions.tofu b/modules/net-vlan-attachment/versions.tofu index 1afee24dc..c68752ca7 100644 --- a/modules/net-vlan-attachment/versions.tofu +++ b/modules/net-vlan-attachment/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vlan-attachment:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vlan-attachment:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vlan-attachment:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vlan-attachment:v49.2.0-tofu" } } diff --git a/modules/net-vpc-firewall/versions.tf b/modules/net-vpc-firewall/versions.tf index 5963fcfc7..710adb274 100644 --- a/modules/net-vpc-firewall/versions.tf +++ b/modules/net-vpc-firewall/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-firewall:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-firewall:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-firewall:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-firewall:v49.2.0-tf" } } diff --git a/modules/net-vpc-firewall/versions.tofu b/modules/net-vpc-firewall/versions.tofu index bc06c144c..a7f2e478f 100644 --- a/modules/net-vpc-firewall/versions.tofu +++ b/modules/net-vpc-firewall/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-firewall:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-firewall:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-firewall:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-firewall:v49.2.0-tofu" } } diff --git a/modules/net-vpc-peering/versions.tf b/modules/net-vpc-peering/versions.tf index 6152138c2..5bc66bdcb 100644 --- a/modules/net-vpc-peering/versions.tf +++ b/modules/net-vpc-peering/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-peering:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-peering:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-peering:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-peering:v49.2.0-tf" } } diff --git a/modules/net-vpc-peering/versions.tofu b/modules/net-vpc-peering/versions.tofu index 145e1065c..c41cbf33b 100644 --- a/modules/net-vpc-peering/versions.tofu +++ b/modules/net-vpc-peering/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-peering:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-peering:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-peering:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc-peering:v49.2.0-tofu" } } diff --git a/modules/net-vpc/versions.tf b/modules/net-vpc/versions.tf index 5312c1f11..ea79c2bbf 100644 --- a/modules/net-vpc/versions.tf +++ b/modules/net-vpc/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc:v49.2.0-tf" } } diff --git a/modules/net-vpc/versions.tofu b/modules/net-vpc/versions.tofu index 81f2142ec..bfe943595 100644 --- a/modules/net-vpc/versions.tofu +++ b/modules/net-vpc/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpc:v49.2.0-tofu" } } diff --git a/modules/net-vpn-dynamic/versions.tf b/modules/net-vpn-dynamic/versions.tf index 561e16c9c..ae8a98b50 100644 --- a/modules/net-vpn-dynamic/versions.tf +++ b/modules/net-vpn-dynamic/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-dynamic:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-dynamic:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-dynamic:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-dynamic:v49.2.0-tf" } } diff --git a/modules/net-vpn-dynamic/versions.tofu b/modules/net-vpn-dynamic/versions.tofu index 2004b7152..8fc075226 100644 --- a/modules/net-vpn-dynamic/versions.tofu +++ b/modules/net-vpn-dynamic/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-dynamic:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-dynamic:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-dynamic:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-dynamic:v49.2.0-tofu" } } diff --git a/modules/net-vpn-ha/versions.tf b/modules/net-vpn-ha/versions.tf index 9a688075b..ce73f211e 100644 --- a/modules/net-vpn-ha/versions.tf +++ b/modules/net-vpn-ha/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-ha:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-ha:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-ha:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-ha:v49.2.0-tf" } } diff --git a/modules/net-vpn-ha/versions.tofu b/modules/net-vpn-ha/versions.tofu index bfd1ab354..4eec515e8 100644 --- a/modules/net-vpn-ha/versions.tofu +++ b/modules/net-vpn-ha/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-ha:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-ha:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-ha:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-ha:v49.2.0-tofu" } } diff --git a/modules/net-vpn-static/versions.tf b/modules/net-vpn-static/versions.tf index 7e1f0a47a..abe63bc7b 100644 --- a/modules/net-vpn-static/versions.tf +++ b/modules/net-vpn-static/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-static:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-static:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-static:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-static:v49.2.0-tf" } } diff --git a/modules/net-vpn-static/versions.tofu b/modules/net-vpn-static/versions.tofu index 623d82105..47276d219 100644 --- a/modules/net-vpn-static/versions.tofu +++ b/modules/net-vpn-static/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-static:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-static:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-static:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/net-vpn-static:v49.2.0-tofu" } } diff --git a/modules/organization/versions.tf b/modules/organization/versions.tf index 0d4408e04..32bed3679 100644 --- a/modules/organization/versions.tf +++ b/modules/organization/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/organization:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/organization:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/organization:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/organization:v49.2.0-tf" } } diff --git a/modules/organization/versions.tofu b/modules/organization/versions.tofu index 7d8333389..639a36db4 100644 --- a/modules/organization/versions.tofu +++ b/modules/organization/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/organization:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/organization:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/organization:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/organization:v49.2.0-tofu" } } diff --git a/modules/project-factory/README.md b/modules/project-factory/README.md index 50eb6a78c..685cba01a 100644 --- a/modules/project-factory/README.md +++ b/modules/project-factory/README.md @@ -809,7 +809,7 @@ compute.disableSerialPortAccess: | [data_overrides](variables.tf#L122) | Optional values that override corresponding data from files. Takes precedence over file data and `data_defaults`. | object({…}) | | {} | | [folders](variables-folders.tf#L17) | Folders data merged with factory data. | map(object({…})) | | {} | | [notification_channels](variables-billing.tf#L17) | Notification channels used by budget alerts. | map(object({…})) | | {} | -| [projects](variables-projects.tf#L17) | Projects data merged with factory data. | map(object({…})) | | {} | +| [projects](variables-projects.tf#L17) | Projects data merged with factory data. | map(object({…})) | | {} | ## Outputs diff --git a/modules/project-factory/budgets.tf b/modules/project-factory/budgets.tf index 702c01870..c7466a2db 100644 --- a/modules/project-factory/budgets.tf +++ b/modules/project-factory/budgets.tf @@ -16,13 +16,40 @@ # tfdoc:file:description Billing budget factory locals. +locals { + budget_folder_sets = flatten([ + for k, v in local.folders_input : [ + for vv in try(v.billing_budgets, []) : { + folder = k + budget = replace(vv, "$billing_budgets:", "") + } if trimspace(vv) != "" + ] + ]) + budget_project_sets = flatten([ + for k, v in local.projects_input : [ + for vv in try(v.billing_budgets, []) : { + project = k + budget = replace(vv, "$billing_budgets:", "") + } if trimspace(vv) != "" + ] + ]) +} + module "billing-budgets" { source = "../billing-account" count = var.factories_config.budgets != null ? 1 : 0 id = var.factories_config.budgets.billing_account_id context = merge(local.ctx, { - folder_ids = local.ctx.folder_ids + folder_ids = local.ctx.folder_ids + folder_sets = { + for v in local.budget_folder_sets : + v.budget => local.folder_ids[v.folder]... + } project_ids = local.ctx_project_ids + project_sets = { + for v in local.budget_project_sets : + v.budget => "projects/${local.outputs_projects[v.project].number}"... + } }) factories_config = { budgets_data_path = var.factories_config.budgets.data diff --git a/modules/project-factory/main.tf b/modules/project-factory/main.tf index 1dba2cc4a..90d85bf22 100644 --- a/modules/project-factory/main.tf +++ b/modules/project-factory/main.tf @@ -39,7 +39,7 @@ resource "terraform_data" "defaults_preconditions" { } # precondition { # condition = local.projects_input == null - # error_message = yamlencode(local.projects_input["iac-0"]) + # error_message = yamlencode(local.budget_project_sets) # } } } diff --git a/modules/project-factory/projects-bigquery.tf b/modules/project-factory/projects-bigquery.tf index 93a758020..eb4d8dfc3 100644 --- a/modules/project-factory/projects-bigquery.tf +++ b/modules/project-factory/projects-bigquery.tf @@ -18,11 +18,12 @@ locals { projects_bigquery_datasets = flatten([ for k, v in local.projects_input : [ for name, opts in lookup(v, "datasets", {}) : { - project_key = k - project_name = v.name - id = name - friendly_name = lookup(opts, "friendly_name", null) - location = lookup(opts, "location", null) + project_key = k + project_name = v.name + id = name + encryption_key = lookup(opts, "encryption_key", null) + friendly_name = lookup(opts, "friendly_name", null) + location = lookup(opts, "location", null) } ] ]) @@ -33,7 +34,7 @@ module "bigquery-datasets" { for_each = { for k in local.projects_bigquery_datasets : "${k.project_key}/${k.id}" => k } - project_id = module.projects[each.value.project_key].project_id + project_id = module.projects-iam[each.value.project_key].project_id id = each.value.id context = merge(local.ctx, { iam_principals = merge( @@ -46,7 +47,8 @@ module "bigquery-datasets" { locations = local.ctx.locations project_ids = local.ctx_project_ids }) - friendly_name = each.value.friendly_name + encryption_key = each.value.encryption_key + friendly_name = each.value.friendly_name location = coalesce( local.data_defaults.overrides.locations.bigquery, lookup(each.value, "location", null), diff --git a/modules/project-factory/projects-buckets.tf b/modules/project-factory/projects-buckets.tf index a2aea7ac1..4e9d0fa64 100644 --- a/modules/project-factory/projects-buckets.tf +++ b/modules/project-factory/projects-buckets.tf @@ -62,7 +62,7 @@ module "buckets" { for_each = { for k in local.projects_buckets : "${k.project_key}/${k.name}" => k } - project_id = module.projects[each.value.project_key].project_id + project_id = module.projects-iam[each.value.project_key].project_id prefix = each.value.prefix name = "${each.value.project_name}-${each.value.name}" bucket_create = each.value.create diff --git a/modules/project-factory/projects.tf b/modules/project-factory/projects.tf index 2d29092c6..7a06a2102 100644 --- a/modules/project-factory/projects.tf +++ b/modules/project-factory/projects.tf @@ -157,6 +157,10 @@ module "projects-iam" { local.projects_service_agents ) log_buckets = local.ctx_log_buckets + project_ids = merge( + local.ctx.project_ids, + { for k, v in module.projects : k => v.project_id } + ) }) factories_config = { # we do anything that can refer to IAM and custom roles in this call diff --git a/modules/project-factory/schemas/folder.schema.json b/modules/project-factory/schemas/folder.schema.json index 837e33538..907b2dff1 100644 --- a/modules/project-factory/schemas/folder.schema.json +++ b/modules/project-factory/schemas/folder.schema.json @@ -74,6 +74,12 @@ } } }, + "billing_budgets": { + "type": "array", + "items": { + "type": "string" + } + }, "contacts": { "type": "object", "additionalProperties": false, diff --git a/modules/project-factory/variables-projects.tf b/modules/project-factory/variables-projects.tf index ac3287514..d9901142c 100644 --- a/modules/project-factory/variables-projects.tf +++ b/modules/project-factory/variables-projects.tf @@ -154,8 +154,9 @@ variable "projects" { })), {}) contacts = optional(map(list(string)), {}) datasets = optional(map(object({ - friendly_name = optional(string) - location = optional(string) + encryption_key = optional(string) + friendly_name = optional(string) + location = optional(string) })), {}) iam = optional(map(list(string)), {}) iam_bindings = optional(map(object({ diff --git a/modules/project/README.md b/modules/project/README.md index d1d6898c9..368135533 100644 --- a/modules/project/README.md +++ b/modules/project/README.md @@ -11,6 +11,7 @@ This module implements the creation and management of one GCP project including - [Authoritative IAM](#authoritative-iam) - [Additive IAM](#additive-iam) - [Service Agents](#service-agents) + - [Cloudservices Editor Role](#cloudservices-editor-role) - [Service Agent Aliases](#service-agent-aliases) - [Shared VPC](#shared-vpc) - [Organization Policies](#organization-policies) @@ -233,6 +234,10 @@ The `service_agents` output provides a convenient way to access information abou The complete list of Google Cloud service agents, including their names, default roles, and associated APIs, is maintained in the [service-agents.yaml](./service-agents.yaml) file. This file is regularly updated to reflect the [official list of Google Cloud service agents](https://cloud.google.com/iam/docs/service-agents) using the [`build_service_agents`](../../tools/build_service_agents.py) script. +#### Cloudservices Editor Role + +The `cloudservices` service agent is granted `roles/editor` by default, making it easy to accidentally remove this binding when managing the editor role authoritatively. In those cases, the module auto-injects the `cloudservices` service agent to preserve the binding. This behaviour is disabled when the `service_agents_config.grant_service_agent_editor` variable is set to `false`. + #### Service Agent Aliases Consider the code below: @@ -2137,18 +2142,18 @@ module "project" { | [project_reuse](variables.tf#L257) | Reuse existing project if not null. If name and number are not passed in, a data source is used. | object({…}) | | null | | [quotas](variables-quotas.tf#L17) | Service quota configuration. | map(object({…})) | | {} | | [scc_sha_custom_modules](variables-scc.tf#L17) | SCC custom modules keyed by module name. | map(object({…})) | | {} | -| [service_agents_config](variables.tf#L277) | Automatic service agent configuration options. | object({…}) | | {} | -| [service_config](variables.tf#L287) | Configure service API activation. | object({…}) | | {…} | -| [service_encryption_key_ids](variables.tf#L299) | Service Agents to be granted encryption/decryption permissions over Cloud KMS encryption keys. Format {SERVICE_AGENT => [KEY_ID]}. | map(list(string)) | | {} | -| [services](variables.tf#L306) | Service APIs to enable. | list(string) | | [] | -| [shared_vpc_host_config](variables.tf#L312) | Configures this project as a Shared VPC host project (mutually exclusive with shared_vpc_service_project). | object({…}) | | null | -| [shared_vpc_service_config](variables.tf#L322) | Configures this project as a Shared VPC service project (mutually exclusive with shared_vpc_host_config). | object({…}) | | {…} | -| [skip_delete](variables.tf#L359) | Deprecated. Use deletion_policy. | bool | | null | +| [service_agents_config](variables.tf#L277) | Automatic service agent configuration options. | object({…}) | | {} | +| [service_config](variables.tf#L288) | Configure service API activation. | object({…}) | | {…} | +| [service_encryption_key_ids](variables.tf#L300) | Service Agents to be granted encryption/decryption permissions over Cloud KMS encryption keys. Format {SERVICE_AGENT => [KEY_ID]}. | map(list(string)) | | {} | +| [services](variables.tf#L307) | Service APIs to enable. | list(string) | | [] | +| [shared_vpc_host_config](variables.tf#L313) | Configures this project as a Shared VPC host project (mutually exclusive with shared_vpc_service_project). | object({…}) | | null | +| [shared_vpc_service_config](variables.tf#L323) | Configures this project as a Shared VPC service project (mutually exclusive with shared_vpc_host_config). | object({…}) | | {…} | +| [skip_delete](variables.tf#L360) | Deprecated. Use deletion_policy. | bool | | null | | [tag_bindings](variables-tags.tf#L82) | Tag bindings for this project, in key => tag value id format. | map(string) | | null | | [tags](variables-tags.tf#L89) | Tags by key name. If `id` is provided, key or value creation is skipped. The `iam` attribute behaves like the similarly named one at module level. | map(object({…})) | | {} | | [tags_config](variables-tags.tf#L154) | Fine-grained control on tag resource and IAM creation. | object({…}) | | {} | -| [universe](variables.tf#L371) | GCP universe where to deploy the project. The prefix will be prepended to the project id. | object({…}) | | null | -| [vpc_sc](variables.tf#L382) | VPC-SC configuration for the project, use when `ignore_changes` for resources is set in the VPC-SC module. | object({…}) | | null | +| [universe](variables.tf#L372) | GCP universe where to deploy the project. The prefix will be prepended to the project id. | object({…}) | | null | +| [vpc_sc](variables.tf#L383) | VPC-SC configuration for the project, use when `ignore_changes` for resources is set in the VPC-SC module. | object({…}) | | null | | [workload_identity_pools](variables-identity-providers.tf#L17) | Workload Identity Federation pools and providers. | map(object({…})) | | {} | ## Outputs diff --git a/modules/project/cmek.tf b/modules/project/cmek.tf index ef71119a8..3a3efbbf1 100644 --- a/modules/project/cmek.tf +++ b/modules/project/cmek.tf @@ -31,7 +31,7 @@ locals { # https://cloud.google.com/composer/docs/composer-3/configure-cmek-encryption#grant-roles-permissions "composer.googleapis.com" : ["composer", "storage"] "compute.googleapis.com" : ["compute"] - "container.googleapis.com" : ["compute"] + "container.googleapis.com" : ["compute", "container-engine-robot"] "dataflow.googleapis.com" : ["dataflow", "compute"] "dataform.googleapis.com" : ["dataform"] "datafusion.googleapis.com" : [ @@ -42,12 +42,13 @@ locals { "datastream.googleapis.com" : ["datastream"] "dialogflow.googleapis.com" : ["dialogflow-cmek"] "file.googleapis.com" : ["cloud-filer"] + "logging.googleapis.com" : ["logging"] "pubsub.googleapis.com" : ["pubsub"] + "run.googleapis.com" : ["cloudrun"] "secretmanager.googleapis.com" : ["secretmanager"] "spanner.googleapis.com" : ["spanner"] "sqladmin.googleapis.com" : ["cloud-sql"] "storage.googleapis.com" : ["storage"] - "run.googleapis.com" : ["cloudrun"] } _all_cmek_bindings = flatten([ for service, keys in var.service_encryption_key_ids : [ diff --git a/modules/project/iam.tf b/modules/project/iam.tf index e3a798f83..c0a093fd1 100644 --- a/modules/project/iam.tf +++ b/modules/project/iam.tf @@ -75,7 +75,12 @@ locals { for role in distinct(concat(keys(var.iam), keys(local._iam_principals))) : role => concat( try(var.iam[role], []), - try(local._iam_principals[role], []) + try(local._iam_principals[role], []), + ( + role == "roles/editor" && var.service_agents_config.grant_service_agent_editor + ? ["$service_agents:cloudservices"] + : [] + ) ) } iam_bindings_additive = merge( diff --git a/modules/project/variables.tf b/modules/project/variables.tf index 85992fa11..68184405c 100644 --- a/modules/project/variables.tf +++ b/modules/project/variables.tf @@ -277,8 +277,9 @@ variable "project_reuse" { variable "service_agents_config" { description = "Automatic service agent configuration options." type = object({ - create_primary_agents = optional(bool, true) - grant_default_roles = optional(bool, true) + create_primary_agents = optional(bool, true) + grant_default_roles = optional(bool, true) + grant_service_agent_editor = optional(bool, true) }) default = {} nullable = false diff --git a/modules/project/versions.tf b/modules/project/versions.tf index 5d95c37ea..4e51dd809 100644 --- a/modules/project/versions.tf +++ b/modules/project/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/project:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/project:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/project:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/project:v49.2.0-tf" } } diff --git a/modules/project/versions.tofu b/modules/project/versions.tofu index 883466b7c..1a4f26a58 100644 --- a/modules/project/versions.tofu +++ b/modules/project/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/project:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/project:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/project:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/project:v49.2.0-tofu" } } diff --git a/modules/projects-data-source/versions.tf b/modules/projects-data-source/versions.tf index ed9b20a4a..686b91ded 100644 --- a/modules/projects-data-source/versions.tf +++ b/modules/projects-data-source/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/projects-data-source:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/projects-data-source:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/projects-data-source:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/projects-data-source:v49.2.0-tf" } } diff --git a/modules/projects-data-source/versions.tofu b/modules/projects-data-source/versions.tofu index b83e29496..bc465bc30 100644 --- a/modules/projects-data-source/versions.tofu +++ b/modules/projects-data-source/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/projects-data-source:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/projects-data-source:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/projects-data-source:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/projects-data-source:v49.2.0-tofu" } } diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf index 6898d0c39..5963f8cb7 100644 --- a/modules/pubsub/versions.tf +++ b/modules/pubsub/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/pubsub:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/pubsub:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/pubsub:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/pubsub:v49.2.0-tf" } } diff --git a/modules/pubsub/versions.tofu b/modules/pubsub/versions.tofu index 37a6cc65b..560cb75fd 100644 --- a/modules/pubsub/versions.tofu +++ b/modules/pubsub/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/pubsub:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/pubsub:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/pubsub:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/pubsub:v49.2.0-tofu" } } diff --git a/modules/secops-rules/versions.tf b/modules/secops-rules/versions.tf index 04e3426e0..80a58ea59 100644 --- a/modules/secops-rules/versions.tf +++ b/modules/secops-rules/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secops-rules:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secops-rules:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secops-rules:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secops-rules:v49.2.0-tf" } } diff --git a/modules/secops-rules/versions.tofu b/modules/secops-rules/versions.tofu index 564f56088..6f2050f55 100644 --- a/modules/secops-rules/versions.tofu +++ b/modules/secops-rules/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secops-rules:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secops-rules:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secops-rules:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secops-rules:v49.2.0-tofu" } } diff --git a/modules/secret-manager/global.tf b/modules/secret-manager/global.tf index 9c97bd0ac..7e9dac302 100644 --- a/modules/secret-manager/global.tf +++ b/modules/secret-manager/global.tf @@ -95,7 +95,7 @@ resource "google_secret_manager_secret_version" "default" { deletion_policy = each.value.deletion_policy enabled = each.value.enabled is_secret_data_base64 = try( - each.value.data_config.is_base64, null + each.value.data_config.is_base64, false ) secret_data_wo_version = try( each.value.data_config.write_only_version, null diff --git a/modules/secret-manager/regional.tf b/modules/secret-manager/regional.tf index 9122dba65..bfc3c2674 100644 --- a/modules/secret-manager/regional.tf +++ b/modules/secret-manager/regional.tf @@ -67,7 +67,7 @@ resource "google_secret_manager_regional_secret_version" "default" { deletion_policy = each.value.deletion_policy enabled = each.value.enabled is_secret_data_base64 = try( - each.value.data_config.is_base64, null + each.value.data_config.is_base64, false ) secret_data = ( try(each.value.data_config.is_file, null) == true @@ -88,4 +88,3 @@ resource "google_tags_location_tag_binding" "binding" { location = lookup(local.ctx.locations, each.value.location, each.value.location) tag_value = lookup(local.ctx.tag_values, each.value.tag, each.value.tag) } - diff --git a/modules/secret-manager/versions.tf b/modules/secret-manager/versions.tf index 0af5e9cc5..8111da40a 100644 --- a/modules/secret-manager/versions.tf +++ b/modules/secret-manager/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secret-manager:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secret-manager:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secret-manager:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secret-manager:v49.2.0-tf" } } diff --git a/modules/secret-manager/versions.tofu b/modules/secret-manager/versions.tofu index e98c9a475..e43c6d0a6 100644 --- a/modules/secret-manager/versions.tofu +++ b/modules/secret-manager/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secret-manager:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secret-manager:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secret-manager:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secret-manager:v49.2.0-tofu" } } diff --git a/modules/secure-source-manager-instance/versions.tf b/modules/secure-source-manager-instance/versions.tf index e9ccf409e..1f28ab954 100644 --- a/modules/secure-source-manager-instance/versions.tf +++ b/modules/secure-source-manager-instance/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secure-source-manager-instance:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secure-source-manager-instance:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secure-source-manager-instance:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secure-source-manager-instance:v49.2.0-tf" } } diff --git a/modules/secure-source-manager-instance/versions.tofu b/modules/secure-source-manager-instance/versions.tofu index ee90d5483..942f95cd4 100644 --- a/modules/secure-source-manager-instance/versions.tofu +++ b/modules/secure-source-manager-instance/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secure-source-manager-instance:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secure-source-manager-instance:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/secure-source-manager-instance:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/secure-source-manager-instance:v49.2.0-tofu" } } diff --git a/modules/service-directory/versions.tf b/modules/service-directory/versions.tf index 1eaa32fca..32340d43e 100644 --- a/modules/service-directory/versions.tf +++ b/modules/service-directory/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/service-directory:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/service-directory:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/service-directory:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/service-directory:v49.2.0-tf" } } diff --git a/modules/service-directory/versions.tofu b/modules/service-directory/versions.tofu index 19681250a..d3b4746d7 100644 --- a/modules/service-directory/versions.tofu +++ b/modules/service-directory/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/service-directory:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/service-directory:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/service-directory:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/service-directory:v49.2.0-tofu" } } diff --git a/modules/source-repository/versions.tf b/modules/source-repository/versions.tf index 090c38885..f63780b5e 100644 --- a/modules/source-repository/versions.tf +++ b/modules/source-repository/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/source-repository:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/source-repository:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/source-repository:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/source-repository:v49.2.0-tf" } } diff --git a/modules/source-repository/versions.tofu b/modules/source-repository/versions.tofu index f15adb049..d8cd9cb3b 100644 --- a/modules/source-repository/versions.tofu +++ b/modules/source-repository/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/source-repository:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/source-repository:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/source-repository:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/source-repository:v49.2.0-tofu" } } diff --git a/modules/spanner-instance/versions.tf b/modules/spanner-instance/versions.tf index 59c5c1c59..3e0d5f58f 100644 --- a/modules/spanner-instance/versions.tf +++ b/modules/spanner-instance/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/spanner-instance:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/spanner-instance:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/spanner-instance:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/spanner-instance:v49.2.0-tf" } } diff --git a/modules/spanner-instance/versions.tofu b/modules/spanner-instance/versions.tofu index 73a100ffc..3df9d00cc 100644 --- a/modules/spanner-instance/versions.tofu +++ b/modules/spanner-instance/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/spanner-instance:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/spanner-instance:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/spanner-instance:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/spanner-instance:v49.2.0-tofu" } } diff --git a/modules/vpc-sc/versions.tf b/modules/vpc-sc/versions.tf index b35b8fb7c..6d9232ee2 100644 --- a/modules/vpc-sc/versions.tf +++ b/modules/vpc-sc/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/vpc-sc:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/vpc-sc:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/vpc-sc:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/vpc-sc:v49.2.0-tf" } } diff --git a/modules/vpc-sc/versions.tofu b/modules/vpc-sc/versions.tofu index 580d5e2ad..e95a77908 100644 --- a/modules/vpc-sc/versions.tofu +++ b/modules/vpc-sc/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/vpc-sc:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/vpc-sc:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/vpc-sc:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/vpc-sc:v49.2.0-tofu" } } diff --git a/modules/workstation-cluster/versions.tf b/modules/workstation-cluster/versions.tf index 1c021f15c..d02ab6c00 100644 --- a/modules/workstation-cluster/versions.tf +++ b/modules/workstation-cluster/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/workstation-cluster:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/workstation-cluster:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/workstation-cluster:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/workstation-cluster:v49.2.0-tf" } } diff --git a/modules/workstation-cluster/versions.tofu b/modules/workstation-cluster/versions.tofu index 3a5c3a52d..1436dc904 100644 --- a/modules/workstation-cluster/versions.tofu +++ b/modules/workstation-cluster/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/workstation-cluster:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/workstation-cluster:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/modules/workstation-cluster:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/modules/workstation-cluster:v49.2.0-tofu" } } diff --git a/tests/examples_e2e/setup_module/versions.tf b/tests/examples_e2e/setup_module/versions.tf index ea804e288..6823158a3 100644 --- a/tests/examples_e2e/setup_module/versions.tf +++ b/tests/examples_e2e/setup_module/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v49.2.0-tf" } } diff --git a/tests/examples_e2e/setup_module/versions.tofu b/tests/examples_e2e/setup_module/versions.tofu index bcda9e3cf..ed024ceb5 100644 --- a/tests/examples_e2e/setup_module/versions.tofu +++ b/tests/examples_e2e/setup_module/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v49.2.0-tofu" } } diff --git a/tests/modules/bigquery_dataset/context.tfvars b/tests/modules/bigquery_dataset/context.tfvars index b4805a158..de038c230 100644 --- a/tests/modules/bigquery_dataset/context.tfvars +++ b/tests/modules/bigquery_dataset/context.tfvars @@ -11,6 +11,9 @@ context = { myuser = "user:test-user@example.com" myuser2 = "user:test-user2@example.com" } + kms_keys = { + mykey = "projects/366118655033/locations/europe-west8/keyRings/mykeyring/cryptoKeys/mykey" + } locations = { ew8 = "europe-west8" } @@ -21,9 +24,10 @@ context = { "test/one" = "tagValues/1234567890" } } -project_id = "$project_ids:test" -id = "dataset_0" -location = "$locations:ew8" +project_id = "$project_ids:test" +id = "dataset_0" +location = "$locations:ew8" +encryption_key = "$kms_keys:mykey" iam = { "$custom_roles:myrole_one" = [ "$iam_principals:myuser" diff --git a/tests/modules/bigquery_dataset/context.yaml b/tests/modules/bigquery_dataset/context.yaml index a9f3d17f0..ef273fb32 100644 --- a/tests/modules/bigquery_dataset/context.yaml +++ b/tests/modules/bigquery_dataset/context.yaml @@ -15,7 +15,8 @@ values: google_bigquery_dataset.default: dataset_id: dataset_0 - default_encryption_configuration: [] + default_encryption_configuration: + - kms_key_name: projects/366118655033/locations/europe-west8/keyRings/mykeyring/cryptoKeys/mykey default_partition_expiration_ms: null default_table_expiration_ms: null delete_contents_on_destroy: false diff --git a/tests/modules/cloud_function_v2/examples/direct-vpc-egress.yaml b/tests/modules/cloud_function_v2/examples/direct-vpc-egress.yaml new file mode 100644 index 000000000..0530e3620 --- /dev/null +++ b/tests/modules/cloud_function_v2/examples/direct-vpc-egress.yaml @@ -0,0 +1,36 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + module.cf_http.google_cloudfunctions2_function.function: + service_config: + - all_traffic_on_latest_revision: true + available_cpu: '0.166' + available_memory: 256M + binary_authorization_policy: null + direct_vpc_egress: VPC_EGRESS_ALL_TRAFFIC + direct_vpc_network_interface: + - network: projects/xxx/global/networks/aaa + subnetwork: subnet_self_link + tags: + - tag1 + - tag2 + +counts: + google_cloudfunctions2_function: 1 + google_project_iam_member: 2 + google_service_account: 1 + google_storage_bucket_object: 1 + modules: 1 + resources: 5 diff --git a/tests/modules/compute_vm/examples/disk-hyperdisk-arm.yaml b/tests/modules/compute_vm/examples/disk-hyperdisk-arm.yaml index df317a052..9b30320a6 100644 --- a/tests/modules/compute_vm/examples/disk-hyperdisk-arm.yaml +++ b/tests/modules/compute_vm/examples/disk-hyperdisk-arm.yaml @@ -47,7 +47,7 @@ values: goog-terraform-provisioned: 'true' timeouts: null type: hyperdisk-balanced - zone: europe-west8-b + zone: europe-west8-c module.vm-arm.google_compute_disk.disks["data2"]: architecture: ARM64 async_primary_disk: [] @@ -82,7 +82,7 @@ values: goog-terraform-provisioned: 'true' timeouts: null type: hyperdisk-balanced - zone: europe-west8-b + zone: europe-west8-c module.vm-arm.google_compute_instance.default[0]: advanced_machine_features: [] allow_stopping_for_update: true @@ -181,7 +181,7 @@ values: terraform_labels: goog-terraform-provisioned: 'true' timeouts: null - zone: europe-west8-b + zone: europe-west8-c module.vm-arm.google_service_account.service_account[0]: account_id: tf-vm-test create_ignore_already_exists: null diff --git a/tests/modules/compute_vm/examples/disk-hyperdisk-pool.yaml b/tests/modules/compute_vm/examples/disk-hyperdisk-pool.yaml index 45bc67d95..82d69bbea 100644 --- a/tests/modules/compute_vm/examples/disk-hyperdisk-pool.yaml +++ b/tests/modules/compute_vm/examples/disk-hyperdisk-pool.yaml @@ -28,7 +28,7 @@ values: terraform_labels: goog-terraform-provisioned: 'true' timeouts: null - zone: europe-west8-b + zone: europe-west8-c module.vm-disk-options-example.google_compute_disk.boot[0]: architecture: null async_primary_disk: [] @@ -62,7 +62,7 @@ values: goog-terraform-provisioned: 'true' timeouts: null type: hyperdisk-balanced - zone: europe-west8-b + zone: europe-west8-c module.vm-disk-options-example.google_compute_disk.disks["data1"]: architecture: null async_primary_disk: [] @@ -94,7 +94,7 @@ values: goog-terraform-provisioned: 'true' timeouts: null type: hyperdisk-balanced - zone: europe-west8-b + zone: europe-west8-c module.vm-disk-options-example.google_compute_disk.disks["data2"]: architecture: null async_primary_disk: [] @@ -129,7 +129,7 @@ values: goog-terraform-provisioned: 'true' timeouts: null type: hyperdisk-balanced - zone: europe-west8-b + zone: europe-west8-c module.vm-disk-options-example.google_compute_instance.default[0]: advanced_machine_features: [] allow_stopping_for_update: true @@ -216,7 +216,7 @@ values: terraform_labels: goog-terraform-provisioned: 'true' timeouts: null - zone: europe-west8-b + zone: europe-west8-c module.vm-disk-options-example.google_service_account.service_account[0]: account_id: tf-vm-test create_ignore_already_exists: null diff --git a/tests/modules/gke_cluster_autopilot/examples/notifications.yaml b/tests/modules/gke_cluster_autopilot/examples/notifications.yaml new file mode 100644 index 000000000..7e2e4ad7e --- /dev/null +++ b/tests/modules/gke_cluster_autopilot/examples/notifications.yaml @@ -0,0 +1,48 @@ +# Copyright 2023 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + module.cluster-1.google_container_cluster.cluster: + notification_config: + - pubsub: + - enabled: true + filter: + - event_type: + - SECURITY_BULLETIN_EVENT + - UPGRADE_EVENT + + module.cluster-1.google_pubsub_topic.notifications[0]: + effective_labels: + content: gke-notifications + goog-terraform-provisioned: 'true' + ingestion_data_source_settings: [] + kms_key_name: projects/myproject/locations/global/keyRings/mykeyring/cryptoKeys/mykey + labels: + content: gke-notifications + message_retention_duration: null + message_transforms: [] + name: gke-pubsub-notifications + project: project-id + schema_settings: [] + tags: null + terraform_labels: + content: gke-notifications + goog-terraform-provisioned: 'true' + timeouts: null + +counts: + google_container_cluster: 1 + google_pubsub_topic: 1 + modules: 1 + resources: 2 diff --git a/tests/modules/gke_cluster_standard/examples/notifications.yaml b/tests/modules/gke_cluster_standard/examples/notifications.yaml index 20d3fc887..901cebdd5 100644 --- a/tests/modules/gke_cluster_standard/examples/notifications.yaml +++ b/tests/modules/gke_cluster_standard/examples/notifications.yaml @@ -160,7 +160,7 @@ values: content: gke-notifications goog-terraform-provisioned: 'true' ingestion_data_source_settings: [] - kms_key_name: null + kms_key_name: projects/myproject/locations/global/keyRings/mykeyring/cryptoKeys/mykey labels: content: gke-notifications message_retention_duration: null diff --git a/tests/modules/logging_bucket/context.tfvars b/tests/modules/logging_bucket/context.tfvars index 878f26374..ada9dfb84 100644 --- a/tests/modules/logging_bucket/context.tfvars +++ b/tests/modules/logging_bucket/context.tfvars @@ -11,6 +11,9 @@ context = { myuser = "user:test-user@example.com" myuser2 = "user:test-user2@example.com" } + kms_keys = { + mykey = "projects/366118655033/locations/europe-west8/keyRings/mykeyring/cryptoKeys/mykey" + } locations = { ew8 = "europe-west8" } @@ -21,9 +24,10 @@ context = { "test/one" = "tagValues/1234567890" } } -name = "mybucket" -location = "$locations:ew8" -parent = "$project_ids:myproject" +kms_key_name = "$kms_keys:mykey" +name = "mybucket" +location = "$locations:ew8" +parent = "$project_ids:myproject" tag_bindings = { foo = "$tag_values:test/one" } diff --git a/tests/modules/logging_bucket/context.yaml b/tests/modules/logging_bucket/context.yaml index 6932406e3..147b4a851 100644 --- a/tests/modules/logging_bucket/context.yaml +++ b/tests/modules/logging_bucket/context.yaml @@ -35,7 +35,8 @@ values: role: roles/viewer google_logging_project_bucket_config.bucket[0]: bucket_id: mybucket - cmek_settings: [] + cmek_settings: + - kms_key_name: projects/366118655033/locations/europe-west8/keyRings/mykeyring/cryptoKeys/mykey enable_analytics: false index_configs: [] location: europe-west8 diff --git a/tests/modules/net_lb_app_ext/health-checks-grpc.tfvars b/tests/modules/net_lb_app_ext/health-checks-grpc.tfvars new file mode 100644 index 000000000..b88fedd9f --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-grpc.tfvars @@ -0,0 +1,12 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + grpc = { + grpc = { + port = 1123 + port_name = "grpc_port_name" + port_specification = "USE_FIXED_PORT" + service_name = "grpc_service_name" + } + } +} diff --git a/tests/modules/net_lb_app_ext/health-checks-grpc.yaml b/tests/modules/net_lb_app_ext/health-checks-grpc.yaml new file mode 100644 index 000000000..4da1157c4 --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-grpc.yaml @@ -0,0 +1,38 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["grpc"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: + - grpc_service_name: grpc_service_name + port: 1123 + port_name: grpc_port_name + port_specification: USE_FIXED_PORT + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0-grpc + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_ext/health-checks-http.tfvars b/tests/modules/net_lb_app_ext/health-checks-http.tfvars new file mode 100644 index 000000000..c682f1ea9 --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-http.tfvars @@ -0,0 +1,15 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + http = { + http = { + host = "http_host" + port = 2123 + port_name = "http_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http_request_path" + response = "http_response" + } + } +} diff --git a/tests/modules/net_lb_app_ext/health-checks-http.yaml b/tests/modules/net_lb_app_ext/health-checks-http.yaml new file mode 100644 index 000000000..f5cc1cd48 --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-http.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["http"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: + - host: http_host + port: 2123 + port_name: http_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http_request_path + response: http_response + https_health_check: [] + name: hc-test-0-http + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_ext/health-checks-http2.tfvars b/tests/modules/net_lb_app_ext/health-checks-http2.tfvars new file mode 100644 index 000000000..84500e45d --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-http2.tfvars @@ -0,0 +1,15 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + http2 = { + http2 = { + host = "http2_host" + port = 3123 + port_name = "http2_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http2_request_path" + response = "http2_response" + } + } +} diff --git a/tests/modules/net_lb_app_ext/health-checks-http2.yaml b/tests/modules/net_lb_app_ext/health-checks-http2.yaml new file mode 100644 index 000000000..908440268 --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-http2.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["http2"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: + - host: http2_host + port: 3123 + port_name: http2_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http2_request_path + response: http2_response + http_health_check: [] + https_health_check: [] + name: hc-test-0-http2 + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_ext/health-checks-https.tfvars b/tests/modules/net_lb_app_ext/health-checks-https.tfvars new file mode 100644 index 000000000..3a0c5221f --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-https.tfvars @@ -0,0 +1,15 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + https = { + https = { + host = "https_host" + port = 4123 + port_name = "https_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "https_request_path" + response = "https_response" + } + } +} diff --git a/tests/modules/net_lb_app_ext/health-checks-https.yaml b/tests/modules/net_lb_app_ext/health-checks-https.yaml new file mode 100644 index 000000000..636e228eb --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-https.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["https"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: + - host: https_host + port: 4123 + port_name: https_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: https_request_path + response: https_response + name: hc-test-0-https + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_ext/health-checks-ssl.tfvars b/tests/modules/net_lb_app_ext/health-checks-ssl.tfvars new file mode 100644 index 000000000..e03dcc27f --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-ssl.tfvars @@ -0,0 +1,14 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + ssl = { + ssl = { + port = 6123 + port_name = "ssl_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "ssl_request" + response = "ssl_response" + } + } +} diff --git a/tests/modules/net_lb_app_ext/health-checks-ssl.yaml b/tests/modules/net_lb_app_ext/health-checks-ssl.yaml new file mode 100644 index 000000000..86911d316 --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-ssl.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["ssl"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0-ssl + project: my-project + source_regions: null + ssl_health_check: + - port: 6123 + port_name: ssl_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: ssl_request + response: ssl_response + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_ext/health-checks-tcp.tfvars b/tests/modules/net_lb_app_ext/health-checks-tcp.tfvars new file mode 100644 index 000000000..ee6df1f31 --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-tcp.tfvars @@ -0,0 +1,14 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + tcp = { + tcp = { + port = 5123 + port_name = "tcp_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "tcp_request" + response = "tcp_response" + } + } +} diff --git a/tests/modules/net_lb_app_ext/health-checks-tcp.yaml b/tests/modules/net_lb_app_ext/health-checks-tcp.yaml new file mode 100644 index 000000000..6003269b1 --- /dev/null +++ b/tests/modules/net_lb_app_ext/health-checks-tcp.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["tcp"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0-tcp + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: + - port: 5123 + port_name: tcp_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: tcp_request + response: tcp_response + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_ext/tftest.yaml b/tests/modules/net_lb_app_ext/tftest.yaml index 473cf227c..392a925e9 100644 --- a/tests/modules/net_lb_app_ext/tftest.yaml +++ b/tests/modules/net_lb_app_ext/tftest.yaml @@ -16,3 +16,9 @@ module: modules/net-lb-app-ext tests: test-plan: test-plan-llp: + health-checks-grpc: + health-checks-http: + health-checks-http2: + health-checks-https: + health-checks-ssl: + health-checks-tcp: diff --git a/tests/modules/net_lb_app_int/health-checks-grpc.tfvars b/tests/modules/net_lb_app_int/health-checks-grpc.tfvars new file mode 100644 index 000000000..b88fedd9f --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-grpc.tfvars @@ -0,0 +1,12 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + grpc = { + grpc = { + port = 1123 + port_name = "grpc_port_name" + port_specification = "USE_FIXED_PORT" + service_name = "grpc_service_name" + } + } +} diff --git a/tests/modules/net_lb_app_int/health-checks-grpc.yaml b/tests/modules/net_lb_app_int/health-checks-grpc.yaml new file mode 100644 index 000000000..4da1157c4 --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-grpc.yaml @@ -0,0 +1,38 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["grpc"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: + - grpc_service_name: grpc_service_name + port: 1123 + port_name: grpc_port_name + port_specification: USE_FIXED_PORT + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0-grpc + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int/health-checks-http.tfvars b/tests/modules/net_lb_app_int/health-checks-http.tfvars new file mode 100644 index 000000000..c682f1ea9 --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-http.tfvars @@ -0,0 +1,15 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + http = { + http = { + host = "http_host" + port = 2123 + port_name = "http_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http_request_path" + response = "http_response" + } + } +} diff --git a/tests/modules/net_lb_app_int/health-checks-http.yaml b/tests/modules/net_lb_app_int/health-checks-http.yaml new file mode 100644 index 000000000..f5cc1cd48 --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-http.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["http"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: + - host: http_host + port: 2123 + port_name: http_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http_request_path + response: http_response + https_health_check: [] + name: hc-test-0-http + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int/health-checks-http2.tfvars b/tests/modules/net_lb_app_int/health-checks-http2.tfvars new file mode 100644 index 000000000..84500e45d --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-http2.tfvars @@ -0,0 +1,15 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + http2 = { + http2 = { + host = "http2_host" + port = 3123 + port_name = "http2_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http2_request_path" + response = "http2_response" + } + } +} diff --git a/tests/modules/net_lb_app_int/health-checks-http2.yaml b/tests/modules/net_lb_app_int/health-checks-http2.yaml new file mode 100644 index 000000000..908440268 --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-http2.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["http2"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: + - host: http2_host + port: 3123 + port_name: http2_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http2_request_path + response: http2_response + http_health_check: [] + https_health_check: [] + name: hc-test-0-http2 + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int/health-checks-https.tfvars b/tests/modules/net_lb_app_int/health-checks-https.tfvars new file mode 100644 index 000000000..3a0c5221f --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-https.tfvars @@ -0,0 +1,15 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + https = { + https = { + host = "https_host" + port = 4123 + port_name = "https_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "https_request_path" + response = "https_response" + } + } +} diff --git a/tests/modules/net_lb_app_int/health-checks-https.yaml b/tests/modules/net_lb_app_int/health-checks-https.yaml new file mode 100644 index 000000000..636e228eb --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-https.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["https"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: + - host: https_host + port: 4123 + port_name: https_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: https_request_path + response: https_response + name: hc-test-0-https + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int/health-checks-ssl.tfvars b/tests/modules/net_lb_app_int/health-checks-ssl.tfvars new file mode 100644 index 000000000..e03dcc27f --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-ssl.tfvars @@ -0,0 +1,14 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + ssl = { + ssl = { + port = 6123 + port_name = "ssl_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "ssl_request" + response = "ssl_response" + } + } +} diff --git a/tests/modules/net_lb_app_int/health-checks-ssl.yaml b/tests/modules/net_lb_app_int/health-checks-ssl.yaml new file mode 100644 index 000000000..86911d316 --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-ssl.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["ssl"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0-ssl + project: my-project + source_regions: null + ssl_health_check: + - port: 6123 + port_name: ssl_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: ssl_request + response: ssl_response + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int/health-checks-tcp.tfvars b/tests/modules/net_lb_app_int/health-checks-tcp.tfvars new file mode 100644 index 000000000..ee6df1f31 --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-tcp.tfvars @@ -0,0 +1,14 @@ +name = "hc-test-0" +project_id = "my-project" +health_check_configs = { + tcp = { + tcp = { + port = 5123 + port_name = "tcp_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "tcp_request" + response = "tcp_response" + } + } +} diff --git a/tests/modules/net_lb_app_int/health-checks-tcp.yaml b/tests/modules/net_lb_app_int/health-checks-tcp.yaml new file mode 100644 index 000000000..6003269b1 --- /dev/null +++ b/tests/modules/net_lb_app_int/health-checks-tcp.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["tcp"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0-tcp + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: + - port: 5123 + port_name: tcp_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: tcp_request + response: tcp_response + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int/iap.tfvars b/tests/modules/net_lb_app_int/iap.tfvars new file mode 100644 index 000000000..414ecc436 --- /dev/null +++ b/tests/modules/net_lb_app_int/iap.tfvars @@ -0,0 +1,43 @@ +/** + * Copyright 2025 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +project_id = "my-project" +name = "ilb-l7-test" +region = "europe-west1" +vpc_config = { + network = "projects/my-project/global/networks/default" + subnetwork = "projects/my-project/regions/europe-west1/subnetworks/default" +} +backend_service_configs = { + google-managed = { + backends = [{ group = "group-1" }] + iap_config = {} + } + oauth-managed = { + backends = [{ group = "group-2" }] + iap_config = { + oauth2_client_id = "client-id" + oauth2_client_secret = "client-secret" + } + } + migration-mode = { + backends = [{ group = "group-3" }] + iap_config = { + oauth2_client_id = " " + oauth2_client_secret = " " + } + } +} \ No newline at end of file diff --git a/tests/modules/net_lb_app_int/iap.yaml b/tests/modules/net_lb_app_int/iap.yaml new file mode 100644 index 000000000..ad73b8647 --- /dev/null +++ b/tests/modules/net_lb_app_int/iap.yaml @@ -0,0 +1,20 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +counts: + google_compute_forwarding_rule: 1 + google_compute_health_check: 1 + google_compute_region_backend_service: 3 + google_compute_region_target_http_proxy: 1 + google_compute_region_url_map: 1 diff --git a/tests/modules/net_lb_app_int/tftest.yaml b/tests/modules/net_lb_app_int/tftest.yaml index 4fd90dc35..195955d05 100644 --- a/tests/modules/net_lb_app_int/tftest.yaml +++ b/tests/modules/net_lb_app_int/tftest.yaml @@ -20,6 +20,12 @@ tests: groups: health-checks-custom: health-checks-external: + health-checks-grpc: + health-checks-http: + health-checks-http2: + health-checks-https: + health-checks-ssl: + health-checks-tcp: https: negs: ssl: diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-grpc.tfvars b/tests/modules/net_lb_app_int_cross_region/health-checks-grpc.tfvars new file mode 100644 index 000000000..5f1c6ec4e --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-grpc.tfvars @@ -0,0 +1,28 @@ +name = "hc-test-0" +project_id = "my-project" +backend_service_configs = { + default = { + backends = [{ + group = "projects/myprj/zones/europe-west1-a/instanceGroups/my-ig-ew1" + }, { + group = "projects/myprj/zones/europe-west4-a/instanceGroups/my-ig-ew4" + }] + } +} +vpc_config = { + network = "network" + subnetworks = { + europe-west1 = "subnet-ew1" + europe-west4 = "subnet-ew4" + } +} +health_check_configs = { + grpc = { + grpc = { + port = 1123 + port_name = "grpc_port_name" + port_specification = "USE_FIXED_PORT" + service_name = "grpc_service_name" + } + } +} diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-grpc.yaml b/tests/modules/net_lb_app_int_cross_region/health-checks-grpc.yaml new file mode 100644 index 000000000..4da1157c4 --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-grpc.yaml @@ -0,0 +1,38 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["grpc"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: + - grpc_service_name: grpc_service_name + port: 1123 + port_name: grpc_port_name + port_specification: USE_FIXED_PORT + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0-grpc + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-http.tfvars b/tests/modules/net_lb_app_int_cross_region/health-checks-http.tfvars new file mode 100644 index 000000000..2bf954e76 --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-http.tfvars @@ -0,0 +1,31 @@ +name = "hc-test-0" +project_id = "my-project" +backend_service_configs = { + default = { + backends = [{ + group = "projects/myprj/zones/europe-west1-a/instanceGroups/my-ig-ew1" + }, { + group = "projects/myprj/zones/europe-west4-a/instanceGroups/my-ig-ew4" + }] + } +} +vpc_config = { + network = "network" + subnetworks = { + europe-west1 = "subnet-ew1" + europe-west4 = "subnet-ew4" + } +} +health_check_configs = { + http = { + http = { + host = "http_host" + port = 2123 + port_name = "http_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http_request_path" + response = "http_response" + } + } +} diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-http.yaml b/tests/modules/net_lb_app_int_cross_region/health-checks-http.yaml new file mode 100644 index 000000000..f5cc1cd48 --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-http.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["http"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: + - host: http_host + port: 2123 + port_name: http_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http_request_path + response: http_response + https_health_check: [] + name: hc-test-0-http + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-http2.tfvars b/tests/modules/net_lb_app_int_cross_region/health-checks-http2.tfvars new file mode 100644 index 000000000..b94cccef6 --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-http2.tfvars @@ -0,0 +1,31 @@ +name = "hc-test-0" +project_id = "my-project" +backend_service_configs = { + default = { + backends = [{ + group = "projects/myprj/zones/europe-west1-a/instanceGroups/my-ig-ew1" + }, { + group = "projects/myprj/zones/europe-west4-a/instanceGroups/my-ig-ew4" + }] + } +} +vpc_config = { + network = "network" + subnetworks = { + europe-west1 = "subnet-ew1" + europe-west4 = "subnet-ew4" + } +} +health_check_configs = { + http2 = { + http2 = { + host = "http2_host" + port = 3123 + port_name = "http2_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http2_request_path" + response = "http2_response" + } + } +} diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-http2.yaml b/tests/modules/net_lb_app_int_cross_region/health-checks-http2.yaml new file mode 100644 index 000000000..908440268 --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-http2.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["http2"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: + - host: http2_host + port: 3123 + port_name: http2_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http2_request_path + response: http2_response + http_health_check: [] + https_health_check: [] + name: hc-test-0-http2 + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-https.tfvars b/tests/modules/net_lb_app_int_cross_region/health-checks-https.tfvars new file mode 100644 index 000000000..f1e5e2a6e --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-https.tfvars @@ -0,0 +1,31 @@ +name = "hc-test-0" +project_id = "my-project" +backend_service_configs = { + default = { + backends = [{ + group = "projects/myprj/zones/europe-west1-a/instanceGroups/my-ig-ew1" + }, { + group = "projects/myprj/zones/europe-west4-a/instanceGroups/my-ig-ew4" + }] + } +} +vpc_config = { + network = "network" + subnetworks = { + europe-west1 = "subnet-ew1" + europe-west4 = "subnet-ew4" + } +} +health_check_configs = { + https = { + https = { + host = "https_host" + port = 4123 + port_name = "https_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "https_request_path" + response = "https_response" + } + } +} diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-https.yaml b/tests/modules/net_lb_app_int_cross_region/health-checks-https.yaml new file mode 100644 index 000000000..636e228eb --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-https.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["https"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: + - host: https_host + port: 4123 + port_name: https_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: https_request_path + response: https_response + name: hc-test-0-https + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-ssl.tfvars b/tests/modules/net_lb_app_int_cross_region/health-checks-ssl.tfvars new file mode 100644 index 000000000..13ea3ff09 --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-ssl.tfvars @@ -0,0 +1,30 @@ +name = "hc-test-0" +project_id = "my-project" +backend_service_configs = { + default = { + backends = [{ + group = "projects/myprj/zones/europe-west1-a/instanceGroups/my-ig-ew1" + }, { + group = "projects/myprj/zones/europe-west4-a/instanceGroups/my-ig-ew4" + }] + } +} +vpc_config = { + network = "network" + subnetworks = { + europe-west1 = "subnet-ew1" + europe-west4 = "subnet-ew4" + } +} +health_check_configs = { + ssl = { + ssl = { + port = 6123 + port_name = "ssl_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "ssl_request" + response = "ssl_response" + } + } +} diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-ssl.yaml b/tests/modules/net_lb_app_int_cross_region/health-checks-ssl.yaml new file mode 100644 index 000000000..86911d316 --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-ssl.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["ssl"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0-ssl + project: my-project + source_regions: null + ssl_health_check: + - port: 6123 + port_name: ssl_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: ssl_request + response: ssl_response + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-tcp.tfvars b/tests/modules/net_lb_app_int_cross_region/health-checks-tcp.tfvars new file mode 100644 index 000000000..26b16aa47 --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-tcp.tfvars @@ -0,0 +1,30 @@ +name = "hc-test-0" +project_id = "my-project" +backend_service_configs = { + default = { + backends = [{ + group = "projects/myprj/zones/europe-west1-a/instanceGroups/my-ig-ew1" + }, { + group = "projects/myprj/zones/europe-west4-a/instanceGroups/my-ig-ew4" + }] + } +} +vpc_config = { + network = "network" + subnetworks = { + europe-west1 = "subnet-ew1" + europe-west4 = "subnet-ew4" + } +} +health_check_configs = { + tcp = { + tcp = { + port = 5123 + port_name = "tcp_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "tcp_request" + response = "tcp_response" + } + } +} diff --git a/tests/modules/net_lb_app_int_cross_region/health-checks-tcp.yaml b/tests/modules/net_lb_app_int_cross_region/health-checks-tcp.yaml new file mode 100644 index 000000000..6003269b1 --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/health-checks-tcp.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default["tcp"]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0-tcp + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: + - port: 5123 + port_name: tcp_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: tcp_request + response: tcp_response + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_app_int_cross_region/tftest.yaml b/tests/modules/net_lb_app_int_cross_region/tftest.yaml new file mode 100644 index 000000000..b17f57cf2 --- /dev/null +++ b/tests/modules/net_lb_app_int_cross_region/tftest.yaml @@ -0,0 +1,22 @@ +# Copyright 2023 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module: modules/net-lb-app-int-cross-region +tests: + health-checks-grpc: + health-checks-http: + health-checks-http2: + health-checks-https: + health-checks-ssl: + health-checks-tcp: diff --git a/tests/modules/net_lb_ext/health-checks-grpc.tfvars b/tests/modules/net_lb_ext/health-checks-grpc.tfvars new file mode 100644 index 000000000..9c4e82d66 --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-grpc.tfvars @@ -0,0 +1,16 @@ +project_id = "my-project" +region = "europe-west1" +name = "nlb-test" +backends = [{ + group = "foo" + failover = false +}] + +health_check_config = { + grpc = { + port = 1123 + port_name = "grpc_port_name" + port_specification = "USE_FIXED_PORT" + service_name = "grpc_service_name" + } +} diff --git a/tests/modules/net_lb_ext/health-checks-grpc.yaml b/tests/modules/net_lb_ext/health-checks-grpc.yaml new file mode 100644 index 000000000..bcc32b1eb --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-grpc.yaml @@ -0,0 +1,37 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: + - grpc_service_name: grpc_service_name + port: 1123 + port_name: grpc_port_name + port_specification: USE_FIXED_PORT + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: nlb-test + project: my-project + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_ext/health-checks-http.tfvars b/tests/modules/net_lb_ext/health-checks-http.tfvars new file mode 100644 index 000000000..9e3f05332 --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-http.tfvars @@ -0,0 +1,19 @@ +project_id = "my-project" +region = "europe-west1" +name = "nlb-test" +backends = [{ + group = "foo" + failover = false +}] + +health_check_config = { + http = { + host = "http_host" + port = 2123 + port_name = "http_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http_request_path" + response = "http_response" + } +} diff --git a/tests/modules/net_lb_ext/health-checks-http.yaml b/tests/modules/net_lb_ext/health-checks-http.yaml new file mode 100644 index 000000000..bc1bdc0ab --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-http.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: + - host: http_host + port: 2123 + port_name: http_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http_request_path + response: http_response + https_health_check: [] + name: nlb-test + project: my-project + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_ext/health-checks-http2.tfvars b/tests/modules/net_lb_ext/health-checks-http2.tfvars new file mode 100644 index 000000000..bafc62feb --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-http2.tfvars @@ -0,0 +1,19 @@ +project_id = "my-project" +region = "europe-west1" +name = "nlb-test" +backends = [{ + group = "foo" + failover = false +}] + +health_check_config = { + http2 = { + host = "http2_host" + port = 3123 + port_name = "http2_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http2_request_path" + response = "http2_response" + } +} diff --git a/tests/modules/net_lb_ext/health-checks-http2.yaml b/tests/modules/net_lb_ext/health-checks-http2.yaml new file mode 100644 index 000000000..b5189a568 --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-http2.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: + - host: http2_host + port: 3123 + port_name: http2_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http2_request_path + response: http2_response + http_health_check: [] + https_health_check: [] + name: nlb-test + project: my-project + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_ext/health-checks-https.tfvars b/tests/modules/net_lb_ext/health-checks-https.tfvars new file mode 100644 index 000000000..216184287 --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-https.tfvars @@ -0,0 +1,19 @@ +project_id = "my-project" +region = "europe-west1" +name = "nlb-test" +backends = [{ + group = "foo" + failover = false +}] + +health_check_config = { + https = { + host = "https_host" + port = 4123 + port_name = "https_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "https_request_path" + response = "https_response" + } +} diff --git a/tests/modules/net_lb_ext/health-checks-https.yaml b/tests/modules/net_lb_ext/health-checks-https.yaml new file mode 100644 index 000000000..b184a3eaa --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-https.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: + - host: https_host + port: 4123 + port_name: https_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: https_request_path + response: https_response + name: nlb-test + project: my-project + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_ext/health-checks-ssl.tfvars b/tests/modules/net_lb_ext/health-checks-ssl.tfvars new file mode 100644 index 000000000..926a4f32d --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-ssl.tfvars @@ -0,0 +1,18 @@ +project_id = "my-project" +region = "europe-west1" +name = "nlb-test" +backends = [{ + group = "foo" + failover = false +}] + +health_check_config = { + ssl = { + port = 6123 + port_name = "ssl_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "ssl_request" + response = "ssl_response" + } +} diff --git a/tests/modules/net_lb_ext/health-checks-ssl.yaml b/tests/modules/net_lb_ext/health-checks-ssl.yaml new file mode 100644 index 000000000..9cbc747c2 --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-ssl.yaml @@ -0,0 +1,39 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: nlb-test + project: my-project + ssl_health_check: + - port: 6123 + port_name: ssl_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: ssl_request + response: ssl_response + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_ext/health-checks-tcp.tfvars b/tests/modules/net_lb_ext/health-checks-tcp.tfvars new file mode 100644 index 000000000..c8da168bb --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-tcp.tfvars @@ -0,0 +1,18 @@ +project_id = "my-project" +region = "europe-west1" +name = "nlb-test" +backends = [{ + group = "foo" + failover = false +}] + +health_check_config = { + tcp = { + port = 5123 + port_name = "tcp_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "tcp_request" + response = "tcp_response" + } +} diff --git a/tests/modules/net_lb_ext/health-checks-tcp.yaml b/tests/modules/net_lb_ext/health-checks-tcp.yaml new file mode 100644 index 000000000..fa7fca99d --- /dev/null +++ b/tests/modules/net_lb_ext/health-checks-tcp.yaml @@ -0,0 +1,39 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: nlb-test + project: my-project + ssl_health_check: [] + tcp_health_check: + - port: 5123 + port_name: tcp_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: tcp_request + response: tcp_response + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_ext/tftest.yaml b/tests/modules/net_lb_ext/tftest.yaml index c219e478d..c223ec1e8 100644 --- a/tests/modules/net_lb_ext/tftest.yaml +++ b/tests/modules/net_lb_ext/tftest.yaml @@ -18,3 +18,9 @@ tests: defaults: dual-stack: forwarding-rule: + health-checks-grpc: + health-checks-http: + health-checks-http2: + health-checks-https: + health-checks-ssl: + health-checks-tcp: diff --git a/tests/modules/net_lb_int/health-checks-grpc.tfvars b/tests/modules/net_lb_int/health-checks-grpc.tfvars new file mode 100644 index 000000000..78975d015 --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-grpc.tfvars @@ -0,0 +1,19 @@ +project_id = "my-project" +region = "europe-west1" +name = "ilb-test" +vpc_config = { + network = "default" + subnetwork = "default" +} +backends = [{ + group = "foo" + failover = false +}] +health_check_config = { + grpc = { + port = 1123 + port_name = "grpc_port_name" + port_specification = "USE_FIXED_PORT" + service_name = "grpc_service_name" + } +} diff --git a/tests/modules/net_lb_int/health-checks-grpc.yaml b/tests/modules/net_lb_int/health-checks-grpc.yaml new file mode 100644 index 000000000..8b15ac693 --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-grpc.yaml @@ -0,0 +1,38 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: + - grpc_service_name: grpc_service_name + port: 1123 + port_name: grpc_port_name + port_specification: USE_FIXED_PORT + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: ilb-test + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_int/health-checks-http.tfvars b/tests/modules/net_lb_int/health-checks-http.tfvars new file mode 100644 index 000000000..7bc933fdb --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-http.tfvars @@ -0,0 +1,22 @@ +project_id = "my-project" +region = "europe-west1" +name = "ilb-test" +vpc_config = { + network = "default" + subnetwork = "default" +} +backends = [{ + group = "foo" + failover = false +}] +health_check_config = { + http = { + host = "http_host" + port = 2123 + port_name = "http_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http_request_path" + response = "http_response" + } +} diff --git a/tests/modules/net_lb_int/health-checks-http.yaml b/tests/modules/net_lb_int/health-checks-http.yaml new file mode 100644 index 000000000..b2c9fe915 --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-http.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: + - host: http_host + port: 2123 + port_name: http_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http_request_path + response: http_response + https_health_check: [] + name: ilb-test + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_int/health-checks-http2.tfvars b/tests/modules/net_lb_int/health-checks-http2.tfvars new file mode 100644 index 000000000..2fdcbee4c --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-http2.tfvars @@ -0,0 +1,22 @@ +project_id = "my-project" +region = "europe-west1" +name = "ilb-test" +vpc_config = { + network = "default" + subnetwork = "default" +} +backends = [{ + group = "foo" + failover = false +}] +health_check_config = { + http2 = { + host = "http2_host" + port = 3123 + port_name = "http2_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http2_request_path" + response = "http2_response" + } +} diff --git a/tests/modules/net_lb_int/health-checks-http2.yaml b/tests/modules/net_lb_int/health-checks-http2.yaml new file mode 100644 index 000000000..ddbdaaab9 --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-http2.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: + - host: http2_host + port: 3123 + port_name: http2_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http2_request_path + response: http2_response + http_health_check: [] + https_health_check: [] + name: ilb-test + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_int/health-checks-https.tfvars b/tests/modules/net_lb_int/health-checks-https.tfvars new file mode 100644 index 000000000..0863d0340 --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-https.tfvars @@ -0,0 +1,22 @@ +project_id = "my-project" +region = "europe-west1" +name = "ilb-test" +vpc_config = { + network = "default" + subnetwork = "default" +} +backends = [{ + group = "foo" + failover = false +}] +health_check_config = { + https = { + host = "https_host" + port = 4123 + port_name = "https_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "https_request_path" + response = "https_response" + } +} diff --git a/tests/modules/net_lb_int/health-checks-https.yaml b/tests/modules/net_lb_int/health-checks-https.yaml new file mode 100644 index 000000000..33928296c --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-https.yaml @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: + - host: https_host + port: 4123 + port_name: https_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: https_request_path + response: https_response + name: ilb-test + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_int/health-checks-ssl.tfvars b/tests/modules/net_lb_int/health-checks-ssl.tfvars new file mode 100644 index 000000000..e895bf5f3 --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-ssl.tfvars @@ -0,0 +1,21 @@ +project_id = "my-project" +region = "europe-west1" +name = "ilb-test" +vpc_config = { + network = "default" + subnetwork = "default" +} +backends = [{ + group = "foo" + failover = false +}] +health_check_config = { + ssl = { + port = 6123 + port_name = "ssl_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "ssl_request" + response = "ssl_response" + } +} diff --git a/tests/modules/net_lb_int/health-checks-ssl.yaml b/tests/modules/net_lb_int/health-checks-ssl.yaml new file mode 100644 index 000000000..19e340d33 --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-ssl.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: ilb-test + project: my-project + source_regions: null + ssl_health_check: + - port: 6123 + port_name: ssl_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: ssl_request + response: ssl_response + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_int/health-checks-tcp.tfvars b/tests/modules/net_lb_int/health-checks-tcp.tfvars new file mode 100644 index 000000000..73fd07574 --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-tcp.tfvars @@ -0,0 +1,21 @@ +project_id = "my-project" +region = "europe-west1" +name = "ilb-test" +vpc_config = { + network = "default" + subnetwork = "default" +} +backends = [{ + group = "foo" + failover = false +}] +health_check_config = { + tcp = { + port = 5123 + port_name = "tcp_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "tcp_request" + response = "tcp_response" + } +} diff --git a/tests/modules/net_lb_int/health-checks-tcp.yaml b/tests/modules/net_lb_int/health-checks-tcp.yaml new file mode 100644 index 000000000..8f5499c90 --- /dev/null +++ b/tests/modules/net_lb_int/health-checks-tcp.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: ilb-test + project: my-project + source_regions: null + ssl_health_check: [] + tcp_health_check: + - port: 5123 + port_name: tcp_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: tcp_request + response: tcp_response + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_health_check: 1 diff --git a/tests/modules/net_lb_int/tftest.yaml b/tests/modules/net_lb_int/tftest.yaml index 0837391d7..48254efb8 100644 --- a/tests/modules/net_lb_int/tftest.yaml +++ b/tests/modules/net_lb_int/tftest.yaml @@ -18,3 +18,9 @@ tests: context: defaults: forwarding-rule: + health-checks-grpc: + health-checks-http: + health-checks-http2: + health-checks-https: + health-checks-ssl: + health-checks-tcp: diff --git a/tests/modules/net_lb_proxy_int/common.tfvars b/tests/modules/net_lb_proxy_int/common.tfvars new file mode 100644 index 000000000..32f84db9c --- /dev/null +++ b/tests/modules/net_lb_proxy_int/common.tfvars @@ -0,0 +1,12 @@ +name = "hc-test-0" +project_id = "my-project" +region = "europe-west4" +backend_service_config = { + backends = [{ + group = "projects/myprj/zones/europe-west4-a/instanceGroups/my-ig" + }] +} +vpc_config = { + network = "network" + subnetwork = "subnet" +} diff --git a/tests/modules/net_lb_proxy_int/health-checks-grpc.tfvars b/tests/modules/net_lb_proxy_int/health-checks-grpc.tfvars new file mode 100644 index 000000000..8ae52d8b1 --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-grpc.tfvars @@ -0,0 +1,8 @@ +health_check_config = { + grpc = { + port = 1123 + port_name = "grpc_port_name" + port_specification = "USE_FIXED_PORT" + service_name = "grpc_service_name" + } +} diff --git a/tests/modules/net_lb_proxy_int/health-checks-grpc.yaml b/tests/modules/net_lb_proxy_int/health-checks-grpc.yaml new file mode 100644 index 000000000..18f02fc53 --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-grpc.yaml @@ -0,0 +1,37 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: + - grpc_service_name: grpc_service_name + port: 1123 + port_name: grpc_port_name + port_specification: USE_FIXED_PORT + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0 + project: my-project + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_proxy_int/health-checks-http.tfvars b/tests/modules/net_lb_proxy_int/health-checks-http.tfvars new file mode 100644 index 000000000..8b010c0e1 --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-http.tfvars @@ -0,0 +1,11 @@ +health_check_config = { + http = { + host = "http_host" + port = 2123 + port_name = "http_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http_request_path" + response = "http_response" + } +} diff --git a/tests/modules/net_lb_proxy_int/health-checks-http.yaml b/tests/modules/net_lb_proxy_int/health-checks-http.yaml new file mode 100644 index 000000000..324633acc --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-http.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: + - host: http_host + port: 2123 + port_name: http_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http_request_path + response: http_response + https_health_check: [] + name: hc-test-0 + project: my-project + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_proxy_int/health-checks-http2.tfvars b/tests/modules/net_lb_proxy_int/health-checks-http2.tfvars new file mode 100644 index 000000000..705695faf --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-http2.tfvars @@ -0,0 +1,11 @@ +health_check_config = { + http2 = { + host = "http2_host" + port = 3123 + port_name = "http2_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "http2_request_path" + response = "http2_response" + } +} diff --git a/tests/modules/net_lb_proxy_int/health-checks-http2.yaml b/tests/modules/net_lb_proxy_int/health-checks-http2.yaml new file mode 100644 index 000000000..31210c2b5 --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-http2.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: + - host: http2_host + port: 3123 + port_name: http2_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: http2_request_path + response: http2_response + http_health_check: [] + https_health_check: [] + name: hc-test-0 + project: my-project + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_proxy_int/health-checks-https.tfvars b/tests/modules/net_lb_proxy_int/health-checks-https.tfvars new file mode 100644 index 000000000..31197e1b7 --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-https.tfvars @@ -0,0 +1,11 @@ +health_check_config = { + https = { + host = "https_host" + port = 4123 + port_name = "https_port_name" + port_specification = "USE_FIXED_PORT" # USE_FIXED_PORT USE_NAMED_PORT USE_SERVING_PORT + proxy_header = "PROXY_V1" + request_path = "https_request_path" + response = "https_response" + } +} diff --git a/tests/modules/net_lb_proxy_int/health-checks-https.yaml b/tests/modules/net_lb_proxy_int/health-checks-https.yaml new file mode 100644 index 000000000..63c5c8bf6 --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-https.yaml @@ -0,0 +1,40 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: + - host: https_host + port: 4123 + port_name: https_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request_path: https_request_path + response: https_response + name: hc-test-0 + project: my-project + ssl_health_check: [] + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_proxy_int/health-checks-ssl.tfvars b/tests/modules/net_lb_proxy_int/health-checks-ssl.tfvars new file mode 100644 index 000000000..9e2daa4dc --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-ssl.tfvars @@ -0,0 +1,10 @@ +health_check_config = { + ssl = { + port = 6123 + port_name = "ssl_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "ssl_request" + response = "ssl_response" + } +} diff --git a/tests/modules/net_lb_proxy_int/health-checks-ssl.yaml b/tests/modules/net_lb_proxy_int/health-checks-ssl.yaml new file mode 100644 index 000000000..0b1f3e56b --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-ssl.yaml @@ -0,0 +1,39 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0 + project: my-project + ssl_health_check: + - port: 6123 + port_name: ssl_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: ssl_request + response: ssl_response + tcp_health_check: [] + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_proxy_int/health-checks-tcp.tfvars b/tests/modules/net_lb_proxy_int/health-checks-tcp.tfvars new file mode 100644 index 000000000..6dc7feca7 --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-tcp.tfvars @@ -0,0 +1,10 @@ +health_check_config = { + tcp = { + port = 5123 + port_name = "tcp_port_name" + port_specification = "USE_FIXED_PORT" + proxy_header = "PROXY_V1" + request = "tcp_request" + response = "tcp_response" + } +} diff --git a/tests/modules/net_lb_proxy_int/health-checks-tcp.yaml b/tests/modules/net_lb_proxy_int/health-checks-tcp.yaml new file mode 100644 index 000000000..32937c910 --- /dev/null +++ b/tests/modules/net_lb_proxy_int/health-checks-tcp.yaml @@ -0,0 +1,39 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + google_compute_region_health_check.default[0]: + check_interval_sec: 5 + description: Terraform managed. + grpc_health_check: [] + grpc_tls_health_check: [] + healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] + name: hc-test-0 + project: my-project + ssl_health_check: [] + tcp_health_check: + - port: 5123 + port_name: tcp_port_name + port_specification: USE_FIXED_PORT + proxy_header: PROXY_V1 + request: tcp_request + response: tcp_response + timeout_sec: 5 + timeouts: null + unhealthy_threshold: 2 +counts: + google_compute_region_health_check: 1 diff --git a/tests/modules/net_lb_proxy_int/tftest.yaml b/tests/modules/net_lb_proxy_int/tftest.yaml new file mode 100644 index 000000000..6e415fe09 --- /dev/null +++ b/tests/modules/net_lb_proxy_int/tftest.yaml @@ -0,0 +1,24 @@ +# Copyright 2023 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module: modules/net-lb-proxy-int +common_tfvars: +- common.tfvars +tests: + health-checks-grpc: + health-checks-http: + health-checks-http2: + health-checks-https: + health-checks-ssl: + health-checks-tcp: diff --git a/tests/modules/project_factory/examples/example.yaml b/tests/modules/project_factory/examples/example.yaml index 75e3736ee..5486cf544 100644 --- a/tests/modules/project_factory/examples/example.yaml +++ b/tests/modules/project_factory/examples/example.yaml @@ -96,7 +96,6 @@ values: credit_types: null credit_types_treatment: INCLUDE_ALL_CREDITS custom_period: [] - projects: null resource_ancestors: - folders/1234567890 subaccounts: null diff --git a/tools/lockfile/versions.tf b/tools/lockfile/versions.tf index a20ea4558..b78618413 100644 --- a/tools/lockfile/versions.tf +++ b/tools/lockfile/versions.tf @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.12.2" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/tools/lockfile:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/tools/lockfile:v49.2.0-tf" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/tools/lockfile:v49.1.0-tf" + module_name = "google-pso-tool/cloud-foundation-fabric/tools/lockfile:v49.2.0-tf" } } diff --git a/tools/lockfile/versions.tofu b/tools/lockfile/versions.tofu index 2c10d1654..a415349df 100644 --- a/tools/lockfile/versions.tofu +++ b/tools/lockfile/versions.tofu @@ -12,24 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v49.1.0 +# Fabric release: v49.2.0 terraform { required_version = ">= 1.10.0" required_providers { google = { source = "hashicorp/google" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 7.6.0, < 8.0.0" # tftest + version = ">= 7.12.0, < 8.0.0" # tftest } } provider_meta "google" { - module_name = "google-pso-tool/cloud-foundation-fabric/tools/lockfile:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/tools/lockfile:v49.2.0-tofu" } provider_meta "google-beta" { - module_name = "google-pso-tool/cloud-foundation-fabric/tools/lockfile:v49.1.0-tofu" + module_name = "google-pso-tool/cloud-foundation-fabric/tools/lockfile:v49.2.0-tofu" } }