From 16d5f999feb709da454b8c3fbe3a65e0022be433 Mon Sep 17 00:00:00 2001 From: Ludo Date: Fri, 22 Nov 2024 16:58:46 +0100 Subject: [PATCH] fix versions --- blueprints/gke/patterns/autopilot-cluster/versions.tf | 4 ---- blueprints/gke/patterns/batch/versions.tf | 4 ---- blueprints/gke/patterns/kafka/versions.tf | 4 ---- blueprints/gke/patterns/kong-cloudrun/versions.tf | 4 ---- blueprints/gke/patterns/mysql/versions.tf | 4 ---- blueprints/gke/patterns/redis-cluster/versions.tf | 4 ---- blueprints/secops/secops-gke-forwarder/versions.tf | 4 ---- .../__experimental_deprecated/alloydb-instance/versions.tf | 4 ---- modules/__experimental_deprecated/net-neg/versions.tf | 4 ---- .../__experimental_deprecated/project-iam-magic/versions.tf | 4 ---- modules/alloydb/versions.tf | 4 ---- modules/analytics-hub/versions.tf | 4 ---- modules/api-gateway/versions.tf | 4 ---- modules/apigee/versions.tf | 4 ---- modules/artifact-registry/versions.tf | 4 ---- modules/bigquery-dataset/versions.tf | 4 ---- modules/bigtable-instance/versions.tf | 4 ---- modules/billing-account/versions.tf | 4 ---- modules/binauthz/versions.tf | 4 ---- modules/certificate-authority-service/versions.tf | 4 ---- modules/certificate-manager/versions.tf | 4 ---- .../cloud-config-container/__need_fixing/onprem/versions.tf | 4 ---- .../cloud-config-container/__need_fixing/squid/versions.tf | 4 ---- modules/cloud-config-container/bindplane/versions.tf | 4 ---- modules/cloud-config-container/coredns/versions.tf | 4 ---- .../cloud-config-container/cos-generic-metadata/versions.tf | 4 ---- .../envoy-sni-dyn-fwd-proxy/versions.tf | 4 ---- .../cloud-config-container/envoy-traffic-director/versions.tf | 4 ---- modules/cloud-config-container/mysql/versions.tf | 4 ---- modules/cloud-config-container/nginx-tls/versions.tf | 4 ---- modules/cloud-config-container/nginx/versions.tf | 4 ---- modules/cloud-config-container/simple-nva/versions.tf | 4 ---- modules/cloud-function-v1/versions.tf | 4 ---- modules/cloud-function-v2/versions.tf | 4 ---- modules/cloud-identity-group/versions.tf | 4 ---- modules/cloud-run-v2/versions.tf | 4 ---- modules/cloud-run/versions.tf | 4 ---- modules/cloudsql-instance/versions.tf | 4 ---- modules/compute-mig/versions.tf | 4 ---- modules/compute-vm/versions.tf | 4 ---- modules/container-registry/versions.tf | 4 ---- modules/data-catalog-policy-tag/versions.tf | 4 ---- modules/data-catalog-tag-template/versions.tf | 4 ---- modules/data-catalog-tag/versions.tf | 4 ---- modules/dataform-repository/versions.tf | 4 ---- modules/datafusion/versions.tf | 4 ---- modules/dataplex-datascan/versions.tf | 4 ---- modules/dataplex/versions.tf | 4 ---- modules/dataproc/versions.tf | 4 ---- modules/dns-response-policy/versions.tf | 4 ---- modules/dns/versions.tf | 4 ---- modules/endpoints/versions.tf | 4 ---- modules/firestore/versions.tf | 4 ---- modules/folder/versions.tf | 4 ---- modules/gcs/versions.tf | 4 ---- modules/gcve-private-cloud/versions.tf | 4 ---- modules/gke-cluster-autopilot/versions.tf | 4 ---- modules/gke-cluster-standard/versions.tf | 4 ---- modules/gke-hub/versions.tf | 4 ---- modules/gke-nodepool/versions.tf | 4 ---- modules/iam-service-account/versions.tf | 4 ---- modules/kms/versions.tf | 4 ---- modules/logging-bucket/versions.tf | 4 ---- modules/looker-core/versions.tf | 4 ---- modules/ncc-spoke-ra/versions.tf | 4 ---- modules/net-address/versions.tf | 4 ---- modules/net-cloudnat/versions.tf | 4 ---- modules/net-firewall-policy/versions.tf | 4 ---- modules/net-ipsec-over-interconnect/versions.tf | 4 ---- modules/net-lb-app-ext-regional/versions.tf | 4 ---- modules/net-lb-app-ext/versions.tf | 4 ---- modules/net-lb-app-int-cross-region/versions.tf | 4 ---- modules/net-lb-app-int/versions.tf | 4 ---- modules/net-lb-ext/versions.tf | 4 ---- modules/net-lb-int/versions.tf | 4 ---- modules/net-lb-proxy-int/versions.tf | 4 ---- modules/net-swp/versions.tf | 4 ---- modules/net-vlan-attachment/versions.tf | 4 ---- modules/net-vpc-firewall/versions.tf | 4 ---- modules/net-vpc-peering/versions.tf | 4 ---- modules/net-vpc/versions.tf | 4 ---- modules/net-vpn-dynamic/versions.tf | 4 ---- modules/net-vpn-ha/versions.tf | 4 ---- modules/net-vpn-static/versions.tf | 4 ---- modules/organization/versions.tf | 4 ---- modules/project/versions.tf | 4 ---- modules/projects-data-source/versions.tf | 4 ---- modules/pubsub/versions.tf | 4 ---- modules/secret-manager/versions.tf | 4 ---- modules/secure-source-manager-instance/versions.tf | 4 ---- modules/service-directory/versions.tf | 4 ---- modules/source-repository/versions.tf | 4 ---- modules/spanner-instance/versions.tf | 4 ---- modules/vpc-sc/versions.tf | 4 ---- modules/workstation-cluster/versions.tf | 4 ---- tests/examples_e2e/setup_module/versions.tf | 4 ---- 96 files changed, 384 deletions(-) diff --git a/blueprints/gke/patterns/autopilot-cluster/versions.tf b/blueprints/gke/patterns/autopilot-cluster/versions.tf index d498075b01..3018c9bf93 100644 --- a/blueprints/gke/patterns/autopilot-cluster/versions.tf +++ b/blueprints/gke/patterns/autopilot-cluster/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/blueprints/gke/patterns/batch/versions.tf b/blueprints/gke/patterns/batch/versions.tf index d498075b01..3018c9bf93 100644 --- a/blueprints/gke/patterns/batch/versions.tf +++ b/blueprints/gke/patterns/batch/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/blueprints/gke/patterns/kafka/versions.tf b/blueprints/gke/patterns/kafka/versions.tf index d498075b01..3018c9bf93 100644 --- a/blueprints/gke/patterns/kafka/versions.tf +++ b/blueprints/gke/patterns/kafka/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/blueprints/gke/patterns/kong-cloudrun/versions.tf b/blueprints/gke/patterns/kong-cloudrun/versions.tf index d498075b01..3018c9bf93 100644 --- a/blueprints/gke/patterns/kong-cloudrun/versions.tf +++ b/blueprints/gke/patterns/kong-cloudrun/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/blueprints/gke/patterns/mysql/versions.tf b/blueprints/gke/patterns/mysql/versions.tf index d498075b01..3018c9bf93 100644 --- a/blueprints/gke/patterns/mysql/versions.tf +++ b/blueprints/gke/patterns/mysql/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/blueprints/gke/patterns/redis-cluster/versions.tf b/blueprints/gke/patterns/redis-cluster/versions.tf index d498075b01..3018c9bf93 100644 --- a/blueprints/gke/patterns/redis-cluster/versions.tf +++ b/blueprints/gke/patterns/redis-cluster/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/blueprints/secops/secops-gke-forwarder/versions.tf b/blueprints/secops/secops-gke-forwarder/versions.tf index d498075b01..3018c9bf93 100644 --- a/blueprints/secops/secops-gke-forwarder/versions.tf +++ b/blueprints/secops/secops-gke-forwarder/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/__experimental_deprecated/alloydb-instance/versions.tf b/modules/__experimental_deprecated/alloydb-instance/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/__experimental_deprecated/alloydb-instance/versions.tf +++ b/modules/__experimental_deprecated/alloydb-instance/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/__experimental_deprecated/net-neg/versions.tf b/modules/__experimental_deprecated/net-neg/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/__experimental_deprecated/net-neg/versions.tf +++ b/modules/__experimental_deprecated/net-neg/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/__experimental_deprecated/project-iam-magic/versions.tf b/modules/__experimental_deprecated/project-iam-magic/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/__experimental_deprecated/project-iam-magic/versions.tf +++ b/modules/__experimental_deprecated/project-iam-magic/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/alloydb/versions.tf b/modules/alloydb/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/alloydb/versions.tf +++ b/modules/alloydb/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/analytics-hub/versions.tf b/modules/analytics-hub/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/analytics-hub/versions.tf +++ b/modules/analytics-hub/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/api-gateway/versions.tf +++ b/modules/api-gateway/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/apigee/versions.tf +++ b/modules/apigee/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/artifact-registry/versions.tf +++ b/modules/artifact-registry/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/bigquery-dataset/versions.tf +++ b/modules/bigquery-dataset/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/bigtable-instance/versions.tf +++ b/modules/bigtable-instance/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/billing-account/versions.tf b/modules/billing-account/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/billing-account/versions.tf +++ b/modules/billing-account/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/binauthz/versions.tf +++ b/modules/binauthz/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/certificate-authority-service/versions.tf b/modules/certificate-authority-service/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/certificate-authority-service/versions.tf +++ b/modules/certificate-authority-service/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/certificate-manager/versions.tf b/modules/certificate-manager/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/certificate-manager/versions.tf +++ b/modules/certificate-manager/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-config-container/__need_fixing/onprem/versions.tf b/modules/cloud-config-container/__need_fixing/onprem/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-config-container/__need_fixing/onprem/versions.tf +++ b/modules/cloud-config-container/__need_fixing/onprem/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-config-container/__need_fixing/squid/versions.tf b/modules/cloud-config-container/__need_fixing/squid/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-config-container/__need_fixing/squid/versions.tf +++ b/modules/cloud-config-container/__need_fixing/squid/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-config-container/bindplane/versions.tf b/modules/cloud-config-container/bindplane/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-config-container/bindplane/versions.tf +++ b/modules/cloud-config-container/bindplane/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-config-container/coredns/versions.tf +++ b/modules/cloud-config-container/coredns/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-config-container/cos-generic-metadata/versions.tf b/modules/cloud-config-container/cos-generic-metadata/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-config-container/cos-generic-metadata/versions.tf +++ b/modules/cloud-config-container/cos-generic-metadata/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" 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 d498075b01..3018c9bf93 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,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-config-container/envoy-traffic-director/versions.tf b/modules/cloud-config-container/envoy-traffic-director/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-config-container/envoy-traffic-director/versions.tf +++ b/modules/cloud-config-container/envoy-traffic-director/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-config-container/mysql/versions.tf +++ b/modules/cloud-config-container/mysql/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-config-container/nginx-tls/versions.tf b/modules/cloud-config-container/nginx-tls/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-config-container/nginx-tls/versions.tf +++ b/modules/cloud-config-container/nginx-tls/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-config-container/nginx/versions.tf +++ b/modules/cloud-config-container/nginx/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-config-container/simple-nva/versions.tf b/modules/cloud-config-container/simple-nva/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-config-container/simple-nva/versions.tf +++ b/modules/cloud-config-container/simple-nva/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-function-v1/versions.tf b/modules/cloud-function-v1/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-function-v1/versions.tf +++ b/modules/cloud-function-v1/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-function-v2/versions.tf b/modules/cloud-function-v2/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-function-v2/versions.tf +++ b/modules/cloud-function-v2/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-identity-group/versions.tf b/modules/cloud-identity-group/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-identity-group/versions.tf +++ b/modules/cloud-identity-group/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-run-v2/versions.tf b/modules/cloud-run-v2/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-run-v2/versions.tf +++ b/modules/cloud-run-v2/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloud-run/versions.tf b/modules/cloud-run/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloud-run/versions.tf +++ b/modules/cloud-run/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/cloudsql-instance/versions.tf b/modules/cloudsql-instance/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/cloudsql-instance/versions.tf +++ b/modules/cloudsql-instance/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/compute-mig/versions.tf b/modules/compute-mig/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/compute-mig/versions.tf +++ b/modules/compute-mig/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/compute-vm/versions.tf b/modules/compute-vm/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/compute-vm/versions.tf +++ b/modules/compute-vm/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/container-registry/versions.tf b/modules/container-registry/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/container-registry/versions.tf +++ b/modules/container-registry/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/data-catalog-policy-tag/versions.tf b/modules/data-catalog-policy-tag/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/data-catalog-policy-tag/versions.tf +++ b/modules/data-catalog-policy-tag/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/data-catalog-tag-template/versions.tf b/modules/data-catalog-tag-template/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/data-catalog-tag-template/versions.tf +++ b/modules/data-catalog-tag-template/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/data-catalog-tag/versions.tf b/modules/data-catalog-tag/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/data-catalog-tag/versions.tf +++ b/modules/data-catalog-tag/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/dataform-repository/versions.tf b/modules/dataform-repository/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/dataform-repository/versions.tf +++ b/modules/dataform-repository/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/datafusion/versions.tf b/modules/datafusion/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/datafusion/versions.tf +++ b/modules/datafusion/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/dataplex-datascan/versions.tf b/modules/dataplex-datascan/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/dataplex-datascan/versions.tf +++ b/modules/dataplex-datascan/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/dataplex/versions.tf b/modules/dataplex/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/dataplex/versions.tf +++ b/modules/dataplex/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/dataproc/versions.tf b/modules/dataproc/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/dataproc/versions.tf +++ b/modules/dataproc/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/dns-response-policy/versions.tf b/modules/dns-response-policy/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/dns-response-policy/versions.tf +++ b/modules/dns-response-policy/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/dns/versions.tf b/modules/dns/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/dns/versions.tf +++ b/modules/dns/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/endpoints/versions.tf b/modules/endpoints/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/endpoints/versions.tf +++ b/modules/endpoints/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/firestore/versions.tf b/modules/firestore/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/firestore/versions.tf +++ b/modules/firestore/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/folder/versions.tf b/modules/folder/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/folder/versions.tf +++ b/modules/folder/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/gcs/versions.tf b/modules/gcs/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/gcs/versions.tf +++ b/modules/gcs/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/gcve-private-cloud/versions.tf b/modules/gcve-private-cloud/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/gcve-private-cloud/versions.tf +++ b/modules/gcve-private-cloud/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/gke-cluster-autopilot/versions.tf b/modules/gke-cluster-autopilot/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/gke-cluster-autopilot/versions.tf +++ b/modules/gke-cluster-autopilot/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/gke-cluster-standard/versions.tf b/modules/gke-cluster-standard/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/gke-cluster-standard/versions.tf +++ b/modules/gke-cluster-standard/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/gke-hub/versions.tf b/modules/gke-hub/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/gke-hub/versions.tf +++ b/modules/gke-hub/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/gke-nodepool/versions.tf b/modules/gke-nodepool/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/gke-nodepool/versions.tf +++ b/modules/gke-nodepool/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/iam-service-account/versions.tf b/modules/iam-service-account/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/iam-service-account/versions.tf +++ b/modules/iam-service-account/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/kms/versions.tf b/modules/kms/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/kms/versions.tf +++ b/modules/kms/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/logging-bucket/versions.tf b/modules/logging-bucket/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/logging-bucket/versions.tf +++ b/modules/logging-bucket/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/looker-core/versions.tf b/modules/looker-core/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/looker-core/versions.tf +++ b/modules/looker-core/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/ncc-spoke-ra/versions.tf b/modules/ncc-spoke-ra/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/ncc-spoke-ra/versions.tf +++ b/modules/ncc-spoke-ra/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-address/versions.tf b/modules/net-address/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-address/versions.tf +++ b/modules/net-address/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-cloudnat/versions.tf b/modules/net-cloudnat/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-cloudnat/versions.tf +++ b/modules/net-cloudnat/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-firewall-policy/versions.tf b/modules/net-firewall-policy/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-firewall-policy/versions.tf +++ b/modules/net-firewall-policy/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-ipsec-over-interconnect/versions.tf b/modules/net-ipsec-over-interconnect/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-ipsec-over-interconnect/versions.tf +++ b/modules/net-ipsec-over-interconnect/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-lb-app-ext-regional/versions.tf b/modules/net-lb-app-ext-regional/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-lb-app-ext-regional/versions.tf +++ b/modules/net-lb-app-ext-regional/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-lb-app-ext/versions.tf b/modules/net-lb-app-ext/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-lb-app-ext/versions.tf +++ b/modules/net-lb-app-ext/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-lb-app-int-cross-region/versions.tf b/modules/net-lb-app-int-cross-region/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-lb-app-int-cross-region/versions.tf +++ b/modules/net-lb-app-int-cross-region/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-lb-app-int/versions.tf b/modules/net-lb-app-int/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-lb-app-int/versions.tf +++ b/modules/net-lb-app-int/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-lb-ext/versions.tf b/modules/net-lb-ext/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-lb-ext/versions.tf +++ b/modules/net-lb-ext/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-lb-int/versions.tf b/modules/net-lb-int/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-lb-int/versions.tf +++ b/modules/net-lb-int/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-lb-proxy-int/versions.tf b/modules/net-lb-proxy-int/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-lb-proxy-int/versions.tf +++ b/modules/net-lb-proxy-int/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-swp/versions.tf b/modules/net-swp/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-swp/versions.tf +++ b/modules/net-swp/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-vlan-attachment/versions.tf b/modules/net-vlan-attachment/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-vlan-attachment/versions.tf +++ b/modules/net-vlan-attachment/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-vpc-firewall/versions.tf b/modules/net-vpc-firewall/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-vpc-firewall/versions.tf +++ b/modules/net-vpc-firewall/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-vpc-peering/versions.tf b/modules/net-vpc-peering/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-vpc-peering/versions.tf +++ b/modules/net-vpc-peering/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-vpc/versions.tf b/modules/net-vpc/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-vpc/versions.tf +++ b/modules/net-vpc/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-vpn-dynamic/versions.tf b/modules/net-vpn-dynamic/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-vpn-dynamic/versions.tf +++ b/modules/net-vpn-dynamic/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-vpn-ha/versions.tf b/modules/net-vpn-ha/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-vpn-ha/versions.tf +++ b/modules/net-vpn-ha/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/net-vpn-static/versions.tf b/modules/net-vpn-static/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/net-vpn-static/versions.tf +++ b/modules/net-vpn-static/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/organization/versions.tf b/modules/organization/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/organization/versions.tf +++ b/modules/organization/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/project/versions.tf b/modules/project/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/project/versions.tf +++ b/modules/project/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/projects-data-source/versions.tf b/modules/projects-data-source/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/projects-data-source/versions.tf +++ b/modules/projects-data-source/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/pubsub/versions.tf +++ b/modules/pubsub/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/secret-manager/versions.tf b/modules/secret-manager/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/secret-manager/versions.tf +++ b/modules/secret-manager/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/secure-source-manager-instance/versions.tf b/modules/secure-source-manager-instance/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/secure-source-manager-instance/versions.tf +++ b/modules/secure-source-manager-instance/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/service-directory/versions.tf b/modules/service-directory/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/service-directory/versions.tf +++ b/modules/service-directory/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/source-repository/versions.tf b/modules/source-repository/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/source-repository/versions.tf +++ b/modules/source-repository/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/spanner-instance/versions.tf b/modules/spanner-instance/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/spanner-instance/versions.tf +++ b/modules/spanner-instance/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/vpc-sc/versions.tf b/modules/vpc-sc/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/vpc-sc/versions.tf +++ b/modules/vpc-sc/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/modules/workstation-cluster/versions.tf b/modules/workstation-cluster/versions.tf index d498075b01..3018c9bf93 100644 --- a/modules/workstation-cluster/versions.tf +++ b/modules/workstation-cluster/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4" diff --git a/tests/examples_e2e/setup_module/versions.tf b/tests/examples_e2e/setup_module/versions.tf index d498075b01..3018c9bf93 100644 --- a/tests/examples_e2e/setup_module/versions.tf +++ b/tests/examples_e2e/setup_module/versions.tf @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< HEAD -# Fabric release: v35.1.0 -======= # Fabric release: v36.0.0 ->>>>>>> fast-dev terraform { required_version = ">= 1.7.4"