fix(anthos-attached-clusters): add providers and lint (#692)

apeabody · web-flow · commit 393d625a0055 · 2024-08-28T11:04:25.000-07:00
diff --git a/anthos-attached-clusters/aks/main.tf b/anthos-attached-clusters/aks/main.tf
@@ -20,9 +20,6 @@ locals {
   }
 }
 
-data "azurerm_subscription" "current" {
-}
-
 resource "azurerm_resource_group" "aks" {
   name     = "${var.name_prefix}-rg"
   location = var.azure_region
@@ -59,12 +56,12 @@ data "google_project" "project" {
 provider "helm" {
   alias = "bootstrap_installer"
   kubernetes {
-    host                   = azurerm_kubernetes_cluster.aks.kube_config.0.host
-    username               = azurerm_kubernetes_cluster.aks.kube_config.0.username
-    password               = azurerm_kubernetes_cluster.aks.kube_config.0.password
-    client_certificate     = base64decode(azurerm_kubernetes_cluster.aks.kube_config.0.client_certificate)
-    client_key             = base64decode(azurerm_kubernetes_cluster.aks.kube_config.0.client_key)
-    cluster_ca_certificate = base64decode(azurerm_kubernetes_cluster.aks.kube_config.0.cluster_ca_certificate)
+    host                   = azurerm_kubernetes_cluster.aks.kube_config[0].host
+    username               = azurerm_kubernetes_cluster.aks.kube_config[0].username
+    password               = azurerm_kubernetes_cluster.aks.kube_config[0].password
+    client_certificate     = base64decode(azurerm_kubernetes_cluster.aks.kube_config[0].client_certificate)
+    client_key             = base64decode(azurerm_kubernetes_cluster.aks.kube_config[0].client_key)
+    cluster_ca_certificate = base64decode(azurerm_kubernetes_cluster.aks.kube_config[0].cluster_ca_certificate)
   }
 }
 
diff --git a/anthos-attached-clusters/aks/provider.tf b/anthos-attached-clusters/aks/provider.tf
@@ -25,7 +25,8 @@ terraform {
       version = ">=5.0.0"
     }
     helm = {
-      source = "hashicorp/helm"
+      source  = "hashicorp/helm"
+      version = "~> 2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/anthos-attached-clusters/eks/provider.tf b/anthos-attached-clusters/eks/provider.tf
@@ -25,7 +25,8 @@ terraform {
       version = ">=5.0.0"
     }
     helm = {
-      source = "hashicorp/helm"
+      source  = "hashicorp/helm"
+      version = "~> 2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/anthos-attached-clusters/kind/oidc/providers.tf b/anthos-attached-clusters/kind/oidc/providers.tf
@@ -17,8 +17,10 @@
 terraform {
   required_providers {
     http-full = {
-      source = "salrashid123/http-full"
+      source  = "salrashid123/http-full"
+      version = "~> 1.3"
     }
   }
+  required_version = ">= 0.13"
 }
 
diff --git a/anthos-attached-clusters/kind/provider.tf b/anthos-attached-clusters/kind/provider.tf
@@ -17,8 +17,18 @@
 terraform {
   required_providers {
     kind = {
-      source = "tehcyx/kind"
+      source  = "tehcyx/kind"
+      version = "~> 0.6"
+    }
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 5.0"
+    }
+    helm = {
+      source  = "hashicorp/helm"
+      version = "~> 2.0"
     }
   }
+  required_version = ">= 0.13"
 }
 
diff --git a/anthos-attached-clusters/modules/attached-install-manifest/provider.tf b/anthos-attached-clusters/modules/attached-install-manifest/provider.tf
@@ -24,6 +24,10 @@ terraform {
       source  = "hashicorp/helm"
       version = ">=2.13.1"
     }
+    local = {
+      source  = "hashicorp/local"
+      version = "~> 2.2"
+    }
   }
   required_version = ">= 0.13"
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ terraform {`
`25`	`25`	`version = ">=5.0.0"`
`26`	`26`	`}`
`27`	`27`	`helm = {`
`28`		`- source = "hashicorp/helm"`
	`28`	`+ source = "hashicorp/helm"`
	`29`	`+ version = "~> 2.0"`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`required_version = ">= 0.13"`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,10 @@`
`17`	`17`	`terraform {`
`18`	`18`	`required_providers {`
`19`	`19`	`http-full = {`
`20`		`- source = "salrashid123/http-full"`
	`20`	`+ source = "salrashid123/http-full"`
	`21`	`+ version = "~> 1.3"`
`21`	`22`	`}`
`22`	`23`	`}`
	`24`	`+ required_version = ">= 0.13"`
`23`	`25`	`}`
`24`	`26`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,18 @@`
`17`	`17`	`terraform {`
`18`	`18`	`required_providers {`
`19`	`19`	`kind = {`
`20`		`- source = "tehcyx/kind"`
	`20`	`+ source = "tehcyx/kind"`
	`21`	`+ version = "~> 0.6"`
	`22`	`+ }`
	`23`	`+ google = {`
	`24`	`+ source = "hashicorp/google"`
	`25`	`+ version = "~> 5.0"`
	`26`	`+ }`
	`27`	`+ helm = {`
	`28`	`+ source = "hashicorp/helm"`
	`29`	`+ version = "~> 2.0"`
`21`	`30`	`}`
`22`	`31`	`}`
	`32`	`+ required_version = ">= 0.13"`
`23`	`33`	`}`
`24`	`34`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@ terraform {`
`24`	`24`	`source = "hashicorp/helm"`
`25`	`25`	`version = ">=2.13.1"`
`26`	`26`	`}`
	`27`	`+ local = {`
	`28`	`+ source = "hashicorp/local"`
	`29`	`+ version = "~> 2.2"`
	`30`	`+ }`
`27`	`31`	`}`
`28`	`32`	`required_version = ">= 0.13"`
`29`	`33`	`}`