address linter findings and remove unused resources

Author: chrischdi

infra/gcp/terraform/k8s-infra-gcp-gcve/maintenance-jumphost/jumphost.tf

@@ -15,8 +15,9 @@ limitations under the License.
 */
 
 variable "project_id" {
-  description = "The project ID to use for the maintenance jumphost."
+  description = "The project ID to use for the gcve cluster."
   default     = "broadcom-451918"
+  type        = string
 }
 
 # Read the secret from Secret Manager which contains the wireguard server configuration. 
@@ -25,7 +26,7 @@ data "google_secret_manager_secret_version_access" "wireguard-config" {
   secret = "maintenance-vm-wireguard-config"
 }
 
-# Creates the maintenance jumphost which runs SSH and a wireguard server.
+# Create the maintenance jumphost which runs SSH and a wireguard server.
 resource "google_compute_instance" "jumphost" {
   project      = var.project_id
   name         = "maintenance-jumphost"

infra/gcp/terraform/k8s-infra-gcp-gcve/maintenance-jumphost/provider.tf

@@ -21,6 +21,7 @@ This file defines:
 */
 
 terraform {
+  required_version = "1.10.5"
 
   backend "gcs" {
     bucket = "k8s-infra-tf-gcp-gcve"

infra/gcp/terraform/k8s-infra-gcp-gcve/provider.tf

@@ -22,12 +22,12 @@ This file defines:
 
 terraform {
   required_version = "1.10.5"
+
   backend "gcs" {
     bucket = "k8s-infra-tf-gcp-gcve"
     prefix = "k8s-infra-gcp-gcve"
   }
 
-
   required_providers {
     google = {
       source  = "hashicorp/google"

infra/gcp/terraform/k8s-infra-gcp-gcve/variables.tf

@@ -17,4 +17,5 @@ limitations under the License.
 variable "project_id" {
   description = "The project ID to use for the gcve cluster."
   default     = "broadcom-451918"
+  type        = string
 }

infra/gcp/terraform/k8s-infra-gcp-gcve/vsphere/data.tf

@@ -32,23 +32,11 @@ data "vsphere_datastore" "datastore" {
   datacenter_id = data.vsphere_datacenter.datacenter.id
 }
 
-data "vsphere_role" "read-only" {
-  label = "Read-only"
-}
-
-data "vsphere_role" "no-access" {
-  label = "No access"
-}
-
 data "vsphere_network" "network" {
   name          = var.vsphere_network_name
   datacenter_id = data.vsphere_datacenter.datacenter.id
 }
 
-data "vsphere_folder" "global" {
-  path = "/"
-}
-
 # Resources from NSX-T.
 
 data "nsxt_policy_tier1_gateway" "tier1_gw" {

infra/gcp/terraform/k8s-infra-gcp-gcve/vsphere/modules/gcp-gcve-project/provider.tf

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 terraform {
+  required_version = "1.10.5"
+
   required_providers {
     vsphere = {
       source  = "vmware/vsphere"

infra/gcp/terraform/k8s-infra-gcp-gcve/vsphere/provider.tf

@@ -14,14 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+/*
+This file defines:
+- Required provider versions
+- Storage backend details
+*/
+
 terraform {
+  required_version = "1.10.5"
 
   backend "gcs" {
     bucket = "k8s-infra-tf-gcp-gcve"
     prefix = "k8s-infra-gcp-gcve-vcenter"
   }
 
-
   required_providers {
     google = {
       source  = "hashicorp/google"

infra/gcp/terraform/k8s-infra-gcp-gcve/vsphere/scripts/boskos-userdata.sh

@@ -47,13 +47,9 @@ function initBoskosResourceUserData() {
   boskos_data='{"ipPool":"'"${ipPool}"'","resourcePool":"'"${resourcePool}"'","folder":"'"${folder}"'"}'
 
   # acquire from "dirty" or "free" state
-  ACQUIRED=1
   curl -s -X POST "${BOSKOS_HOST}/acquirebystate?names=${resourceName}&state=dirty&dest=busy&owner=$(whoami)" | grep -q "${resourceName}" \
     || curl -s -X POST "${BOSKOS_HOST}/acquirebystate?names=${resourceName}&state=free&dest=busy&owner=$(whoami)" | grep -q "${resourceName}" \
-    || ( echo "Failed to acquire ${resourceName}" ; ACQUIRED=0)
-  if [[ "${ACQUIRED}" -eq 0 ]]; then
-    echo "Failed to acquire project ${resourceName}"
-  fi
+    || echo "Failed to acquire ${resourceName}"
 
   # update resource
   echo "Updating resource ${resourceName} with following data: ${boskos_data}"

infra/gcp/terraform/k8s-infra-gcp-gcve/vsphere/tags.tf

@@ -39,13 +39,13 @@ resource "vsphere_tag_category" "category_k8s_zone" {
 # Creates the Datacenter tag for the k8s-region tag category for failure domain testing.
 resource "vsphere_tag" "tag_k8s_region" {
   name        = var.vsphere_datacenter
-  category_id = "${vsphere_tag_category.category_k8s_region.id}"
+  category_id = vsphere_tag_category.category_k8s_region.id
   description = "Managed by Terraform"
 }
 
 # Creates the Compute Cluster tag for the k8s-zone tag category for failure domain testing.
 resource "vsphere_tag" "tag_k8s_zone" {
   name        = var.vsphere_cluster
-  category_id = "${vsphere_tag_category.category_k8s_zone.id}"
+  category_id = vsphere_tag_category.category_k8s_zone.id
   description = "Managed by Terraform"
 }