Add provider definitions and resolve lint issues

Signed-off-by: Jim Enright <[email protected]>
Co-authored-by: Yazan Al-Yasin <[email protected]>

Author: jimright

modules/hosts/README.md

@@ -22,13 +22,16 @@ The sample `terraform.tfvars.sample` describes the required inputs for the examp
 
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | > 1.3.0 |
+| <a name="requirement_google"></a> [google](#requirement\_google) | >= 6.12 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_google"></a> [google](#provider\_google) | n/a |
+| <a name="provider_google"></a> [google](#provider\_google) | >= 6.12 |
 
 ## Modules
 
@@ -48,7 +51,6 @@ No modules.
 |------|-------------|------|---------|:--------:|
 | <a name="input_name"></a> [name](#input\_name) | Instance base name. If 'quantity' is 0, this is the exact name of the single instance. If 'quantity' > 0, name will be <name>-NN. | `string` | n/a | yes |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | GCP project ID where instances will be created. | `string` | n/a | yes |
-| <a name="input_region"></a> [region](#input\_region) | GCP region (e.g., us-central1) for the instances (used for regional resources if any, zone is primary for instances). | `string` | n/a | yes |
 | <a name="input_ssh_public_key"></a> [ssh\_public\_key](#input\_ssh\_public\_key) | The contents of the SSH public key to be added to the instance metadata for SSH access. | `string` | n/a | yes |
 | <a name="input_subnet_ids"></a> [subnet\_ids](#input\_subnet\_ids) | List of subnet self-links or names to assign instances to. Instances will be distributed across these subnets. Must not be empty if instances are created. | `list(string)` | n/a | yes |
 | <a name="input_zones"></a> [zones](#input\_zones) | GCP zone (e.g., us-central1-a) where instances will be created. | `list(string)` | n/a | yes |

modules/hosts/examples/ex01-minimal_inputs/main.tf

@@ -49,9 +49,7 @@ locals {
 module "ex01_network" {
   source = "../../../network"
 
-  project_id      = var.project_id
   region          = var.region
-  zones           = local.zones
   vpc_name        = "${var.prefix}-pvc-base"
   vpc_exists      = false
   prefix          = var.prefix
@@ -60,15 +58,12 @@ module "ex01_network" {
   public_subnets  = var.public_subnets_config
   private_subnets = var.private_subnets_config
 
-  asset_tags = local.asset_tags
-
 }
 
 module "ex01_nodes" {
   source = "../../"
 
   project_id      = var.project_id
-  region          = var.region
   zones           = local.zones
   name            = "${var.prefix}-hosts"
   quantity        = 3

modules/hosts/provider.tf

@@ -0,0 +1,24 @@
+# Copyright 2025 Cloudera, Inc. All Rights Reserved.
+#
+# 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 = ">= 6.12"
+    }
+  }
+
+  required_version = "> 1.3.0"
+}

modules/hosts/variables.tf

@@ -20,11 +20,6 @@ variable "project_id" {
   description = "GCP project ID where instances will be created."
 }
 
-variable "region" {
-  type        = string
-  description = "GCP region (e.g., us-central1) for the instances (used for regional resources if any, zone is primary for instances)."
-}
-
 variable "zones" {
   type        = list(string)
   description = "GCP zone (e.g., us-central1-a) where instances will be created."

modules/network/README.md

@@ -22,13 +22,16 @@ The sample `terraform.tfvars.sample` describes the required inputs for the examp
 
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | > 1.3.0 |
+| <a name="requirement_google"></a> [google](#requirement\_google) | >= 6.12 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_google"></a> [google](#provider\_google) | n/a |
+| <a name="provider_google"></a> [google](#provider\_google) | >= 6.12 |
 
 ## Modules
 
@@ -51,12 +54,9 @@ No modules.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_prefix"></a> [prefix](#input\_prefix) | Deployment prefix used for naming all cloud-provider assets created by this module. | `string` | n/a | yes |
-| <a name="input_project_id"></a> [project\_id](#input\_project\_id) | The GCP project ID where resources will be deployed. | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | The GCP region where resources will be deployed. | `string` | n/a | yes |
 | <a name="input_vpc_exists"></a> [vpc\_exists](#input\_vpc\_exists) | Use existing GCP VPC network. | `bool` | n/a | yes |
 | <a name="input_vpc_name"></a> [vpc\_name](#input\_vpc\_name) | The name of the GCP VPC network into which subnets and other network resources will be deployed. | `string` | n/a | yes |
-| <a name="input_zones"></a> [zones](#input\_zones) | Zones in GCP region where resources will be deployed. | `list(string)` | n/a | yes |
-| <a name="input_asset_tags"></a> [asset\_tags](#input\_asset\_tags) | Map of labels applied to all cloud-provider assets created by this module. These are GCP resource labels. | `map(string)` | `{}` | no |
 | <a name="input_base_cidr_block"></a> [base\_cidr\_block](#input\_base\_cidr\_block) | The base CIDR block (e.g., '10.50.0.0/16') from which default public and private subnet CIDRs will be derived. This variable is required if 'public\_subnets' or 'private\_subnets' are not explicitly provided. | `string` | `"10.10.0.0/16"` | no |
 | <a name="input_private_subnets"></a> [private\_subnets](#input\_private\_subnets) | A list of objects defining private subnets. Each object requires 'name', 'cidr', and 'labels' (a map of strings). If this list is empty, a single default private subnet will be created using 'base\_cidr\_block'. | <pre>list(object({<br/>    name   = string<br/>    cidr   = string<br/>    labels = map(string) # Renamed from 'tags' to 'labels' for clarity and consistency with GCP resource labels<br/>  }))</pre> | `[]` | no |
 | <a name="input_public_subnets"></a> [public\_subnets](#input\_public\_subnets) | A list of objects defining public subnets. Each object requires 'name', 'cidr', and 'labels' (a map of strings). If this list is empty, a single default public subnet will be created using 'base\_cidr\_block'. | <pre>list(object({<br/>    name   = string<br/>    cidr   = string<br/>    labels = map(string) # Renamed from 'tags' to 'labels' for clarity and consistency with GCP resource labels<br/>  }))</pre> | `[]` | no |
@@ -72,7 +72,7 @@ No modules.
 | <a name="output_region"></a> [region](#output\_region) | The GCP region used for deployment, as provided in the input variables. |
 | <a name="output_router_name"></a> [router\_name](#output\_router\_name) | The name of the created Cloud Router resource. |
 | <a name="output_vpc_name"></a> [vpc\_name](#output\_vpc\_name) | The GCP VPC network name used for deployment, as provided in the input variables. |
-| <a name="output_vpc_private_cidr_block"></a> [vpc\_private\_cidr\_block](#output\_vpc\_private\_cidr\_block) | n/a |
-| <a name="output_vpc_public_cidr_block"></a> [vpc\_public\_cidr\_block](#output\_vpc\_public\_cidr\_block) | n/a |
+| <a name="output_vpc_private_cidr_block"></a> [vpc\_private\_cidr\_block](#output\_vpc\_private\_cidr\_block) | Value of the first created private subnet's CIDR block. |
+| <a name="output_vpc_public_cidr_block"></a> [vpc\_public\_cidr\_block](#output\_vpc\_public\_cidr\_block) | Value of the first created public subnet's CIDR block. |
 | <a name="output_vpc_self_link"></a> [vpc\_self\_link](#output\_vpc\_self\_link) | Self-link of the VPC network fetched by the module. |
 <!-- END_TF_DOCS -->

modules/network/examples/ex01-minimal_inputs/main.tf

@@ -47,9 +47,7 @@ locals {
 module "ex01_network" {
   source = "../.."
 
-  project_id      = var.project_id
   region          = var.region
-  zones           = local.zones
   vpc_name        = "${var.prefix}-pvc-base"
   vpc_exists      = false
   prefix          = var.prefix
@@ -58,6 +56,4 @@ module "ex01_network" {
   public_subnets  = var.public_subnets_config
   private_subnets = var.private_subnets_config
 
-  asset_tags = local.asset_tags
-
 }

modules/network/outputs.tf

@@ -59,10 +59,14 @@ output "created_private_subnets" {
 
 output "vpc_private_cidr_block" {
   value = google_compute_subnetwork.pvc_base_private[0].ip_cidr_range
+
+  description = "Value of the first created private subnet's CIDR block."
 }
 
 output "vpc_public_cidr_block" {
   value = google_compute_subnetwork.pvc_base_public[0].ip_cidr_range
+
+  description = "Value of the first created public subnet's CIDR block."
 }
 
 output "router_name" {

modules/network/provider.tf

@@ -0,0 +1,24 @@
+# Copyright 2025 Cloudera, Inc. All Rights Reserved.
+#
+# 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 = ">= 6.12"
+    }
+  }
+
+  required_version = "> 1.3.0"
+}

modules/network/variables.tf

@@ -12,41 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# File: tf_cluster_gcp/modules/network/variables.tf
-
 # ------- Required Variables -------
 
-variable "asset_tags" {
-  type        = map(string)
-  default     = {}
-  description = "Map of labels applied to all cloud-provider assets created by this module. These are GCP resource labels."
-}
-
 variable "prefix" {
   type        = string
   description = "Deployment prefix used for naming all cloud-provider assets created by this module."
 }
 
-variable "project_id" {
-  type        = string
-  description = "The GCP project ID where resources will be deployed."
-}
-
 variable "region" {
   type        = string
   description = "The GCP region where resources will be deployed."
 }
 
-variable "zones" {
-  type        = list(string)
-  description = "Zones in GCP region where resources will be deployed."
-
-  validation {
-    condition     = length(var.zones) != 0
-    error_message = "No zones returned! Invalid GCP Region: ${var.region}"
-  }
-}
-
 variable "vpc_name" {
   type        = string
   description = "The name of the GCP VPC network into which subnets and other network resources will be deployed."
@@ -68,6 +45,11 @@ variable "base_cidr_block" {
   }
 }
 
+# variable "asset_tags" {
+#   type        = map(string)
+#   default     = {}
+#   description = "Map of labels applied to all cloud-provider assets created by this module. These are GCP resource labels."
+# }
 # ------- Network Resources Configuration Variables -------
 
 variable "public_subnets" {