fix!: upgraded versions.tf to include minor bumps from tpg v5 (#75)

g-awmalik · web-flow · commit 89e9d203fa15 · 2023-11-06T13:55:36.000-08:00
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.5
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 
diff --git a/README.md b/README.md
@@ -25,7 +25,6 @@ Functional examples are included in the
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| data\_fusion\_service\_account | Google Managed Data Fusion Service Account Email | `any` | n/a | yes |
 | datafusion\_version | Data Fusion Version to deploy. | `string` | `null` | no |
 | dataproc\_subnet | Name for subnet to create and configure for Dataproc clusters controlled by private Data Fusion instance. | `string` | `"dataproc-subnet"` | no |
 | description | An optional description of the instance. | `string` | `null` | no |
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -38,4 +38,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
diff --git a/examples/dataproc_profile/README.md b/examples/dataproc_profile/README.md
@@ -11,7 +11,7 @@ This example illustrates how to use the `dataproc_provisioner` module.
 
 ## Outputs
 
-No output.
+No outputs.
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
diff --git a/examples/dataproc_profile/versions.tf b/examples/dataproc_profile/versions.tf
@@ -22,8 +22,7 @@ terraform {
       version = "~> 0.10"
     }
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
   }
 }
diff --git a/examples/hub_artifact/versions.tf b/examples/hub_artifact/versions.tf
@@ -21,8 +21,7 @@ terraform {
       version = "~> 0.10"
     }
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/instance/README.md b/examples/instance/README.md
@@ -7,7 +7,6 @@ This example illustrates how to use the `data-fusion` module.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| data\_fusion\_service\_account | Google Managed Data Fusion Service Account Email | `any` | n/a | yes |
 | project\_id | The ID of the project in which to provision resources. | `string` | n/a | yes |
 
 ## Outputs
diff --git a/examples/instance/main.tf b/examples/instance/main.tf
@@ -17,9 +17,8 @@
 module "data_fusion" {
   source = "../../"
 
-  name                        = "example-instance"
-  project                     = var.project_id
-  region                      = "us-central1"
-  network                     = "default"
-  data_fusion_service_account = var.data_fusion_service_account
+  name    = "example-instance"
+  project = var.project_id
+  region  = "us-central1"
+  network = "default"
 }
diff --git a/examples/instance/simple/README.md b/examples/instance/simple/README.md
@@ -7,12 +7,11 @@ This example illustrates how to use the `data-fusion` module.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| data\_fusion\_service\_account | Google Managed Data Fusion Service Account Email | `any` | n/a | yes |
 | project\_id | The ID of the project in which to provision resources. | `string` | n/a | yes |
 
 ## Outputs
 
-No output.
+No outputs.
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
diff --git a/examples/instance/simple/main.tf b/examples/instance/simple/main.tf
@@ -17,9 +17,8 @@
 module "data_fusion" {
   source = "../../../"
 
-  name                        = "example-instance"
-  project                     = var.project_id
-  region                      = "us-central1"
-  network                     = "default"
-  data_fusion_service_account = var.data_fusion_service_account
+  name    = "example-instance"
+  project = var.project_id
+  region  = "us-central1"
+  network = "default"
 }
diff --git a/examples/instance/simple/variables.tf b/examples/instance/simple/variables.tf
@@ -18,7 +18,3 @@ variable "project_id" {
   description = "The ID of the project in which to provision resources."
   type        = string
 }
-
-variable "data_fusion_service_account" {
-  description = "Google Managed Data Fusion Service Account Email"
-}
diff --git a/examples/instance/variables.tf b/examples/instance/variables.tf
@@ -18,7 +18,3 @@ variable "project_id" {
   description = "The ID of the project in which to provision resources."
   type        = string
 }
-
-variable "data_fusion_service_account" {
-  description = "Google Managed Data Fusion Service Account Email"
-}
diff --git a/examples/namespace/README.md b/examples/namespace/README.md
@@ -8,11 +8,10 @@ This example illustrates how to use the `cdap_namespace` module.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | name | The name of the cdap namespace to create. | `string` | n/a | yes |
-| preferences | Map of preferences to define the namespace. | `map(string)` | n/a | yes |
 
 ## Outputs
 
