diff --git a/blueprints/gke/patterns/autopilot-cluster/versions.tf b/blueprints/gke/patterns/autopilot-cluster/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/blueprints/gke/patterns/autopilot-cluster/versions.tf +++ b/blueprints/gke/patterns/autopilot-cluster/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/batch/versions.tf b/blueprints/gke/patterns/batch/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/blueprints/gke/patterns/batch/versions.tf +++ b/blueprints/gke/patterns/batch/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/kafka/versions.tf b/blueprints/gke/patterns/kafka/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/blueprints/gke/patterns/kafka/versions.tf +++ b/blueprints/gke/patterns/kafka/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/kong-cloudrun/versions.tf b/blueprints/gke/patterns/kong-cloudrun/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/blueprints/gke/patterns/kong-cloudrun/versions.tf +++ b/blueprints/gke/patterns/kong-cloudrun/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/mysql/versions.tf b/blueprints/gke/patterns/mysql/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/blueprints/gke/patterns/mysql/versions.tf +++ b/blueprints/gke/patterns/mysql/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/redis-cluster/versions.tf b/blueprints/gke/patterns/redis-cluster/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/blueprints/gke/patterns/redis-cluster/versions.tf +++ b/blueprints/gke/patterns/redis-cluster/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/default-versions.tf b/default-versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/default-versions.tf +++ b/default-versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/__experimental_deprecated/alloydb-instance/versions.tf b/modules/__experimental_deprecated/alloydb-instance/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/__experimental_deprecated/alloydb-instance/versions.tf +++ b/modules/__experimental_deprecated/alloydb-instance/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/__experimental_deprecated/net-neg/versions.tf b/modules/__experimental_deprecated/net-neg/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/__experimental_deprecated/net-neg/versions.tf +++ b/modules/__experimental_deprecated/net-neg/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/__experimental_deprecated/project-iam-magic/versions.tf b/modules/__experimental_deprecated/project-iam-magic/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/__experimental_deprecated/project-iam-magic/versions.tf +++ b/modules/__experimental_deprecated/project-iam-magic/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/alloydb/versions.tf b/modules/alloydb/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/alloydb/versions.tf +++ b/modules/alloydb/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/analytics-hub/versions.tf b/modules/analytics-hub/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/analytics-hub/versions.tf +++ b/modules/analytics-hub/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/api-gateway/versions.tf +++ b/modules/api-gateway/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/apigee/versions.tf +++ b/modules/apigee/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/artifact-registry/versions.tf +++ b/modules/artifact-registry/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/bigquery-dataset/versions.tf +++ b/modules/bigquery-dataset/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/bigtable-instance/versions.tf +++ b/modules/bigtable-instance/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/billing-account/versions.tf b/modules/billing-account/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/billing-account/versions.tf +++ b/modules/billing-account/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/binauthz/versions.tf +++ b/modules/binauthz/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/certificate-authority-service/versions.tf b/modules/certificate-authority-service/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/certificate-authority-service/versions.tf +++ b/modules/certificate-authority-service/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/certificate-manager/versions.tf b/modules/certificate-manager/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/certificate-manager/versions.tf +++ b/modules/certificate-manager/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/__need_fixing/onprem/versions.tf b/modules/cloud-config-container/__need_fixing/onprem/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-config-container/__need_fixing/onprem/versions.tf +++ b/modules/cloud-config-container/__need_fixing/onprem/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/__need_fixing/squid/versions.tf b/modules/cloud-config-container/__need_fixing/squid/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-config-container/__need_fixing/squid/versions.tf +++ b/modules/cloud-config-container/__need_fixing/squid/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/bindplane/versions.tf b/modules/cloud-config-container/bindplane/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-config-container/bindplane/versions.tf +++ b/modules/cloud-config-container/bindplane/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-config-container/coredns/versions.tf +++ b/modules/cloud-config-container/coredns/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/cos-generic-metadata/versions.tf b/modules/cloud-config-container/cos-generic-metadata/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-config-container/cos-generic-metadata/versions.tf +++ b/modules/cloud-config-container/cos-generic-metadata/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } 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 95252bbbdd..f569ce5af2 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,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/envoy-traffic-director/versions.tf b/modules/cloud-config-container/envoy-traffic-director/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-config-container/envoy-traffic-director/versions.tf +++ b/modules/cloud-config-container/envoy-traffic-director/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-config-container/mysql/versions.tf +++ b/modules/cloud-config-container/mysql/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/nginx-tls/versions.tf b/modules/cloud-config-container/nginx-tls/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-config-container/nginx-tls/versions.tf +++ b/modules/cloud-config-container/nginx-tls/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-config-container/nginx/versions.tf +++ b/modules/cloud-config-container/nginx/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/simple-nva/versions.tf b/modules/cloud-config-container/simple-nva/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-config-container/simple-nva/versions.tf +++ b/modules/cloud-config-container/simple-nva/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-function-v1/versions.tf b/modules/cloud-function-v1/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-function-v1/versions.tf +++ b/modules/cloud-function-v1/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-function-v2/versions.tf b/modules/cloud-function-v2/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-function-v2/versions.tf +++ b/modules/cloud-function-v2/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-identity-group/versions.tf b/modules/cloud-identity-group/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-identity-group/versions.tf +++ b/modules/cloud-identity-group/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-run-v2/README.md b/modules/cloud-run-v2/README.md index 3087171db1..5113dac268 100644 --- a/modules/cloud-run-v2/README.md +++ b/modules/cloud-run-v2/README.md @@ -1,6 +1,6 @@ # Cloud Run Module -Cloud Run Services and Jobs, with support for IAM roles and Eventarc trigger creation. +Cloud Run Services and Jobs, with support for IAM roles and Eventarc trigger creation. This module uses provider default value for `deletion_protection`, which means service is by default protected from removal (or reprovisioning). - [IAM and environment variables](#iam-and-environment-variables) @@ -48,6 +48,7 @@ module "cloud_run" { iam = { "roles/run.invoker" = ["allUsers"] } + deletion_protection = false } # tftest modules=2 resources=5 fixtures=fixtures/secret-credentials.tf inventory=service-iam-env.yaml e2e ``` @@ -77,6 +78,7 @@ module "cloud_run" { } } } + deletion_protection = false } # tftest modules=2 resources=4 fixtures=fixtures/secret-credentials.tf inventory=service-volume-secretes.yaml e2e ``` @@ -131,6 +133,7 @@ module "cloud_run" { egress = "ALL_TRAFFIC" } } + deletion_protection = false } # tftest modules=1 resources=2 fixtures=fixtures/vpc-connector.tf inventory=service-vpc-access-connector.yaml e2e ``` @@ -153,9 +156,10 @@ module "cloud_run" { network = var.vpc.self_link instances = { max = 10 - min = 2 + min = 3 } } + deletion_protection = false } # tftest modules=1 resources=2 inventory=service-vpc-access-connector-create.yaml e2e ``` @@ -179,7 +183,12 @@ module "cloud_run" { name = module.net-vpc-host.subnets["${var.region}/fixture-subnet-28"].name project_id = module.project-host.project_id } + throughput = { + max = 300 + min = 200 + } } + deletion_protection = false } # tftest modules=4 resources=55 fixtures=fixtures/shared-vpc.tf inventory=service-vpc-access-connector-create-sharedvpc.yaml e2e ``` @@ -230,6 +239,7 @@ module "cloud_run" { image = "us-docker.pkg.dev/cloudrun/container/hello" } } + deletion_protection = false } # tftest modules=3 resources=11 e2e ``` @@ -256,6 +266,7 @@ module "cloud_run" { topic-1 = module.pubsub.topic.name } } + deletion_protection = false } # tftest modules=2 resources=4 fixtures=fixtures/pubsub.tf inventory=service-eventarc-pubsub.yaml e2e ``` @@ -284,6 +295,7 @@ module "cloud_run" { } service_account_create = true } + deletion_protection = false } # tftest modules=1 resources=4 inventory=service-eventarc-auditlogs-sa-create.yaml ``` @@ -337,6 +349,7 @@ module "cloud_run" { } service_account_create = true } + deletion_protection = false } # tftest modules=2 resources=6 fixtures=fixtures/pubsub.tf inventory=service-eventarc-pubsub-sa-create.yaml e2e ``` @@ -357,6 +370,7 @@ module "cloud_run" { } } service_account_create = true + deletion_protection = false } # tftest modules=1 resources=2 inventory=service-sa-create.yaml e2e ``` @@ -374,7 +388,8 @@ module "cloud_run" { image = "us-docker.pkg.dev/cloudrun/container/hello" } } - service_account = module.iam-service-account.email + service_account = module.iam-service-account.email + deletion_protection = false } # tftest modules=2 resources=2 fixtures=fixtures/iam-service-account.tf inventory=service-external-sa.yaml e2e ``` @@ -465,25 +480,26 @@ module "cloud_run" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [name](variables.tf#L159) | Name used for Cloud Run service. | string | ✓ | | -| [project_id](variables.tf#L174) | Project id used for all resources. | string | ✓ | | -| [region](variables.tf#L179) | Region used for all resources. | string | ✓ | | +| [name](variables.tf#L165) | Name used for Cloud Run service. | string | ✓ | | +| [project_id](variables.tf#L180) | Project id used for all resources. | string | ✓ | | +| [region](variables.tf#L185) | Region used for all resources. | string | ✓ | | | [containers](variables.tf#L17) | Containers in name => attributes format. | map(object({…})) | | {} | | [create_job](variables.tf#L77) | Create Cloud Run Job instead of Service. | bool | | false | | [custom_audiences](variables.tf#L83) | Custom audiences for service. | list(string) | | null | -| [encryption_key](variables.tf#L89) | The full resource name of the Cloud KMS CryptoKey. | string | | null | -| [eventarc_triggers](variables.tf#L95) | Event arc triggers for different sources. | object({…}) | | {} | -| [iam](variables.tf#L113) | IAM bindings for Cloud Run service in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | -| [ingress](variables.tf#L119) | Ingress settings. | string | | null | -| [labels](variables.tf#L136) | Resource labels. | map(string) | | {} | -| [launch_stage](variables.tf#L142) | The launch stage as defined by Google Cloud Platform Launch Stages. | string | | null | -| [prefix](variables.tf#L164) | Optional prefix used for resource names. | string | | null | -| [revision](variables.tf#L184) | Revision template configurations. | object({…}) | | {} | -| [service_account](variables.tf#L211) | Service account email. Unused if service account is auto-created. | string | | null | -| [service_account_create](variables.tf#L217) | Auto-create service account. | bool | | false | -| [tag_bindings](variables.tf#L223) | Tag bindings for this service, in key => tag value id format. | map(string) | | {} | -| [volumes](variables.tf#L230) | Named volumes in containers in name => attributes format. | map(object({…})) | | {} | -| [vpc_connector_create](variables-vpcconnector.tf#L17) | Populate this to create a Serverless VPC Access connector. | object({…}) | | null | +| [deletion_protection](variables.tf#L89) | Deletion protection setting for this Cloud Run service. | string | | null | +| [encryption_key](variables.tf#L95) | The full resource name of the Cloud KMS CryptoKey. | string | | null | +| [eventarc_triggers](variables.tf#L101) | Event arc triggers for different sources. | object({…}) | | {} | +| [iam](variables.tf#L119) | IAM bindings for Cloud Run service in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | +| [ingress](variables.tf#L125) | Ingress settings. | string | | null | +| [labels](variables.tf#L142) | Resource labels. | map(string) | | {} | +| [launch_stage](variables.tf#L148) | The launch stage as defined by Google Cloud Platform Launch Stages. | string | | null | +| [prefix](variables.tf#L170) | Optional prefix used for resource names. | string | | null | +| [revision](variables.tf#L190) | Revision template configurations. | object({…}) | | {} | +| [service_account](variables.tf#L217) | Service account email. Unused if service account is auto-created. | string | | null | +| [service_account_create](variables.tf#L223) | Auto-create service account. | bool | | false | +| [tag_bindings](variables.tf#L229) | Tag bindings for this service, in key => tag value id format. | map(string) | | {} | +| [volumes](variables.tf#L236) | Named volumes in containers in name => attributes format. | map(object({…})) | | {} | +| [vpc_connector_create](variables-vpcconnector.tf#L17) | Populate this to create a Serverless VPC Access connector. | object({…}) | | null | ## Outputs diff --git a/modules/cloud-run-v2/job.tf b/modules/cloud-run-v2/job.tf index b0006fe70d..06d28bb4b8 100644 --- a/modules/cloud-run-v2/job.tf +++ b/modules/cloud-run-v2/job.tf @@ -1,5 +1,5 @@ /** - * Copyright 2023 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,13 +15,14 @@ */ resource "google_cloud_run_v2_job" "job" { - count = var.create_job ? 1 : 0 - provider = google-beta - project = var.project_id - location = var.region - name = "${local.prefix}${var.name}" - labels = var.labels - launch_stage = var.launch_stage + count = var.create_job ? 1 : 0 + provider = google-beta + project = var.project_id + location = var.region + name = "${local.prefix}${var.name}" + labels = var.labels + launch_stage = var.launch_stage + deletion_protection = var.deletion_protection template { template { encryption_key = var.encryption_key diff --git a/modules/cloud-run-v2/service.tf b/modules/cloud-run-v2/service.tf index a82a6dc83a..347068c652 100644 --- a/modules/cloud-run-v2/service.tf +++ b/modules/cloud-run-v2/service.tf @@ -209,6 +209,7 @@ resource "google_cloud_run_v2_service" "service" { } } + deletion_protection = var.deletion_protection lifecycle { ignore_changes = [ template[0].annotations["run.googleapis.com/operation-id"], @@ -231,4 +232,3 @@ resource "google_cloud_run_v2_service_iam_binding" "binding" { ) ) } - diff --git a/modules/cloud-run-v2/variables-vpcconnector.tf b/modules/cloud-run-v2/variables-vpcconnector.tf index 7a26187324..199f2d5bca 100644 --- a/modules/cloud-run-v2/variables-vpcconnector.tf +++ b/modules/cloud-run-v2/variables-vpcconnector.tf @@ -24,11 +24,13 @@ variable "vpc_connector_create" { instances = optional(object({ max = optional(number) min = optional(number) - }), {}) + }), {} + ) throughput = optional(object({ - max = optional(number, 1000) # workaround for a wrong default in provider + max = optional(number) min = optional(number) - }), {}) + }), {} + ) subnet = optional(object({ name = optional(string) project_id = optional(string) diff --git a/modules/cloud-run-v2/variables.tf b/modules/cloud-run-v2/variables.tf index ddd1bc04dd..a5cb55504a 100644 --- a/modules/cloud-run-v2/variables.tf +++ b/modules/cloud-run-v2/variables.tf @@ -86,6 +86,12 @@ variable "custom_audiences" { default = null } +variable "deletion_protection" { + description = "Deletion protection setting for this Cloud Run service." + type = string + default = null +} + variable "encryption_key" { description = "The full resource name of the Cloud KMS CryptoKey." type = string diff --git a/modules/cloud-run-v2/versions.tf b/modules/cloud-run-v2/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-run-v2/versions.tf +++ b/modules/cloud-run-v2/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloud-run/README.md b/modules/cloud-run/README.md index c392a07b76..2addd897fd 100644 --- a/modules/cloud-run/README.md +++ b/modules/cloud-run/README.md @@ -180,6 +180,9 @@ module "cloud_run" { } vpc_connector_create = { ip_cidr_range = "10.10.10.0/28" + throughput = { + max = 300 + } vpc_self_link = var.vpc.self_link } } diff --git a/modules/cloud-run/versions.tf b/modules/cloud-run/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloud-run/versions.tf +++ b/modules/cloud-run/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/cloudsql-instance/README.md b/modules/cloudsql-instance/README.md index bc46432b10..e64ed36fe0 100644 --- a/modules/cloudsql-instance/README.md +++ b/modules/cloudsql-instance/README.md @@ -366,7 +366,7 @@ module "db" { | [network_config](variables.tf#L184) | Network configuration for the instance. Only one between private_network and psc_config can be used. | object({…}) | ✓ | | | [project_id](variables.tf#L217) | The ID of the project where this instances will be created. | string | ✓ | | | [region](variables.tf#L222) | Region of the primary instance. | string | ✓ | | -| [tier](variables.tf#L265) | The machine type to use for the instances. | string | ✓ | | +| [tier](variables.tf#L264) | The machine type to use for the instances. | string | ✓ | | | [activation_policy](variables.tf#L16) | This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS. | string | | "ALWAYS" | | [availability_type](variables.tf#L27) | Availability type for the primary replica. Either `ZONAL` or `REGIONAL`. | string | | "ZONAL" | | [backup_configuration](variables.tf#L33) | Backup settings for primary instance. Will be automatically enabled if using MySQL with one or more replicas. | object({…}) | | {…} | @@ -387,10 +387,10 @@ module "db" { | [prefix](variables.tf#L207) | Optional prefix used to generate instance names. | string | | null | | [replicas](variables.tf#L227) | Map of NAME=> {REGION, KMS_KEY} for additional read replicas. Set to null to disable replica creation. | map(object({…})) | | {} | | [root_password](variables.tf#L236) | Root password of the Cloud SQL instance. Required for MS SQL Server. | string | | null | -| [ssl](variables.tf#L242) | Setting to enable SSL, set config and certificates. | object({…}) | | {} | -| [terraform_deletion_protection](variables.tf#L258) | Prevent terraform from deleting instances. | bool | | true | -| [time_zone](variables.tf#L270) | The time_zone to be used by the database engine (supported only for SQL Server), in SQL Server timezone format. | string | | null | -| [users](variables.tf#L276) | Map of users to create in the primary instance (and replicated to other replicas). For MySQL, anything after the first `@` (if present) will be used as the user's host. Set PASSWORD to null if you want to get an autogenerated password. The user types available are: 'BUILT_IN', 'CLOUD_IAM_USER' or 'CLOUD_IAM_SERVICE_ACCOUNT'. | map(object({…})) | | null | +| [ssl](variables.tf#L242) | Setting to enable SSL, set config and certificates. | object({…}) | | {} | +| [terraform_deletion_protection](variables.tf#L257) | Prevent terraform from deleting instances. | bool | | true | +| [time_zone](variables.tf#L269) | The time_zone to be used by the database engine (supported only for SQL Server), in SQL Server timezone format. | string | | null | +| [users](variables.tf#L275) | Map of users to create in the primary instance (and replicated to other replicas). For MySQL, anything after the first `@` (if present) will be used as the user's host. Set PASSWORD to null if you want to get an autogenerated password. The user types available are: 'BUILT_IN', 'CLOUD_IAM_USER' or 'CLOUD_IAM_SERVICE_ACCOUNT'. | map(object({…})) | | null | ## Outputs diff --git a/modules/cloudsql-instance/main.tf b/modules/cloudsql-instance/main.tf index 0201278f40..52f6ea5160 100644 --- a/modules/cloudsql-instance/main.tf +++ b/modules/cloudsql-instance/main.tf @@ -72,7 +72,6 @@ resource "google_sql_database_instance" "primary" { ipv4_enabled = var.network_config.connectivity.public_ipv4 private_network = try(var.network_config.connectivity.psa_config.private_network, null) allocated_ip_range = try(var.network_config.connectivity.psa_config.allocated_ip_ranges.primary, null) - require_ssl = var.ssl.require_ssl ssl_mode = var.ssl.ssl_mode dynamic "authorized_networks" { for_each = var.network_config.authorized_networks != null ? var.network_config.authorized_networks : {} diff --git a/modules/cloudsql-instance/variables.tf b/modules/cloudsql-instance/variables.tf index 613e106e74..83fd8dcff4 100644 --- a/modules/cloudsql-instance/variables.tf +++ b/modules/cloudsql-instance/variables.tf @@ -243,7 +243,6 @@ variable "ssl" { description = "Setting to enable SSL, set config and certificates." type = object({ client_certificates = optional(list(string)) - require_ssl = optional(bool) # More details @ https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/sql_database_instance#ssl_mode ssl_mode = optional(string) }) diff --git a/modules/cloudsql-instance/versions.tf b/modules/cloudsql-instance/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/cloudsql-instance/versions.tf +++ b/modules/cloudsql-instance/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/compute-mig/versions.tf b/modules/compute-mig/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/compute-mig/versions.tf +++ b/modules/compute-mig/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/compute-vm/main.tf b/modules/compute-vm/main.tf index 0e2da2b22d..a5a3295d0f 100644 --- a/modules/compute-vm/main.tf +++ b/modules/compute-vm/main.tf @@ -333,8 +333,6 @@ resource "google_compute_instance" "default" { resource_manager_tags = local.tags_combined } } - - # guest_accelerator } resource "google_compute_instance_iam_binding" "default" { diff --git a/modules/compute-vm/versions.tf b/modules/compute-vm/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/compute-vm/versions.tf +++ b/modules/compute-vm/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/container-registry/versions.tf b/modules/container-registry/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/container-registry/versions.tf +++ b/modules/container-registry/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/data-catalog-policy-tag/versions.tf b/modules/data-catalog-policy-tag/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/data-catalog-policy-tag/versions.tf +++ b/modules/data-catalog-policy-tag/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/data-catalog-tag-template/versions.tf b/modules/data-catalog-tag-template/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/data-catalog-tag-template/versions.tf +++ b/modules/data-catalog-tag-template/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/data-catalog-tag/versions.tf b/modules/data-catalog-tag/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/data-catalog-tag/versions.tf +++ b/modules/data-catalog-tag/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/dataform-repository/versions.tf b/modules/dataform-repository/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/dataform-repository/versions.tf +++ b/modules/dataform-repository/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/datafusion/versions.tf b/modules/datafusion/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/datafusion/versions.tf +++ b/modules/datafusion/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/dataplex-datascan/versions.tf b/modules/dataplex-datascan/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/dataplex-datascan/versions.tf +++ b/modules/dataplex-datascan/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/dataplex/versions.tf b/modules/dataplex/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/dataplex/versions.tf +++ b/modules/dataplex/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/dataproc/versions.tf b/modules/dataproc/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/dataproc/versions.tf +++ b/modules/dataproc/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/dns-response-policy/versions.tf b/modules/dns-response-policy/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/dns-response-policy/versions.tf +++ b/modules/dns-response-policy/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/dns/versions.tf b/modules/dns/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/dns/versions.tf +++ b/modules/dns/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/endpoints/versions.tf b/modules/endpoints/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/endpoints/versions.tf +++ b/modules/endpoints/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/firestore/versions.tf b/modules/firestore/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/firestore/versions.tf +++ b/modules/firestore/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/folder/README.md b/modules/folder/README.md index defc63b863..0bd81e0d5f 100644 --- a/modules/folder/README.md +++ b/modules/folder/README.md @@ -396,22 +396,23 @@ module "folder" { |---|---|:---:|:---:|:---:| | [assured_workload_config](variables.tf#L17) | Create AssuredWorkloads folder instead of regular folder when value is provided. Incompatible with folder_create=false. | object({…}) | | null | | [contacts](variables.tf#L70) | List of essential contacts for this resource. Must be in the form EMAIL -> [NOTIFICATION_TYPES]. Valid notification types are ALL, SUSPENSION, SECURITY, TECHNICAL, BILLING, LEGAL, PRODUCT_UPDATES. | map(list(string)) | | {} | -| [factories_config](variables.tf#L77) | Paths to data files and folders that enable factory functionality. | object({…}) | | {} | -| [firewall_policy](variables.tf#L86) | Hierarchical firewall policy to associate to this folder. | object({…}) | | null | -| [folder_create](variables.tf#L95) | Create folder. When set to false, uses id to reference an existing folder. | bool | | true | +| [deletion_protection](variables.tf#L77) | Deletion protection setting for this folder. | bool | | false | +| [factories_config](variables.tf#L83) | Paths to data files and folders that enable factory functionality. | object({…}) | | {} | +| [firewall_policy](variables.tf#L92) | Hierarchical firewall policy to associate to this folder. | object({…}) | | null | +| [folder_create](variables.tf#L101) | Create folder. When set to false, uses id to reference an existing folder. | bool | | true | | [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)) | | {} | -| [id](variables.tf#L101) | Folder ID in case you use folder_create=false. | string | | null | +| [id](variables.tf#L107) | Folder ID in case you use folder_create=false. | string | | null | | [logging_data_access](variables-logging.tf#L17) | Control activation of data access logs. Format is service => { log type => [exempted members]}. The special 'allServices' key denotes configuration for all services. | map(map(list(string))) | | {} | | [logging_exclusions](variables-logging.tf#L32) | Logging exclusions for this folder in the form {NAME -> FILTER}. | map(string) | | {} | | [logging_settings](variables-logging.tf#L39) | Default settings for logging resources. | object({…}) | | null | | [logging_sinks](variables-logging.tf#L49) | Logging sinks to create for the folder. | map(object({…})) | | {} | -| [name](variables.tf#L107) | Folder name. | string | | null | -| [org_policies](variables.tf#L113) | Organization policies applied to this folder keyed by policy name. | map(object({…})) | | {} | -| [parent](variables.tf#L140) | Parent in folders/folder_id or organizations/org_id format. | string | | null | -| [tag_bindings](variables.tf#L150) | Tag bindings for this folder, in key => tag value id format. | map(string) | | null | +| [name](variables.tf#L113) | Folder name. | string | | null | +| [org_policies](variables.tf#L119) | Organization policies applied to this folder keyed by policy name. | map(object({…})) | | {} | +| [parent](variables.tf#L146) | Parent in folders/folder_id or organizations/org_id format. | string | | null | +| [tag_bindings](variables.tf#L156) | Tag bindings for this folder, in key => tag value id format. | map(string) | | null | ## Outputs diff --git a/modules/folder/main.tf b/modules/folder/main.tf index 4f838b0131..7a387bc54d 100644 --- a/modules/folder/main.tf +++ b/modules/folder/main.tf @@ -37,9 +37,10 @@ locals { } resource "google_folder" "folder" { - count = var.folder_create && var.assured_workload_config == null ? 1 : 0 - display_name = var.name - parent = var.parent + count = var.folder_create && var.assured_workload_config == null ? 1 : 0 + display_name = var.name + parent = var.parent + deletion_protection = var.deletion_protection } resource "google_essential_contacts_contact" "contact" { diff --git a/modules/folder/variables.tf b/modules/folder/variables.tf index 1c899ab09a..0f1d294923 100644 --- a/modules/folder/variables.tf +++ b/modules/folder/variables.tf @@ -74,6 +74,12 @@ variable "contacts" { nullable = false } +variable "deletion_protection" { + description = "Deletion protection setting for this folder." + type = bool + default = false +} + variable "factories_config" { description = "Paths to data files and folders that enable factory functionality." type = object({ @@ -152,4 +158,3 @@ variable "tag_bindings" { type = map(string) default = null } - diff --git a/modules/folder/versions.tf b/modules/folder/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/folder/versions.tf +++ b/modules/folder/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/gcs/versions.tf b/modules/gcs/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/gcs/versions.tf +++ b/modules/gcs/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/gcve-private-cloud/versions.tf b/modules/gcve-private-cloud/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/gcve-private-cloud/versions.tf +++ b/modules/gcve-private-cloud/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/gke-cluster-autopilot/versions.tf b/modules/gke-cluster-autopilot/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/gke-cluster-autopilot/versions.tf +++ b/modules/gke-cluster-autopilot/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/gke-cluster-standard/README.md b/modules/gke-cluster-standard/README.md index 87f4e30922..beebe43c78 100644 --- a/modules/gke-cluster-standard/README.md +++ b/modules/gke-cluster-standard/README.md @@ -353,9 +353,9 @@ module "cluster-1" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| | [location](variables.tf#L242) | Cluster zone or region. | string | ✓ | | -| [name](variables.tf#L376) | Cluster name. | string | ✓ | | -| [project_id](variables.tf#L415) | Cluster project id. | string | ✓ | | -| [vpc_config](variables.tf#L426) | VPC-level configuration. | object({…}) | ✓ | | +| [name](variables.tf#L354) | Cluster name. | string | ✓ | | +| [project_id](variables.tf#L393) | Cluster project id. | string | ✓ | | +| [vpc_config](variables.tf#L404) | VPC-level configuration. | object({…}) | ✓ | | | [backup_configs](variables.tf#L18) | Configuration for Backup for GKE. | object({…}) | | {} | | [cluster_autoscaling](variables.tf#L40) | Enable and configure limits for Node Auto-Provisioning with Cluster Autoscaler. | object({…}) | | null | | [default_nodepool](variables.tf#L119) | Enable default nodepool. | object({…}) | | {} | @@ -369,11 +369,11 @@ module "cluster-1" { | [maintenance_config](variables.tf#L268) | Maintenance window configuration. | object({…}) | | {…} | | [max_pods_per_node](variables.tf#L291) | Maximum number of pods per node in this cluster. | number | | 110 | | [min_master_version](variables.tf#L297) | Minimum version of the master, defaults to the version of the most recent official release. | string | | null | -| [monitoring_config](variables.tf#L303) | Monitoring configuration. Google Cloud Managed Service for Prometheus is enabled by default. | object({…}) | | {} | -| [node_config](variables.tf#L381) | Node-level configuration. | object({…}) | | {} | -| [node_locations](variables.tf#L394) | Zones in which the cluster's nodes are located. | list(string) | | [] | -| [private_cluster_config](variables.tf#L401) | Private cluster configuration. | object({…}) | | null | -| [release_channel](variables.tf#L420) | Release channel for GKE upgrades. | string | | null | +| [monitoring_config](variables.tf#L303) | Monitoring configuration. Google Cloud Managed Service for Prometheus is enabled by default. | object({…}) | | {} | +| [node_config](variables.tf#L359) | Node-level configuration. | object({…}) | | {} | +| [node_locations](variables.tf#L372) | Zones in which the cluster's nodes are located. | list(string) | | [] | +| [private_cluster_config](variables.tf#L379) | Private cluster configuration. | object({…}) | | null | +| [release_channel](variables.tf#L398) | Release channel for GKE upgrades. | string | | null | ## Outputs diff --git a/modules/gke-cluster-standard/variables.tf b/modules/gke-cluster-standard/variables.tf index b13a26ebd8..33452039f5 100644 --- a/modules/gke-cluster-standard/variables.tf +++ b/modules/gke-cluster-standard/variables.tf @@ -319,7 +319,7 @@ variable "monitoring_config" { enable_managed_prometheus = optional(bool, true) advanced_datapath_observability = optional(object({ enable_metrics = bool - enable_relay = optional(bool) + enable_relay = bool })) }) default = {} @@ -349,28 +349,6 @@ variable "monitoring_config" { ]) ? var.monitoring_config.enable_managed_prometheus : true error_message = "Kube state metrics collection requires Google Cloud Managed Service for Prometheus to be enabled." } - validation { - condition = ( - try( - var.monitoring_config.advanced_datapath_observability.relay_mode, - null - ) == null - || - contains( - [ - "RELAY_MODE_UNSPECIFIED", - "DISABLED", - "INTERNAL_VPC_LB", - "EXTERNAL_LB" - ], - try( - var.monitoring_config.advanced_datapath_observability.relay_mode, - "" - ) - ) - ) - error_message = "Invalid relay mode value." - } } variable "name" { diff --git a/modules/gke-cluster-standard/versions.tf b/modules/gke-cluster-standard/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/gke-cluster-standard/versions.tf +++ b/modules/gke-cluster-standard/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/gke-hub/versions.tf b/modules/gke-hub/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/gke-hub/versions.tf +++ b/modules/gke-hub/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/gke-nodepool/versions.tf b/modules/gke-nodepool/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/gke-nodepool/versions.tf +++ b/modules/gke-nodepool/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/iam-service-account/versions.tf b/modules/iam-service-account/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/iam-service-account/versions.tf +++ b/modules/iam-service-account/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/kms/versions.tf b/modules/kms/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/kms/versions.tf +++ b/modules/kms/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/logging-bucket/versions.tf b/modules/logging-bucket/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/logging-bucket/versions.tf +++ b/modules/logging-bucket/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/ncc-spoke-ra/versions.tf b/modules/ncc-spoke-ra/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/ncc-spoke-ra/versions.tf +++ b/modules/ncc-spoke-ra/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-address/versions.tf b/modules/net-address/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-address/versions.tf +++ b/modules/net-address/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-cloudnat/versions.tf b/modules/net-cloudnat/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-cloudnat/versions.tf +++ b/modules/net-cloudnat/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-firewall-policy/versions.tf b/modules/net-firewall-policy/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-firewall-policy/versions.tf +++ b/modules/net-firewall-policy/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-ipsec-over-interconnect/versions.tf b/modules/net-ipsec-over-interconnect/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-ipsec-over-interconnect/versions.tf +++ b/modules/net-ipsec-over-interconnect/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-app-ext-regional/backend-service.tf b/modules/net-lb-app-ext-regional/backend-service.tf index f594d6e416..3ebc150641 100644 --- a/modules/net-lb-app-ext-regional/backend-service.tf +++ b/modules/net-lb-app-ext-regional/backend-service.tf @@ -197,6 +197,7 @@ resource "google_compute_region_backend_service" "default" { dynamic "iap" { 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 diff --git a/modules/net-lb-app-ext-regional/versions.tf b/modules/net-lb-app-ext-regional/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-lb-app-ext-regional/versions.tf +++ b/modules/net-lb-app-ext-regional/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-app-ext/backend-service.tf b/modules/net-lb-app-ext/backend-service.tf index d736d26a4c..87562dc017 100644 --- a/modules/net-lb-app-ext/backend-service.tf +++ b/modules/net-lb-app-ext/backend-service.tf @@ -199,6 +199,7 @@ resource "google_compute_backend_service" "default" { dynamic "iap" { 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 diff --git a/modules/net-lb-app-ext/versions.tf b/modules/net-lb-app-ext/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-lb-app-ext/versions.tf +++ b/modules/net-lb-app-ext/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } 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 ef4a718302..7b62f0a488 100644 --- a/modules/net-lb-app-int-cross-region/backend-service.tf +++ b/modules/net-lb-app-int-cross-region/backend-service.tf @@ -142,6 +142,7 @@ resource "google_compute_backend_service" "default" { dynamic "iap" { 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 diff --git a/modules/net-lb-app-int-cross-region/versions.tf b/modules/net-lb-app-int-cross-region/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-lb-app-int-cross-region/versions.tf +++ b/modules/net-lb-app-int-cross-region/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-app-int/backend-service.tf b/modules/net-lb-app-int/backend-service.tf index 9b5aaa8fd2..d4f5a8dee3 100644 --- a/modules/net-lb-app-int/backend-service.tf +++ b/modules/net-lb-app-int/backend-service.tf @@ -163,6 +163,7 @@ resource "google_compute_region_backend_service" "default" { dynamic "iap" { 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 diff --git a/modules/net-lb-app-int/versions.tf b/modules/net-lb-app-int/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-lb-app-int/versions.tf +++ b/modules/net-lb-app-int/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-ext/versions.tf b/modules/net-lb-ext/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-lb-ext/versions.tf +++ b/modules/net-lb-ext/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-int/versions.tf b/modules/net-lb-int/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-lb-int/versions.tf +++ b/modules/net-lb-int/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-proxy-int/versions.tf b/modules/net-lb-proxy-int/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-lb-proxy-int/versions.tf +++ b/modules/net-lb-proxy-int/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-swp/versions.tf b/modules/net-swp/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-swp/versions.tf +++ b/modules/net-swp/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-vlan-attachment/versions.tf b/modules/net-vlan-attachment/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-vlan-attachment/versions.tf +++ b/modules/net-vlan-attachment/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-vpc-firewall/versions.tf b/modules/net-vpc-firewall/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-vpc-firewall/versions.tf +++ b/modules/net-vpc-firewall/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-vpc-peering/versions.tf b/modules/net-vpc-peering/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-vpc-peering/versions.tf +++ b/modules/net-vpc-peering/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-vpc/versions.tf b/modules/net-vpc/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-vpc/versions.tf +++ b/modules/net-vpc/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-vpn-dynamic/versions.tf b/modules/net-vpn-dynamic/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-vpn-dynamic/versions.tf +++ b/modules/net-vpn-dynamic/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-vpn-ha/versions.tf b/modules/net-vpn-ha/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-vpn-ha/versions.tf +++ b/modules/net-vpn-ha/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/net-vpn-static/versions.tf b/modules/net-vpn-static/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/net-vpn-static/versions.tf +++ b/modules/net-vpn-static/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/organization/versions.tf b/modules/organization/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/organization/versions.tf +++ b/modules/organization/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/project/versions.tf b/modules/project/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/project/versions.tf +++ b/modules/project/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/projects-data-source/versions.tf b/modules/projects-data-source/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/projects-data-source/versions.tf +++ b/modules/projects-data-source/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/pubsub/versions.tf +++ b/modules/pubsub/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/secret-manager/versions.tf b/modules/secret-manager/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/secret-manager/versions.tf +++ b/modules/secret-manager/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/service-directory/versions.tf b/modules/service-directory/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/service-directory/versions.tf +++ b/modules/service-directory/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/source-repository/versions.tf b/modules/source-repository/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/source-repository/versions.tf +++ b/modules/source-repository/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/spanner-instance/versions.tf b/modules/spanner-instance/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/spanner-instance/versions.tf +++ b/modules/spanner-instance/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/vpc-sc/versions.tf b/modules/vpc-sc/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/vpc-sc/versions.tf +++ b/modules/vpc-sc/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/modules/workstation-cluster/versions.tf b/modules/workstation-cluster/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/modules/workstation-cluster/versions.tf +++ b/modules/workstation-cluster/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml b/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml index b915850370..87094a361c 100644 --- a/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml +++ b/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml @@ -14,14 +14,31 @@ values: module.f5-lb.module.bigip-vms["a"].google_compute_instance.default[0]: + advanced_machine_features: [] + allow_stopping_for_update: true + attached_disk: [] boot_disk: - - initialize_params: - - image: projects/f5-7626-networks-public/global/images/f5-bigip-15-1-2-1-0-0-10-byol-ltm-2boot-loc-210115160742 + - auto_delete: true + disk_encryption_key_raw: null + initialize_params: + - enable_confidential_compute: null + image: projects/f5-7626-networks-public/global/images/f5-bigip-15-1-2-1-0-0-10-byol-ltm-2boot-loc-210115160742 + resource_manager_tags: null size: 100 + storage_pool: null type: pd-ssd + mode: READ_WRITE can_ip_forward: true + deletion_protection: false description: Managed by the compute-vm Terraform module. + desired_status: null + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: false + hostname: null + labels: null machine_type: n2-standard-4 + metadata_startup_script: null name: test-lb-a network_interface: - access_config: [] @@ -30,35 +47,82 @@ values: subnetwork_range_name: ip-range-a ipv6_access_config: [] network: projects/my-project/global/networks/dataplane + nic_type: null + queue_count: null + security_policy: null stack_type: IPV4_ONLY subnetwork: projects/my-project/regions/europe-west1/subnetworks/dataplane - access_config: [] alias_ip_range: [] ipv6_access_config: [] network: projects/my-project/global/networks/management + nic_type: null + queue_count: null + security_policy: null stack_type: IPV4_ONLY subnetwork: projects/my-project/regions/europe-west1/subnetworks/management + network_performance_config: [] + params: [] + partner_metadata: null project: my-project + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + scratch_disk: [] + service_account: + - scopes: + - https://www.googleapis.com/auth/cloud-platform + - https://www.googleapis.com/auth/userinfo.email + shielded_instance_config: [] tags: null + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null zone: europe-west1-a module.f5-lb.module.bigip-vms["a"].google_compute_instance_group.unmanaged[0]: description: Managed by the compute-vm Terraform module. name: test-lb-a + named_port: [] network: projects/my-project/global/networks/dataplane project: my-project + timeouts: null zone: europe-west1-a module.f5-lb.module.bigip-vms["b"].google_compute_instance.default[0]: advanced_machine_features: [] allow_stopping_for_update: true attached_disk: [] boot_disk: - - initialize_params: - - image: projects/f5-7626-networks-public/global/images/f5-bigip-15-1-2-1-0-0-10-byol-ltm-2boot-loc-210115160742 + - auto_delete: true + disk_encryption_key_raw: null + initialize_params: + - enable_confidential_compute: null + image: projects/f5-7626-networks-public/global/images/f5-bigip-15-1-2-1-0-0-10-byol-ltm-2boot-loc-210115160742 + resource_manager_tags: null size: 100 + storage_pool: null type: pd-ssd + mode: READ_WRITE can_ip_forward: true + deletion_protection: false description: Managed by the compute-vm Terraform module. + desired_status: null + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: false + hostname: null + labels: null machine_type: n2-standard-4 + metadata_startup_script: null name: test-lb-b network_interface: - access_config: [] @@ -67,20 +131,47 @@ values: subnetwork_range_name: ip-range-b ipv6_access_config: [] network: projects/my-project/global/networks/dataplane + nic_type: null + queue_count: null + security_policy: null stack_type: IPV4_ONLY subnetwork: projects/my-project/regions/europe-west1/subnetworks/dataplane - access_config: [] alias_ip_range: [] ipv6_access_config: [] network: projects/my-project/global/networks/management + nic_type: null + queue_count: null + security_policy: null stack_type: IPV4_ONLY subnetwork: projects/my-project/regions/europe-west1/subnetworks/management + network_performance_config: [] + params: [] + partner_metadata: null project: my-project + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + scratch_disk: [] service_account: - scopes: - https://www.googleapis.com/auth/cloud-platform - https://www.googleapis.com/auth/userinfo.email + shielded_instance_config: [] tags: null + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null zone: europe-west1-b module.f5-lb.module.bigip-vms["b"].google_compute_instance_group.unmanaged[0]: description: Managed by the compute-vm Terraform module. @@ -88,118 +179,221 @@ values: named_port: [] network: projects/my-project/global/networks/dataplane project: my-project + timeouts: null zone: europe-west1-b module.f5-lb.module.lb-addresses.google_compute_address.external["ext-ipv4"]: address_type: EXTERNAL description: Terraform managed. + effective_labels: + goog-terraform-provisioned: 'true' ip_version: null ipv6_endpoint_type: null + labels: null name: test-nlb-ext-ipv4 + network: null project: my-project region: europe-west1 + subnetwork: projects/my-project/regions/europe-west1/subnetworks/dataplane + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null module.f5-lb.module.lb-addresses.google_compute_address.external["ext-ipv6"]: address_type: EXTERNAL description: Terraform managed. + effective_labels: + goog-terraform-provisioned: 'true' ip_version: IPV6 ipv6_endpoint_type: NETLB + labels: null name: test-nlb-ext-ipv6 + network: null project: my-project region: europe-west1 + subnetwork: projects/my-project/regions/europe-west1/subnetworks/dataplane + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null module.f5-lb.module.lb-addresses.google_compute_address.internal["int-ipv4"]: address_type: INTERNAL description: Terraform managed. + effective_labels: + goog-terraform-provisioned: 'true' ip_version: null ipv6_endpoint_type: null + labels: null name: test-ilb-int-ipv4 + network: null project: my-project region: europe-west1 subnetwork: projects/my-project/regions/europe-west1/subnetworks/dataplane + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null module.f5-lb.module.lb-addresses.google_compute_address.internal["int-ipv6"]: address_type: INTERNAL description: Terraform managed. + effective_labels: + goog-terraform-provisioned: 'true' ip_version: IPV6 ipv6_endpoint_type: null + labels: null name: test-ilb-int-ipv6 + network: null project: my-project region: europe-west1 subnetwork: projects/my-project/regions/europe-west1/subnetworks/dataplane + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null module.f5-lb.module.passthrough-ilb[0].google_compute_forwarding_rule.default["int-ipv4"]: all_ports: true allow_global_access: true + allow_psc_global_access: null + description: null ip_protocol: L3_DEFAULT ip_version: IPV4 + is_mirroring_collector: null + labels: null load_balancing_scheme: INTERNAL name: test-ilb-int-ipv4 network: projects/my-project/global/networks/dataplane + no_automate_dns_zone: null ports: null project: my-project + recreate_closed_psc: false region: europe-west1 + service_label: null + source_ip_ranges: null subnetwork: projects/my-project/regions/europe-west1/subnetworks/dataplane + target: null + timeouts: null module.f5-lb.module.passthrough-ilb[0].google_compute_forwarding_rule.default["int-ipv6"]: all_ports: true allow_global_access: true + allow_psc_global_access: null + description: null ip_protocol: L3_DEFAULT ip_version: IPV6 + is_mirroring_collector: null + labels: null load_balancing_scheme: INTERNAL name: test-ilb-int-ipv6 network: projects/my-project/global/networks/dataplane + no_automate_dns_zone: null ports: null project: my-project + recreate_closed_psc: false region: europe-west1 + service_label: null source_ip_ranges: null subnetwork: projects/my-project/regions/europe-west1/subnetworks/dataplane + target: null + timeouts: null module.f5-lb.module.passthrough-ilb[0].google_compute_health_check.default[0]: check_interval_sec: 5 description: Terraform managed. + grpc_health_check: [] healthy_threshold: 2 + http2_health_check: [] + http_health_check: [] + https_health_check: [] name: test-ilb project: my-project + source_regions: null + ssl_health_check: [] tcp_health_check: - port: 65535 port_name: null port_specification: USE_FIXED_PORT proxy_header: NONE + request: null + response: null timeout_sec: 5 + timeouts: null unhealthy_threshold: 2 module.f5-lb.module.passthrough-ilb[0].google_compute_region_backend_service.default: - connection_draining_timeout_sec: 0 + affinity_cookie_ttl_sec: null + circuit_breakers: [] + connection_draining_timeout_sec: 300 + connection_tracking_policy: [] + consistent_hash: [] description: Terraform managed. + enable_cdn: null + failover_policy: [] + iap: [] load_balancing_scheme: INTERNAL + locality_lb_policy: null name: test-ilb network: projects/my-project/global/networks/dataplane outlier_detection: [] project: my-project protocol: UNSPECIFIED region: europe-west1 + security_policy: null + subsetting: [] + timeouts: null module.f5-lb.module.passthrough-nlb[0].google_compute_forwarding_rule.default["ext-ipv4"]: all_ports: true allow_global_access: null + allow_psc_global_access: null + description: null ip_protocol: L3_DEFAULT ip_version: IPV4 + is_mirroring_collector: null + labels: null load_balancing_scheme: EXTERNAL name: test-nlb-ext-ipv4 + no_automate_dns_zone: null + ports: null project: my-project + recreate_closed_psc: false region: europe-west1 + service_label: null + source_ip_ranges: null + target: null + timeouts: null module.f5-lb.module.passthrough-nlb[0].google_compute_forwarding_rule.default["ext-ipv6"]: all_ports: true allow_global_access: null + allow_psc_global_access: null + description: null ip_protocol: L3_DEFAULT ip_version: IPV6 + is_mirroring_collector: null + labels: null load_balancing_scheme: EXTERNAL name: test-nlb-ext-ipv6 + no_automate_dns_zone: null ports: null project: my-project + recreate_closed_psc: false region: europe-west1 + service_label: null + source_ip_ranges: null subnetwork: projects/my-project/regions/europe-west1/subnetworks/ipv6_external + target: null + timeouts: null module.f5-lb.module.passthrough-nlb[0].google_compute_region_backend_service.default: - connection_draining_timeout_sec: 0 + affinity_cookie_ttl_sec: null + circuit_breakers: [] + connection_draining_timeout_sec: 300 + connection_tracking_policy: [] + consistent_hash: [] description: Terraform managed. + enable_cdn: null + failover_policy: [] + iap: [] load_balancing_scheme: EXTERNAL locality_lb_policy: null name: test-nlb + network: null + outlier_detection: [] project: my-project protocol: UNSPECIFIED region: europe-west1 + security_policy: null + subsetting: [] + timeouts: null module.f5-lb.module.passthrough-nlb[0].google_compute_region_health_check.default[0]: check_interval_sec: 5 description: Terraform managed. @@ -217,25 +411,83 @@ values: port_name: null port_specification: USE_FIXED_PORT proxy_header: NONE + request: null + response: null timeout_sec: 5 + timeouts: null unhealthy_threshold: 2 module.f5-lb.module.vm-addresses-dp.google_compute_address.internal["a"]: address_type: INTERNAL description: Terraform managed. + effective_labels: + goog-terraform-provisioned: 'true' ip_version: null ipv6_endpoint_type: null + labels: null name: test-a-dp network: null project: my-project region: europe-west1 subnetwork: projects/my-project/regions/europe-west1/subnetworks/dataplane + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + module.f5-lb.module.vm-addresses-dp.google_compute_address.internal["b"]: + address_type: INTERNAL + description: Terraform managed. + effective_labels: + goog-terraform-provisioned: 'true' + ip_version: null + ipv6_endpoint_type: null + labels: null + name: test-b-dp + network: null + project: my-project + region: europe-west1 + subnetwork: projects/my-project/regions/europe-west1/subnetworks/dataplane + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null module.f5-lb.module.vm-addresses-mgmt.google_compute_address.internal["a"]: address_type: INTERNAL description: Terraform managed. + effective_labels: + goog-terraform-provisioned: 'true' ip_version: null ipv6_endpoint_type: null + labels: null name: test-a-mgmt network: null project: my-project region: europe-west1 subnetwork: projects/my-project/regions/europe-west1/subnetworks/management + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + module.f5-lb.module.vm-addresses-mgmt.google_compute_address.internal["b"]: + address_type: INTERNAL + description: Terraform managed. + effective_labels: + goog-terraform-provisioned: 'true' + ip_version: null + ipv6_endpoint_type: null + labels: null + name: test-b-mgmt + network: null + project: my-project + region: europe-west1 + subnetwork: projects/my-project/regions/europe-west1/subnetworks/management + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + +counts: + google_compute_address: 8 + google_compute_forwarding_rule: 4 + google_compute_health_check: 1 + google_compute_instance: 2 + google_compute_instance_group: 2 + google_compute_region_backend_service: 2 + google_compute_region_health_check: 1 + modules: 8 + resources: 20 \ No newline at end of file diff --git a/tests/examples_e2e/setup_module/main.tf b/tests/examples_e2e/setup_module/main.tf index 6dcaaee088..accf880fd5 100644 --- a/tests/examples_e2e/setup_module/main.tf +++ b/tests/examples_e2e/setup_module/main.tf @@ -58,8 +58,9 @@ locals { } resource "google_folder" "folder" { - display_name = "E2E Tests ${var.timestamp}-${var.suffix}" - parent = var.parent + display_name = "E2E Tests ${var.timestamp}-${var.suffix}" + parent = var.parent + deletion_protection = false } resource "google_project" "project" { @@ -67,6 +68,7 @@ resource "google_project" "project" { billing_account = var.billing_account folder_id = google_folder.folder.id project_id = "${local.prefix}-prj" + deletion_policy = "DELETE" } resource "google_project_service" "project_service" { diff --git a/tests/examples_e2e/setup_module/versions.tf b/tests/examples_e2e/setup_module/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/tests/examples_e2e/setup_module/versions.tf +++ b/tests/examples_e2e/setup_module/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } } diff --git a/tests/modules/cloud_run/examples/connector-shared.yaml b/tests/modules/cloud_run/examples/connector-shared.yaml index edc9502993..abf86a014c 100644 --- a/tests/modules/cloud_run/examples/connector-shared.yaml +++ b/tests/modules/cloud_run/examples/connector-shared.yaml @@ -37,8 +37,6 @@ values: module.cloud_run.google_vpc_access_connector.connector[0]: ip_cidr_range: null machine_type: e2-micro - max_throughput: 300 - min_throughput: 200 name: hello project: project-id region: europe-west8 diff --git a/tests/modules/cloud_run/examples/connector.yaml b/tests/modules/cloud_run/examples/connector.yaml index de3aba22bd..3e0a526466 100644 --- a/tests/modules/cloud_run/examples/connector.yaml +++ b/tests/modules/cloud_run/examples/connector.yaml @@ -37,8 +37,6 @@ values: module.cloud_run.google_vpc_access_connector.connector[0]: ip_cidr_range: 10.10.10.0/28 machine_type: e2-micro - max_throughput: 300 - min_throughput: 200 name: hello network: projects/xxx/global/networks/aaa project: project-id diff --git a/tests/modules/cloud_run_v2/examples/service-iam-env.yaml b/tests/modules/cloud_run_v2/examples/service-iam-env.yaml index 6feb47a663..3572428ef9 100644 --- a/tests/modules/cloud_run_v2/examples/service-iam-env.yaml +++ b/tests/modules/cloud_run_v2/examples/service-iam-env.yaml @@ -13,47 +13,100 @@ # limitations under the License. values: + module.cloud_run.google_cloud_run_v2_service.service[0]: + annotations: null + binary_authorization: [] + client: null + client_version: null + custom_audiences: null + default_uri_disabled: null + deletion_protection: false + description: null + effective_labels: + goog-terraform-provisioned: 'true' + labels: null + location: europe-west8 + name: hello + project: project-id + scaling: [] + template: + - annotations: null + containers: + - args: null + command: null + depends_on: null + env: + - name: SECRET1 + value: '' + value_source: + - secret_key_ref: + - {} + - name: VAR1 + value: VALUE1 + value_source: [] + - name: VAR2 + value: VALUE2 + value_source: [] + image: us-docker.pkg.dev/cloudrun/container/hello + liveness_probe: [] + name: hello + volume_mounts: [] + working_dir: null + encryption_key: null + execution_environment: EXECUTION_ENVIRONMENT_GEN1 + labels: null + revision: null + session_affinity: null + volumes: [] + vpc_access: [] + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null module.cloud_run.google_cloud_run_v2_service_iam_binding.binding["roles/run.invoker"]: condition: [] location: europe-west8 - name: hello members: - - allUsers + - allUsers + name: hello project: project-id role: roles/run.invoker - module.cloud_run.google_cloud_run_v2_service.service[0]: - location: europe-west8 - name: hello + module.secret-manager.google_secret_manager_secret.default["credentials"]: + annotations: null + effective_labels: + goog-terraform-provisioned: 'true' + labels: null project: project-id - template: - - containers: - - args: null - command: null - depends_on: null - env: - - name: VAR1 - value: VALUE1 - value_source: [] - - name: VAR2 - value: VALUE2 - value_source: [] - - name: SECRET1 - value: null - value_source: - - secret_key_ref: - - {} - image: us-docker.pkg.dev/cloudrun/container/hello - name: hello - volume_mounts: [] - working_dir: null - execution_environment: EXECUTION_ENVIRONMENT_GEN1 - volumes: [] - vpc_access: [] + replication: + - auto: + - customer_managed_encryption: [] + user_managed: [] + rotation: [] + secret_id: credentials + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + topics: [] + ttl: null + version_aliases: null + version_destroy_ttl: null + module.secret-manager.google_secret_manager_secret_iam_binding.default["credentials.roles/secretmanager.secretAccessor"]: + condition: [] + members: + - serviceAccount:123-compute@developer.gserviceaccount.com + - serviceAccount:project-id@appspot.gserviceaccount.com + role: roles/secretmanager.secretAccessor + module.secret-manager.google_secret_manager_secret_version.default["credentials:v1"]: + deletion_policy: DELETE + enabled: true + is_secret_data_base64: false + secret_data: manual foo bar spam + timeouts: null counts: - google_cloud_run_v2_service_iam_binding: 1 google_cloud_run_v2_service: 1 + google_cloud_run_v2_service_iam_binding: 1 + google_secret_manager_secret: 1 + google_secret_manager_secret_iam_binding: 1 + google_secret_manager_secret_version: 1 modules: 2 resources: 5 - -outputs: {} diff --git a/tests/modules/cloud_run_v2/examples/service-vpc-access-connector-create-sharedvpc.yaml b/tests/modules/cloud_run_v2/examples/service-vpc-access-connector-create-sharedvpc.yaml index 728a2c828d..f3f660980b 100644 --- a/tests/modules/cloud_run_v2/examples/service-vpc-access-connector-create-sharedvpc.yaml +++ b/tests/modules/cloud_run_v2/examples/service-vpc-access-connector-create-sharedvpc.yaml @@ -31,7 +31,7 @@ values: module.cloud_run.google_vpc_access_connector.connector[0]: ip_cidr_range: null machine_type: e2-standard-4 - max_throughput: 1000 + max_throughput: 300 min_throughput: 200 name: hello project: test-service diff --git a/tests/modules/cloud_run_v2/examples/service-vpc-access-connector-create.yaml b/tests/modules/cloud_run_v2/examples/service-vpc-access-connector-create.yaml index 0a396a0634..5fd4c74e27 100644 --- a/tests/modules/cloud_run_v2/examples/service-vpc-access-connector-create.yaml +++ b/tests/modules/cloud_run_v2/examples/service-vpc-access-connector-create.yaml @@ -14,36 +14,56 @@ values: module.cloud_run.google_cloud_run_v2_service.service[0]: + annotations: null binary_authorization: [] + client: null + client_version: null + custom_audiences: null + default_uri_disabled: null + deletion_protection: false + description: null + effective_labels: + goog-terraform-provisioned: 'true' + labels: null location: europe-west8 name: hello project: project-id + scaling: [] template: - - containers: - - args: null - command: null - depends_on: null - env: [] - image: us-docker.pkg.dev/cloudrun/container/hello - name: hello - volume_mounts: [] - execution_environment: EXECUTION_ENVIRONMENT_GEN1 - volumes: [] + - annotations: null + containers: + - args: null + command: null + depends_on: null + env: [] + image: us-docker.pkg.dev/cloudrun/container/hello + liveness_probe: [] + name: hello + volume_mounts: [] + working_dir: null + encryption_key: null + execution_environment: EXECUTION_ENVIRONMENT_GEN1 + labels: null + revision: null + session_affinity: null + volumes: [] + terraform_labels: + goog-terraform-provisioned: 'true' timeouts: null module.cloud_run.google_vpc_access_connector.connector[0]: ip_cidr_range: 10.10.10.0/28 machine_type: e2-micro - max_throughput: 1000 + max_instances: 10 + min_instances: 3 name: hello network: projects/xxx/global/networks/aaa project: project-id region: europe-west8 subnet: [] + timeouts: null counts: google_cloud_run_v2_service: 1 google_vpc_access_connector: 1 modules: 1 resources: 2 - -outputs: {} diff --git a/tests/modules/cloudsql_instance/examples/simple.yaml b/tests/modules/cloudsql_instance/examples/simple.yaml index 3bbb5524ce..96885a3c84 100644 --- a/tests/modules/cloudsql_instance/examples/simple.yaml +++ b/tests/modules/cloudsql_instance/examples/simple.yaml @@ -43,7 +43,6 @@ values: enable_private_path_for_google_cloud_services: null ipv4_enabled: false psc_config: [] - require_ssl: null maintenance_window: [] password_validation_policy: [] pricing_plan: PER_USE diff --git a/tests/modules/gke_nodepool/examples/dws.yaml b/tests/modules/gke_nodepool/examples/dws.yaml index 59f0ca4870..07a770c3e5 100644 --- a/tests/modules/gke_nodepool/examples/dws.yaml +++ b/tests/modules/gke_nodepool/examples/dws.yaml @@ -29,7 +29,6 @@ values: gpu_driver_installation_config: - gpu_driver_version: LATEST gpu_partition_size: null - gpu_sharing_config: null type: nvidia-l4 gvnic: [] machine_type: g2-standard-4 diff --git a/tests/modules/gke_nodepool/examples/guest-accelerator.yaml b/tests/modules/gke_nodepool/examples/guest-accelerator.yaml index 8f50505479..ea63d37bfb 100644 --- a/tests/modules/gke_nodepool/examples/guest-accelerator.yaml +++ b/tests/modules/gke_nodepool/examples/guest-accelerator.yaml @@ -29,7 +29,6 @@ values: gpu_driver_installation_config: - gpu_driver_version: LATEST gpu_partition_size: null - gpu_sharing_config: null type: nvidia-tesla-a100 gvnic: [] machine_type: a2-highgpu-1g diff --git a/tests/modules/net_lb_ext/examples/dual_stack.yaml b/tests/modules/net_lb_ext/examples/dual_stack.yaml index 1b033f8df6..5687e51ef2 100644 --- a/tests/modules/net_lb_ext/examples/dual_stack.yaml +++ b/tests/modules/net_lb_ext/examples/dual_stack.yaml @@ -13,6 +13,154 @@ # limitations under the License. values: + module.compute-vm-group-b.google_compute_instance.default[0]: + advanced_machine_features: [] + allow_stopping_for_update: true + attached_disk: [] + boot_disk: + - auto_delete: true + disk_encryption_key_raw: null + initialize_params: + - enable_confidential_compute: null + image: cos-cloud/cos-stable + resource_manager_tags: null + size: 10 + storage_pool: null + type: pd-balanced + mode: READ_WRITE + can_ip_forward: false + deletion_protection: false + description: Managed by the compute-vm Terraform module. + desired_status: null + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: false + hostname: null + labels: null + machine_type: f1-micro + metadata: null + metadata_startup_script: null + name: my-ig-b + network_interface: + - access_config: [] + alias_ip_range: [] + ipv6_access_config: [] + network: projects/xxx/global/networks/aaa + nic_type: null + queue_count: null + security_policy: null + subnetwork: subnet_self_link + network_performance_config: [] + params: [] + partner_metadata: null + project: project-id + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + scratch_disk: [] + service_account: + - scopes: + - https://www.googleapis.com/auth/devstorage.read_only + - https://www.googleapis.com/auth/logging.write + - https://www.googleapis.com/auth/monitoring.write + shielded_instance_config: [] + tags: null + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + zone: europe-west8-b + module.compute-vm-group-b.google_compute_instance_group.unmanaged[0]: + description: Managed by the compute-vm Terraform module. + name: my-ig-b + named_port: [] + network: projects/xxx/global/networks/aaa + project: project-id + timeouts: null + zone: europe-west8-b + module.compute-vm-group-c.google_compute_instance.default[0]: + advanced_machine_features: [] + allow_stopping_for_update: true + attached_disk: [] + boot_disk: + - auto_delete: true + disk_encryption_key_raw: null + initialize_params: + - enable_confidential_compute: null + image: cos-cloud/cos-stable + resource_manager_tags: null + size: 10 + storage_pool: null + type: pd-balanced + mode: READ_WRITE + can_ip_forward: false + deletion_protection: false + description: Managed by the compute-vm Terraform module. + desired_status: null + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: false + hostname: null + labels: null + machine_type: f1-micro + metadata: null + metadata_startup_script: null + name: my-ig-c + network_interface: + - access_config: [] + alias_ip_range: [] + ipv6_access_config: [] + network: projects/xxx/global/networks/aaa + nic_type: null + queue_count: null + security_policy: null + subnetwork: subnet_self_link + network_performance_config: [] + params: [] + partner_metadata: null + project: project-id + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + scratch_disk: [] + service_account: + - scopes: + - https://www.googleapis.com/auth/devstorage.read_only + - https://www.googleapis.com/auth/logging.write + - https://www.googleapis.com/auth/monitoring.write + shielded_instance_config: [] + tags: null + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + zone: europe-west8-c + module.compute-vm-group-c.google_compute_instance_group.unmanaged[0]: + description: Managed by the compute-vm Terraform module. + name: my-ig-c + named_port: [] + network: projects/xxx/global/networks/aaa + project: project-id + timeouts: null + zone: europe-west8-c module.nlb.google_compute_forwarding_rule.default["ipv4"]: all_ports: true allow_global_access: null @@ -51,10 +199,17 @@ values: source_ip_ranges: null target: null timeouts: null + module.nlb.google_compute_instance_group.default["my-group"]: + description: Terraform managed. + name: nlb-test-my-group + named_port: [] + project: project-id + timeouts: null + zone: europe-west8-b module.nlb.google_compute_region_backend_service.default: affinity_cookie_ttl_sec: null circuit_breakers: [] - connection_draining_timeout_sec: 0 + connection_draining_timeout_sec: 300 connection_tracking_policy: [] consistent_hash: [] description: Terraform managed. @@ -97,7 +252,9 @@ values: counts: google_compute_forwarding_rule: 2 + google_compute_instance: 2 + google_compute_instance_group: 3 google_compute_region_backend_service: 1 google_compute_region_health_check: 1 modules: 3 - resources: 9 + resources: 9 \ No newline at end of file diff --git a/tests/modules/net_lb_ext/examples/e2e.yaml b/tests/modules/net_lb_ext/examples/e2e.yaml index 6b8faad0f6..79b91c6f44 100644 --- a/tests/modules/net_lb_ext/examples/e2e.yaml +++ b/tests/modules/net_lb_ext/examples/e2e.yaml @@ -13,6 +13,206 @@ # limitations under the License. values: + module.instance-group["b"].google_compute_instance.default[0]: + advanced_machine_features: [] + allow_stopping_for_update: true + attached_disk: [] + boot_disk: + - auto_delete: true + disk_encryption_key_raw: null + initialize_params: + - enable_confidential_compute: null + image: projects/cos-cloud/global/images/family/cos-stable + resource_manager_tags: null + size: 10 + storage_pool: null + type: pd-ssd + mode: READ_WRITE + can_ip_forward: false + deletion_protection: false + description: Managed by the compute-vm Terraform module. + desired_status: null + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: false + hostname: null + labels: null + machine_type: f1-micro + metadata: + user-data: "#cloud-config\n\n# Copyright 2023 Google LLC\n#\n# Licensed under\ + \ the Apache License, Version 2.0 (the \"License\");\n# you may not use this\ + \ file except in compliance with the License.\n# You may obtain a copy of\ + \ the License at\n#\n# https://www.apache.org/licenses/LICENSE-2.0\n#\n\ + # Unless required by applicable law or agreed to in writing, software\n# distributed\ + \ under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES\ + \ OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License\ + \ for the specific language governing permissions and\n# limitations under\ + \ the License.\n\n# https://hub.docker.com/r/nginx/nginx/\n# https://nginx.io/manual/toc/#installation\n\ + \nusers:\n - name: nginx\n uid: 2000\n \n\nwrite_files:\n - path: /var/lib/docker/daemon.json\n\ + \ permissions: 0644\n owner: root\n content: |\n {\n \ + \ \"live-restore\": true,\n \"storage-driver\": \"overlay2\",\n \ + \ \"log-opts\": {\n \"max-size\": \"1024m\"\n }\n \ + \ }\n\n\n # nginx container service\n - path: /etc/systemd/system/nginx.service\n\ + \ permissions: 0644\n owner: root\n content: |\n [Unit]\n \ + \ Description=Start nginx container\n After=gcr-online.target docker.socket\n\ + \ Wants=gcr-online.target docker.socket docker-events-collector.service\n\ + \ [Service]\n Environment=\"HOME=/home/nginx\"\n ExecStartPre=/usr/bin/docker-credential-gcr\ + \ configure-docker\n ExecStart=/usr/bin/docker run --rm --name=nginx\ + \ \\\n --network host \\\n nginxdemos/hello:plain-text\n \ + \ ExecStop=/usr/bin/docker stop nginx\n\n \n\nbootcmd:\n - systemctl\ + \ start node-problem-detector\n\nruncmd:\n - iptables -I INPUT 1 -p tcp -m\ + \ tcp --dport 80 -m state --state NEW,ESTABLISHED -j ACCEPT\n - systemctl\ + \ daemon-reload\n - systemctl start nginx\n" + metadata_startup_script: null + name: nlb-test-b + network_interface: + - access_config: [] + alias_ip_range: [] + ipv6_access_config: [] + network: projects/xxx/global/networks/aaa + nic_type: null + queue_count: null + security_policy: null + subnetwork: subnet_self_link + network_performance_config: [] + params: [] + partner_metadata: null + project: project-id + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + scratch_disk: [] + service_account: + - scopes: + - https://www.googleapis.com/auth/devstorage.read_only + - https://www.googleapis.com/auth/logging.write + - https://www.googleapis.com/auth/monitoring.write + shielded_instance_config: [] + tags: + - http-server + - ssh + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + zone: europe-west8-b + module.instance-group["b"].google_compute_instance_group.unmanaged[0]: + description: Managed by the compute-vm Terraform module. + name: nlb-test-b + named_port: [] + network: projects/xxx/global/networks/aaa + project: project-id + timeouts: null + zone: europe-west8-b + module.instance-group["c"].google_compute_instance.default[0]: + advanced_machine_features: [] + allow_stopping_for_update: true + attached_disk: [] + boot_disk: + - auto_delete: true + disk_encryption_key_raw: null + initialize_params: + - enable_confidential_compute: null + image: projects/cos-cloud/global/images/family/cos-stable + resource_manager_tags: null + size: 10 + storage_pool: null + type: pd-ssd + mode: READ_WRITE + can_ip_forward: false + deletion_protection: false + description: Managed by the compute-vm Terraform module. + desired_status: null + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: false + hostname: null + labels: null + machine_type: f1-micro + metadata: + user-data: "#cloud-config\n\n# Copyright 2023 Google LLC\n#\n# Licensed under\ + \ the Apache License, Version 2.0 (the \"License\");\n# you may not use this\ + \ file except in compliance with the License.\n# You may obtain a copy of\ + \ the License at\n#\n# https://www.apache.org/licenses/LICENSE-2.0\n#\n\ + # Unless required by applicable law or agreed to in writing, software\n# distributed\ + \ under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES\ + \ OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License\ + \ for the specific language governing permissions and\n# limitations under\ + \ the License.\n\n# https://hub.docker.com/r/nginx/nginx/\n# https://nginx.io/manual/toc/#installation\n\ + \nusers:\n - name: nginx\n uid: 2000\n \n\nwrite_files:\n - path: /var/lib/docker/daemon.json\n\ + \ permissions: 0644\n owner: root\n content: |\n {\n \ + \ \"live-restore\": true,\n \"storage-driver\": \"overlay2\",\n \ + \ \"log-opts\": {\n \"max-size\": \"1024m\"\n }\n \ + \ }\n\n\n # nginx container service\n - path: /etc/systemd/system/nginx.service\n\ + \ permissions: 0644\n owner: root\n content: |\n [Unit]\n \ + \ Description=Start nginx container\n After=gcr-online.target docker.socket\n\ + \ Wants=gcr-online.target docker.socket docker-events-collector.service\n\ + \ [Service]\n Environment=\"HOME=/home/nginx\"\n ExecStartPre=/usr/bin/docker-credential-gcr\ + \ configure-docker\n ExecStart=/usr/bin/docker run --rm --name=nginx\ + \ \\\n --network host \\\n nginxdemos/hello:plain-text\n \ + \ ExecStop=/usr/bin/docker stop nginx\n\n \n\nbootcmd:\n - systemctl\ + \ start node-problem-detector\n\nruncmd:\n - iptables -I INPUT 1 -p tcp -m\ + \ tcp --dport 80 -m state --state NEW,ESTABLISHED -j ACCEPT\n - systemctl\ + \ daemon-reload\n - systemctl start nginx\n" + metadata_startup_script: null + name: nlb-test-c + network_interface: + - access_config: [] + alias_ip_range: [] + ipv6_access_config: [] + network: projects/xxx/global/networks/aaa + nic_type: null + queue_count: null + security_policy: null + subnetwork: subnet_self_link + network_performance_config: [] + params: [] + partner_metadata: null + project: project-id + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + scratch_disk: [] + service_account: + - scopes: + - https://www.googleapis.com/auth/devstorage.read_only + - https://www.googleapis.com/auth/logging.write + - https://www.googleapis.com/auth/monitoring.write + shielded_instance_config: [] + tags: + - http-server + - ssh + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + zone: europe-west8-c + module.instance-group["c"].google_compute_instance_group.unmanaged[0]: + description: Managed by the compute-vm Terraform module. + name: nlb-test-c + named_port: [] + network: projects/xxx/global/networks/aaa + project: project-id + timeouts: null + zone: europe-west8-c module.nlb.google_compute_forwarding_rule.default[""]: all_ports: null allow_global_access: null @@ -36,7 +236,7 @@ values: module.nlb.google_compute_region_backend_service.default: affinity_cookie_ttl_sec: null circuit_breakers: [] - connection_draining_timeout_sec: 0 + connection_draining_timeout_sec: 300 connection_tracking_policy: [] consistent_hash: [] description: Terraform managed. @@ -80,6 +280,8 @@ values: counts: google_compute_forwarding_rule: 1 + google_compute_instance: 2 + google_compute_instance_group: 2 google_compute_region_backend_service: 1 google_compute_region_health_check: 1 modules: 3 diff --git a/tests/modules/net_lb_ext/examples/ext_migs.yaml b/tests/modules/net_lb_ext/examples/ext_migs.yaml index 85a40ed869..adf8e1b9e2 100644 --- a/tests/modules/net_lb_ext/examples/ext_migs.yaml +++ b/tests/modules/net_lb_ext/examples/ext_migs.yaml @@ -13,6 +13,154 @@ # limitations under the License. values: + module.compute-vm-group-b.google_compute_instance.default[0]: + advanced_machine_features: [] + allow_stopping_for_update: true + attached_disk: [] + boot_disk: + - auto_delete: true + disk_encryption_key_raw: null + initialize_params: + - enable_confidential_compute: null + image: cos-cloud/cos-stable + resource_manager_tags: null + size: 10 + storage_pool: null + type: pd-balanced + mode: READ_WRITE + can_ip_forward: false + deletion_protection: false + description: Managed by the compute-vm Terraform module. + desired_status: null + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: false + hostname: null + labels: null + machine_type: f1-micro + metadata: null + metadata_startup_script: null + name: my-ig-b + network_interface: + - access_config: [] + alias_ip_range: [] + ipv6_access_config: [] + network: projects/xxx/global/networks/aaa + nic_type: null + queue_count: null + security_policy: null + subnetwork: subnet_self_link + network_performance_config: [] + params: [] + partner_metadata: null + project: project-id + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + scratch_disk: [] + service_account: + - scopes: + - https://www.googleapis.com/auth/devstorage.read_only + - https://www.googleapis.com/auth/logging.write + - https://www.googleapis.com/auth/monitoring.write + shielded_instance_config: [] + tags: null + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + zone: europe-west8-b + module.compute-vm-group-b.google_compute_instance_group.unmanaged[0]: + description: Managed by the compute-vm Terraform module. + name: my-ig-b + named_port: [] + network: projects/xxx/global/networks/aaa + project: project-id + timeouts: null + zone: europe-west8-b + module.compute-vm-group-c.google_compute_instance.default[0]: + advanced_machine_features: [] + allow_stopping_for_update: true + attached_disk: [] + boot_disk: + - auto_delete: true + disk_encryption_key_raw: null + initialize_params: + - enable_confidential_compute: null + image: cos-cloud/cos-stable + resource_manager_tags: null + size: 10 + storage_pool: null + type: pd-balanced + mode: READ_WRITE + can_ip_forward: false + deletion_protection: false + description: Managed by the compute-vm Terraform module. + desired_status: null + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: false + hostname: null + labels: null + machine_type: f1-micro + metadata: null + metadata_startup_script: null + name: my-ig-c + network_interface: + - access_config: [] + alias_ip_range: [] + ipv6_access_config: [] + network: projects/xxx/global/networks/aaa + nic_type: null + queue_count: null + security_policy: null + subnetwork: subnet_self_link + network_performance_config: [] + params: [] + partner_metadata: null + project: project-id + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + scratch_disk: [] + service_account: + - scopes: + - https://www.googleapis.com/auth/devstorage.read_only + - https://www.googleapis.com/auth/logging.write + - https://www.googleapis.com/auth/monitoring.write + shielded_instance_config: [] + tags: null + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + zone: europe-west8-c + module.compute-vm-group-c.google_compute_instance_group.unmanaged[0]: + description: Managed by the compute-vm Terraform module. + name: my-ig-c + named_port: [] + network: projects/xxx/global/networks/aaa + project: project-id + timeouts: null + zone: europe-west8-c module.nlb.google_compute_forwarding_rule.default[""]: all_ports: true allow_global_access: null @@ -42,7 +190,7 @@ values: module.nlb.google_compute_region_backend_service.default: affinity_cookie_ttl_sec: null circuit_breakers: [] - connection_draining_timeout_sec: 0 + connection_draining_timeout_sec: 300 connection_tracking_policy: [] consistent_hash: [] description: Terraform managed. @@ -86,8 +234,9 @@ values: counts: google_compute_forwarding_rule: 1 + google_compute_instance: 2 google_compute_instance_group: 3 google_compute_region_backend_service: 1 google_compute_region_health_check: 1 modules: 3 - resources: 8 + resources: 8 \ No newline at end of file diff --git a/tests/modules/net_lb_ext/examples/fwd_rules.yaml b/tests/modules/net_lb_ext/examples/fwd_rules.yaml index 3b38fa518b..43a77fa360 100644 --- a/tests/modules/net_lb_ext/examples/fwd_rules.yaml +++ b/tests/modules/net_lb_ext/examples/fwd_rules.yaml @@ -13,6 +13,154 @@ # limitations under the License. values: + module.compute-vm-group-b.google_compute_instance.default[0]: + advanced_machine_features: [] + allow_stopping_for_update: true + attached_disk: [] + boot_disk: + - auto_delete: true + disk_encryption_key_raw: null + initialize_params: + - enable_confidential_compute: null + image: cos-cloud/cos-stable + resource_manager_tags: null + size: 10 + storage_pool: null + type: pd-balanced + mode: READ_WRITE + can_ip_forward: false + deletion_protection: false + description: Managed by the compute-vm Terraform module. + desired_status: null + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: false + hostname: null + labels: null + machine_type: f1-micro + metadata: null + metadata_startup_script: null + name: my-ig-b + network_interface: + - access_config: [] + alias_ip_range: [] + ipv6_access_config: [] + network: projects/xxx/global/networks/aaa + nic_type: null + queue_count: null + security_policy: null + subnetwork: subnet_self_link + network_performance_config: [] + params: [] + partner_metadata: null + project: project-id + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + scratch_disk: [] + service_account: + - scopes: + - https://www.googleapis.com/auth/devstorage.read_only + - https://www.googleapis.com/auth/logging.write + - https://www.googleapis.com/auth/monitoring.write + shielded_instance_config: [] + tags: null + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + zone: europe-west8-b + module.compute-vm-group-b.google_compute_instance_group.unmanaged[0]: + description: Managed by the compute-vm Terraform module. + name: my-ig-b + named_port: [] + network: projects/xxx/global/networks/aaa + project: project-id + timeouts: null + zone: europe-west8-b + module.compute-vm-group-c.google_compute_instance.default[0]: + advanced_machine_features: [] + allow_stopping_for_update: true + attached_disk: [] + boot_disk: + - auto_delete: true + disk_encryption_key_raw: null + initialize_params: + - enable_confidential_compute: null + image: cos-cloud/cos-stable + resource_manager_tags: null + size: 10 + storage_pool: null + type: pd-balanced + mode: READ_WRITE + can_ip_forward: false + deletion_protection: false + description: Managed by the compute-vm Terraform module. + desired_status: null + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: false + hostname: null + labels: null + machine_type: f1-micro + metadata: null + metadata_startup_script: null + name: my-ig-c + network_interface: + - access_config: [] + alias_ip_range: [] + ipv6_access_config: [] + network: projects/xxx/global/networks/aaa + nic_type: null + queue_count: null + security_policy: null + subnetwork: subnet_self_link + network_performance_config: [] + params: [] + partner_metadata: null + project: project-id + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + scratch_disk: [] + service_account: + - scopes: + - https://www.googleapis.com/auth/devstorage.read_only + - https://www.googleapis.com/auth/logging.write + - https://www.googleapis.com/auth/monitoring.write + shielded_instance_config: [] + tags: null + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + zone: europe-west8-c + module.compute-vm-group-c.google_compute_instance_group.unmanaged[0]: + description: Managed by the compute-vm Terraform module. + name: my-ig-c + named_port: [] + network: projects/xxx/global/networks/aaa + project: project-id + timeouts: null + zone: europe-west8-c module.nlb.google_compute_forwarding_rule.default["vip-one"]: all_ports: true allow_global_access: null @@ -62,7 +210,7 @@ values: module.nlb.google_compute_region_backend_service.default: affinity_cookie_ttl_sec: null circuit_breakers: [] - connection_draining_timeout_sec: 0 + connection_draining_timeout_sec: 300 connection_tracking_policy: [] consistent_hash: [] description: Terraform managed. @@ -105,8 +253,9 @@ values: counts: google_compute_forwarding_rule: 2 + google_compute_instance: 2 google_compute_instance_group: 3 google_compute_region_backend_service: 1 google_compute_region_health_check: 1 modules: 3 - resources: 9 + resources: 9 \ No newline at end of file diff --git a/tests/modules/net_lb_ext/examples/migs.yaml b/tests/modules/net_lb_ext/examples/migs.yaml index 93c93f058d..8807dc1b9b 100644 --- a/tests/modules/net_lb_ext/examples/migs.yaml +++ b/tests/modules/net_lb_ext/examples/migs.yaml @@ -13,6 +13,97 @@ # limitations under the License. values: + module._instance-template.google_compute_instance_template.default[0]: + advanced_machine_features: [] + can_ip_forward: false + description: Managed by the compute-vm Terraform module. + disk: + - auto_delete: true + boot: true + disk_encryption_key: [] + disk_name: null + disk_size_gb: 10 + disk_type: pd-balanced + labels: null + resource_manager_tags: null + resource_policies: null + source: null + source_image: projects/cos-cloud/global/images/family/cos-stable + source_image_encryption_key: [] + source_snapshot: null + source_snapshot_encryption_key: [] + effective_labels: + goog-terraform-provisioned: 'true' + enable_display: null + guest_accelerator: [] + instance_description: null + labels: null + machine_type: f1-micro + metadata: null + metadata_startup_script: null + min_cpu_platform: null + name_prefix: mig-e2e-template- + network_interface: + - access_config: [] + alias_ip_range: [] + ipv6_access_config: [] + network: projects/xxx/global/networks/aaa + network_ip: null + nic_type: null + queue_count: null + subnetwork: subnet_self_link + network_performance_config: [] + partner_metadata: null + project: project-id + region: europe-west8 + reservation_affinity: [] + resource_manager_tags: null + resource_policies: null + scheduling: + - automatic_restart: true + instance_termination_action: null + local_ssd_recovery_timeout: [] + maintenance_interval: null + max_run_duration: [] + min_node_cpus: null + node_affinities: [] + on_host_maintenance: MIGRATE + on_instance_stop_action: [] + preemptible: false + provisioning_model: STANDARD + service_account: + - scopes: + - https://www.googleapis.com/auth/devstorage.read_only + - https://www.googleapis.com/auth/logging.write + - https://www.googleapis.com/auth/monitoring.write + shielded_instance_config: [] + tags: + - http-server + - ssh + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null + module.compute-mig.google_compute_instance_group_manager.default[0]: + all_instances_config: [] + auto_healing_policies: [] + base_instance_name: mig-e2e-tests + description: Terraform managed. + list_managed_instances_results: PAGELESS + name: mig-e2e-tests + named_port: [] + params: [] + project: project-id + stateful_disk: [] + stateful_external_ip: [] + stateful_internal_ip: [] + target_pools: null + timeouts: null + version: + - name: default + target_size: [] + wait_for_instances: false + wait_for_instances_status: STABLE + zone: europe-west8-b module.nlb.google_compute_forwarding_rule.default[""]: all_ports: true allow_global_access: null @@ -35,7 +126,7 @@ values: module.nlb.google_compute_region_backend_service.default: affinity_cookie_ttl_sec: null circuit_breakers: [] - connection_draining_timeout_sec: 0 + connection_draining_timeout_sec: 300 connection_tracking_policy: [] consistent_hash: [] description: Terraform managed. @@ -79,7 +170,9 @@ values: counts: google_compute_forwarding_rule: 1 + google_compute_instance_group_manager: 1 + google_compute_instance_template: 1 google_compute_region_backend_service: 1 google_compute_region_health_check: 1 modules: 3 - resources: 5 + resources: 5 \ No newline at end of file diff --git a/tests/modules/net_lb_proxy_int/examples/zonal-neg.yaml b/tests/modules/net_lb_proxy_int/examples/zonal-neg.yaml index 2b45f9e1a8..e470319176 100644 --- a/tests/modules/net_lb_proxy_int/examples/zonal-neg.yaml +++ b/tests/modules/net_lb_proxy_int/examples/zonal-neg.yaml @@ -17,58 +17,93 @@ values: address: 10.0.0.10 address_type: INTERNAL description: null + effective_labels: + goog-terraform-provisioned: 'true' + ip_version: null + ipv6_endpoint_type: null + labels: null name: neg-test + network: null project: project-id region: europe-west1 subnetwork: subnet_self_link + terraform_labels: + goog-terraform-provisioned: 'true' + timeouts: null module.int-tcp-proxy.google_compute_forwarding_rule.default: + all_ports: null + allow_global_access: null + allow_psc_global_access: null + backend_service: null description: Terraform managed. ip_protocol: TCP + is_mirroring_collector: null + labels: null load_balancing_scheme: INTERNAL_MANAGED name: int-tcp-proxy network: projects/xxx/global/networks/aaa + no_automate_dns_zone: null port_range: '80' + ports: null project: project-id + recreate_closed_psc: false region: europe-west1 + service_label: null + source_ip_ranges: null subnetwork: subnet_self_link + timeouts: null module.int-tcp-proxy.google_compute_network_endpoint.default["my-neg-e-0"]: instance: test-1 ip_address: 10.0.0.10 network_endpoint_group: int-tcp-proxy-my-neg port: 80 project: project-id + timeouts: null zone: europe-west1-b module.int-tcp-proxy.google_compute_network_endpoint_group.default["my-neg"]: + default_port: null description: Terraform managed. name: int-tcp-proxy-my-neg network: projects/xxx/global/networks/aaa network_endpoint_type: GCE_VM_IP_PORT project: project-id subnetwork: subnet_self_link + timeouts: null zone: europe-west1-b module.int-tcp-proxy.google_compute_region_backend_service.default: + affinity_cookie_ttl_sec: null backend: - balancing_mode: CONNECTION capacity_scaler: 1 description: Terraform managed. failover: false + max_connections: null max_connections_per_endpoint: 10 + max_connections_per_instance: null + max_rate: null + max_rate_per_endpoint: null + max_rate_per_instance: null + max_utilization: null circuit_breakers: [] - connection_draining_timeout_sec: 0 + connection_draining_timeout_sec: 300 connection_tracking_policy: [] consistent_hash: [] description: Terraform managed. + enable_cdn: null failover_policy: [] iap: [] load_balancing_scheme: INTERNAL_MANAGED + locality_lb_policy: null name: int-tcp-proxy - network: null # TODO: ??? + network: null outlier_detection: [] project: project-id protocol: TCP region: europe-west1 + security_policy: null session_affinity: NONE subsetting: [] + timeouts: null module.int-tcp-proxy.google_compute_region_health_check.default[0]: check_interval_sec: 5 description: Terraform managed. @@ -89,6 +124,7 @@ values: request: null response: null timeout_sec: 5 + timeouts: null unhealthy_threshold: 2 module.int-tcp-proxy.google_compute_region_target_tcp_proxy.default: description: Terraform managed. @@ -96,3 +132,15 @@ values: project: project-id proxy_header: NONE region: europe-west1 + timeouts: null + +counts: + google_compute_address: 1 + google_compute_forwarding_rule: 1 + google_compute_network_endpoint: 1 + google_compute_network_endpoint_group: 1 + google_compute_region_backend_service: 1 + google_compute_region_health_check: 1 + google_compute_region_target_tcp_proxy: 1 + modules: 1 + resources: 7 \ No newline at end of file diff --git a/tools/lockfile/versions.tf b/tools/lockfile/versions.tf index 95252bbbdd..f569ce5af2 100644 --- a/tools/lockfile/versions.tf +++ b/tools/lockfile/versions.tf @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fabric release: v34.0.0 +# Fabric release: v35.0.0 terraform { required_version = ">= 1.7.4" required_providers { google = { source = "hashicorp/google" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.43.1, < 6.0.0" # tftest + version = ">= 6.1.0, < 7.0.0" # tftest } } }