feat: update TPG version constraints to allow 4.0 (#65)

* feat: update TPG version constraints to allow 4.0

* fix examples

* fix tpg 4.0 update (#70)

* added changes for provider

* added changes

* Update examples/bq-exfil-demo/versions.tf

Co-authored-by: Bharath KKB <bharathkrishnakb@gmail.com>

* Apply suggestions from code review

Co-authored-by: bharathkkb <bharathkrishnakb@gmail.com>
Co-authored-by: Morgante Pell <morgantep@google.com>
Co-authored-by: Alex Weber Lopes <42207579+aweberlopes@users.noreply.github.com>

Author: 4 people

examples/automatic_folder/main.tf

@@ -14,18 +14,6 @@
  * limitations under the License.
  */
 
-provider "archive" {
-  version = "~> 1.0"
-}
-
-provider "random" {
-  version = "~> 2.0"
-}
-
-provider "null" {
-  version = "~> 2.1"
-}
-
 data "google_projects" "in_perimeter_folder" {
   filter = "parent.id:${var.folder_id}"
 }
@@ -44,15 +32,15 @@ locals {
 
 module "access_context_manager_policy" {
   source  = "terraform-google-modules/vpc-service-controls/google"
-  version = "1.0.1"
+  version = "3.1.0"
 
   parent_id   = local.parent_id
   policy_name = var.policy_name
 }
 
 module "access_level_members" {
   source  = "terraform-google-modules/vpc-service-controls/google//modules/access_level"
-  version = "1.0.1"
+  version = "3.1.0"
 
   description = "${var.perimeter_name} Access Level"
   policy      = module.access_context_manager_policy.policy_id
@@ -62,7 +50,7 @@ module "access_level_members" {
 
 module "service_perimeter" {
   source  = "terraform-google-modules/vpc-service-controls/google//modules/regular_service_perimeter"
-  version = "1.0.1"
+  version = "3.1.0"
 
   policy         = module.access_context_manager_policy.policy_id
   perimeter_name = var.perimeter_name

examples/automatic_folder/versions.tf

@@ -15,5 +15,23 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "~> 1.0"
+    }
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.0"
+    }
+  }
 }

examples/automatic_folder/watcher.tf

@@ -16,7 +16,7 @@
 
 module "event_folder_log_entry" {
   source  = "terraform-google-modules/event-function/google//modules/event-folder-log-entry"
-  version = "1.1.0"
+  version = "2.1.0"
 
   filter     = <<EOF
 resource.type="project" AND
@@ -37,7 +37,7 @@ resource "google_service_account" "watcher" {
 
 module "localhost_function" {
   source  = "terraform-google-modules/event-function/google"
-  version = "1.1.0"
+  version = "2.1.0"
 
   description = "Adds projects to VPC service permiterer."
   entry_point = "handler"

examples/bq-exfil-demo/main.tf

@@ -21,7 +21,7 @@
 
 module "bastion" {
   source  = "terraform-google-modules/bastion-host/google"
-  version = "~> 3.0"
+  version = "~> 4.1"
 
   project = module.project1.project_id
   zone    = var.zone
@@ -36,7 +36,7 @@ module "bastion" {
 
 module "vpc" {
   source  = "terraform-google-modules/network/google"
-  version = "~> 3.0"
+  version = "~> 4.0"
 
   project_id              = module.project1.project_id
   network_name            = "test-network"

examples/bq-exfil-demo/org.tf

@@ -35,22 +35,22 @@ resource "google_organization_policy" "external_ip_policy" {
 
 module "org_policy" {
   source      = "terraform-google-modules/vpc-service-controls/google"
-  version     = "~> 1.0.1"
+  version     = "~> 3.1.0"
   parent_id   = var.org_id
   policy_name = "VPC SC Demo Policy"
 }
 
 module "access_level_members" {
   source  = "terraform-google-modules/vpc-service-controls/google//modules/access_level"
-  version = "~> 1.0.1"
+  version = "~> 3.1.0"
   policy  = module.org_policy.policy_id
   name    = "terraform_members"
   members = ["serviceAccount:${var.terraform_service_account}"]
 }
 
 module "regular_service_perimeter_1" {
   source              = "terraform-google-modules/vpc-service-controls/google//modules/regular_service_perimeter"
-  version             = "~> 1.0.1"
+  version             = "~> 3.1.0"
   policy              = module.org_policy.policy_id
   perimeter_name      = "regular_perimeter_1"
   description         = "Perimeter shielding projects"

examples/bq-exfil-demo/projects.tf

@@ -16,7 +16,7 @@
 
 module "project1" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 10.0"
+  version = "~> 11.0"
 
   name              = "vpc-sc-demo-project-1"
   random_project_id = true
@@ -28,7 +28,7 @@ module "project1" {
 
 module "project2" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 10.0"
+  version = "~> 11.0"
 
   name              = "vpc-sc-demo-project-2"
   random_project_id = true

examples/bq-exfil-demo/storage.tf

@@ -16,7 +16,7 @@
 
 module "bigquery" {
   source  = "terraform-google-modules/bigquery/google"
-  version = "~> 4.1"
+  version = "~> 5.3"
 
   dataset_id   = "project_1_dataset"
   dataset_name = "project_1_dataset"
@@ -33,8 +33,9 @@ module "bigquery" {
         require_partition_filter = false,
         expiration_ms            = null,
       },
-      expiration_time = null,
-      clustering      = null,
+      range_partitioning = null,
+      expiration_time    = null,
+      clustering         = null,
       labels = {
         env = "dev"
       },

examples/bq-exfil-demo/versions.tf

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.0"
+    }
+    null = {
+      source = "hashicorp/null"
+    }
+  }
+  required_version = ">= 0.13"
+}

examples/onprem_demo/main.tf

@@ -15,7 +15,6 @@
  */
 
 provider "google" {
-  version     = "~> 3.82.0"
   credentials = file("${var.credentials_path}")
 }
 

examples/onprem_demo/onprem_project/main.tf

@@ -33,7 +33,7 @@ resource "google_compute_network" "onprem-network" {
   name                            = "onprem-network"
   project                         = google_project.on_prem_network_project.project_id
   routing_mode                    = "REGIONAL"
-  depends_on                      = ["google_project_service.gce_service"]
+  depends_on                      = [google_project_service.gce_service]
 }
 
 resource "google_compute_subnetwork" "onprem_subnet" {
@@ -51,7 +51,7 @@ resource "google_compute_address" "onprem_vpn_ip" {
   network_tier = "PREMIUM"
   project      = google_project.on_prem_network_project.project_id
   region       = var.region
-  depends_on   = ["google_project_service.gce_service"]
+  depends_on   = [google_project_service.gce_service]
 }
 
 resource "google_compute_router" "onprem_cloud_router" {
@@ -64,15 +64,15 @@ resource "google_compute_router" "onprem_cloud_router" {
   network    = google_compute_network.onprem-network.self_link
   project    = google_project.on_prem_network_project.project_id
   region     = var.region
-  depends_on = ["google_project_service.gce_service"]
+  depends_on = [google_project_service.gce_service]
 }
 
 resource "google_compute_vpn_gateway" "target_gateway" {
   name       = "target-vpn-gateway"
   network    = google_compute_network.onprem-network.self_link
   project    = google_project.on_prem_network_project.project_id
   region     = var.region
-  depends_on = ["google_project_service.gce_service"]
+  depends_on = [google_project_service.gce_service]
 }
 
 resource "google_compute_forwarding_rule" "fr_for_vpn_gateway" {
@@ -192,7 +192,7 @@ resource "google_compute_instance" "forward_proxy_instance" {
 
   tags       = ["forward-proxy"]
   zone       = "${var.region}-b"
-  depends_on = ["google_project_service.gce_service"]
+  depends_on = [google_project_service.gce_service]
 }
 
 resource "google_compute_instance" "windows_jumphost" {
@@ -238,7 +238,7 @@ resource "google_compute_instance" "windows_jumphost" {
 
   tags       = ["forward-proxy"]
   zone       = "${var.region}-b"
-  depends_on = ["google_project_service.gce_service"]
+  depends_on = [google_project_service.gce_service]
 }
 
 /*********************************/