-No output.
+No outputs.
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
diff --git a/examples/namespace/variables.tf b/examples/namespace/variables.tf
@@ -18,8 +18,3 @@ variable "name" {
   description = "The name of the cdap namespace to create."
   type        = string
 }
-
-variable "preferences" {
-  description = "Map of preferences to define the namespace."
-  type        = map(string)
-}
diff --git a/examples/namespace/versions.tf b/examples/namespace/versions.tf
@@ -22,8 +22,7 @@ terraform {
       version = "~> 0.10"
     }
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
   }
 }
diff --git a/modules/dataproc_profile/versions.tf b/modules/dataproc_profile/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 6"
     }
     cdap = {
       source  = "GoogleCloudPlatform/cdap"
diff --git a/modules/hub_artifact/versions.tf b/modules/hub_artifact/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 6"
     }
     cdap = {
       source  = "GoogleCloudPlatform/cdap"
diff --git a/modules/instance/versions.tf b/modules/instance/versions.tf
@@ -16,6 +16,18 @@
 
 terraform {
   required_version = ">= 0.13"
+  required_providers {
+
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 3.53, < 6"
+    }
+
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 3.53, < 6"
+    }
+  }
 
   provider_meta "google" {
     module_name = "blueprints/terraform/terraform-google-data-fusion:instance/v2.0.0"
diff --git a/modules/namespace/versions.tf b/modules/namespace/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 6"
     }
     cdap = {
       source  = "GoogleCloudPlatform/cdap"
diff --git a/modules/private_network/main.tf b/modules/private_network/main.tf
@@ -50,6 +50,7 @@ resource "google_compute_global_address" "data_fusion_private_ip_alloc" {
 
 module "datafusion_firewall" {
   source                  = "terraform-google-modules/network/google//modules/fabric-net-firewall"
+  version                 = "~> 8.0"
   project_id              = var.project_id
   network                 = module.vpc.network_name
   internal_ranges_enabled = true
diff --git a/modules/private_network/versions.tf b/modules/private_network/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.12, < 5.0"
+      version = ">= 4.12, < 6"
     }
   }
 
diff --git a/modules/wait_healthy/versions.tf b/modules/wait_healthy/versions.tf
@@ -20,11 +20,16 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 6"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 6"
+    }
+
+    null = {
+      source  = "hashicorp/null"
+      version = ">= 3.0, < 4"
     }
   }
 
diff --git a/test/fixtures/instance/main.tf b/test/fixtures/instance/main.tf
@@ -15,8 +15,6 @@
  */
 
 module "example" {
-  source = "../../../examples/instance"
-
-  project_id                  = var.project_id
-  data_fusion_service_account = var.sa_key
+  source     = "../../../examples/instance"
+  project_id = var.project_id
 }
diff --git a/test/fixtures/instance/variables.tf b/test/fixtures/instance/variables.tf
@@ -18,8 +18,3 @@ variable "project_id" {
   description = "The ID of the project in which to provision resources."
   type        = string
 }
-
-variable "sa_key" {
-  description = "Service Account key"
-  type        = string
-}
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53.0, < 5.0"
+      version = ">= 3.53.0, < 6"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.53.0, < 5.0"
+      version = ">= 3.53.0, < 6"
     }
   }
 }
diff --git a/variables.tf b/variables.tf
@@ -69,8 +69,3 @@ variable "options" {
   type        = map(string)
   default     = {}
 }
-
-variable "data_fusion_service_account" {
-  description = "Google Managed Data Fusion Service Account Email"
-}
-
diff --git a/versions.tf b/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 6"
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@ terraform {`
`22`	`22`	`version = "~> 0.10"`
`23`	`23`	`}`
`24`	`24`	`google = {`
`25`		`- source = "hashicorp/google"`
`26`		`- version = "~> 4.0"`
	`25`	`+ source = "hashicorp/google"`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ terraform {`
`21`	`21`	`version = "~> 0.10"`
`22`	`22`	`}`
`23`	`23`	`google = {`
`24`		`- source = "hashicorp/google"`
`25`		`- version = "~> 4.0"`
	`24`	`+ source = "hashicorp/google"`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`	`required_version = ">= 0.13"`