Fix lint and add gkeBackupAgentConfig to test data

Tolsee · Tolsee · commit 67f6bc7a4ed1 · 2023-01-04T22:39:11.000+05:45
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -264,6 +264,7 @@ resource "google_container_cluster" "primary" {
         enabled = gce_persistent_disk_csi_driver_config.value.enabled
       }
     }
+
     dynamic "gke_backup_agent_config" {
       for_each = local.gke_backup_agent_config
 
diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl
@@ -646,6 +646,7 @@ variable "gke_backup_agent_config" {
   description = "Whether Backup for GKE agent is enabled for this cluster."
   default     = false
 }
+
 {% endif %}
 variable "timeouts" {
   type        = map(string)
diff --git a/cluster.tf b/cluster.tf
@@ -159,6 +159,7 @@ resource "google_container_cluster" "primary" {
         enabled = gce_persistent_disk_csi_driver_config.value.enabled
       }
     }
+
     dynamic "gke_backup_agent_config" {
       for_each = local.gke_backup_agent_config
 
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -215,6 +215,7 @@ resource "google_container_cluster" "primary" {
         enabled = gce_persistent_disk_csi_driver_config.value.enabled
       }
     }
+
     dynamic "gke_backup_agent_config" {
       for_each = local.gke_backup_agent_config
 
diff --git a/modules/beta-private-cluster-update-variant/variables.tf b/modules/beta-private-cluster-update-variant/variables.tf
@@ -619,6 +619,7 @@ variable "gke_backup_agent_config" {
   description = "Whether Backup for GKE agent is enabled for this cluster."
   default     = false
 }
+
 variable "timeouts" {
   type        = map(string)
   description = "Timeout for cluster operations."
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -215,6 +215,7 @@ resource "google_container_cluster" "primary" {
         enabled = gce_persistent_disk_csi_driver_config.value.enabled
       }
     }
+
     dynamic "gke_backup_agent_config" {
       for_each = local.gke_backup_agent_config
 
diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf
@@ -619,6 +619,7 @@ variable "gke_backup_agent_config" {
   description = "Whether Backup for GKE agent is enabled for this cluster."
   default     = false
 }
+
 variable "timeouts" {
   type        = map(string)
   description = "Timeout for cluster operations."
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -215,6 +215,7 @@ resource "google_container_cluster" "primary" {
         enabled = gce_persistent_disk_csi_driver_config.value.enabled
       }
     }
+
     dynamic "gke_backup_agent_config" {
       for_each = local.gke_backup_agent_config
 
diff --git a/modules/beta-public-cluster-update-variant/variables.tf b/modules/beta-public-cluster-update-variant/variables.tf
@@ -589,6 +589,7 @@ variable "gke_backup_agent_config" {
   description = "Whether Backup for GKE agent is enabled for this cluster."
   default     = false
 }
+
 variable "timeouts" {
   type        = map(string)
   description = "Timeout for cluster operations."
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -215,6 +215,7 @@ resource "google_container_cluster" "primary" {
         enabled = gce_persistent_disk_csi_driver_config.value.enabled
       }
     }
+
     dynamic "gke_backup_agent_config" {
       for_each = local.gke_backup_agent_config
 
diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf
@@ -589,6 +589,7 @@ variable "gke_backup_agent_config" {
   description = "Whether Backup for GKE agent is enabled for this cluster."
   default     = false
 }
+
 variable "timeouts" {
   type        = map(string)
   description = "Timeout for cluster operations."
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -159,6 +159,7 @@ resource "google_container_cluster" "primary" {
         enabled = gce_persistent_disk_csi_driver_config.value.enabled
       }
     }
+
     dynamic "gke_backup_agent_config" {
       for_each = local.gke_backup_agent_config
 
diff --git a/modules/private-cluster-update-variant/variables.tf b/modules/private-cluster-update-variant/variables.tf
@@ -590,6 +590,7 @@ variable "gke_backup_agent_config" {
   description = "Whether Backup for GKE agent is enabled for this cluster."
   default     = false
 }
+
 variable "timeouts" {
   type        = map(string)
   description = "Timeout for cluster operations."
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -159,6 +159,7 @@ resource "google_container_cluster" "primary" {
         enabled = gce_persistent_disk_csi_driver_config.value.enabled
       }
     }
+
     dynamic "gke_backup_agent_config" {
       for_each = local.gke_backup_agent_config
 
diff --git a/modules/private-cluster/variables.tf b/modules/private-cluster/variables.tf
@@ -590,6 +590,7 @@ variable "gke_backup_agent_config" {
   description = "Whether Backup for GKE agent is enabled for this cluster."
   default     = false
 }
+
 variable "timeouts" {
   type        = map(string)
   description = "Timeout for cluster operations."
diff --git a/test/integration/disable_client_cert/testdata/TestDisableClientCert.json b/test/integration/disable_client_cert/testdata/TestDisableClientCert.json
@@ -5,6 +5,7 @@
       "enabled": true
     },
     "gcpFilestoreCsiDriverConfig": {},
+    "gkeBackupAgentConfig": {},
     "horizontalPodAutoscaling": {},
     "httpLoadBalancing": {},
     "kubernetesDashboard": {
diff --git a/variables.tf b/variables.tf
@@ -560,6 +560,7 @@ variable "gke_backup_agent_config" {
   description = "Whether Backup for GKE agent is enabled for this cluster."
   default     = false
 }
+
 variable "timeouts" {
   type        = map(string)
   description = "Timeout for cluster operations."

Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,7 @@ resource "google_container_cluster" "primary" {`
`264`	`264`	`enabled = gce_persistent_disk_csi_driver_config.value.enabled`
`265`	`265`	`}`
`266`	`266`	`}`
	`267`	`+`
`267`	`268`	`dynamic "gke_backup_agent_config" {`
`268`	`269`	`for_each = local.gke_backup_agent_config`
`269`	`270`
Original file line number	Diff line number	Diff line change
`@@ -646,6 +646,7 @@ variable "gke_backup_agent_config" {`
`646`	`646`	`description = "Whether Backup for GKE agent is enabled for this cluster."`
`647`	`647`	`default = false`
`648`	`648`	`}`
	`649`	`+`
`649`	`650`	`{% endif %}`
`650`	`651`	`variable "timeouts" {`
`651`	`652`	`type = map(string)`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ resource "google_container_cluster" "primary" {`
`159`	`159`	`enabled = gce_persistent_disk_csi_driver_config.value.enabled`
`160`	`160`	`}`
`161`	`161`	`}`
	`162`	`+`
`162`	`163`	`dynamic "gke_backup_agent_config" {`
`163`	`164`	`for_each = local.gke_backup_agent_config`
`164`	`165`
Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,7 @@ resource "google_container_cluster" "primary" {`
`215`	`215`	`enabled = gce_persistent_disk_csi_driver_config.value.enabled`
`216`	`216`	`}`
`217`	`217`	`}`
	`218`	`+`
`218`	`219`	`dynamic "gke_backup_agent_config" {`
`219`	`220`	`for_each = local.gke_backup_agent_config`
`220`	`221`
Original file line number	Diff line number	Diff line change
`@@ -619,6 +619,7 @@ variable "gke_backup_agent_config" {`
`619`	`619`	`description = "Whether Backup for GKE agent is enabled for this cluster."`
`620`	`620`	`default = false`
`621`	`621`	`}`
	`622`	`+`
`622`	`623`	`variable "timeouts" {`
`623`	`624`	`type = map(string)`
`624`	`625`	`description = "Timeout for cluster operations."`
Original file line number	Diff line number	Diff line change
`@@ -589,6 +589,7 @@ variable "gke_backup_agent_config" {`
`589`	`589`	`description = "Whether Backup for GKE agent is enabled for this cluster."`
`590`	`590`	`default = false`
`591`	`591`	`}`
	`592`	`+`
`592`	`593`	`variable "timeouts" {`
`593`	`594`	`type = map(string)`
`594`	`595`	`description = "Timeout for cluster operations."`
Original file line number	Diff line number	Diff line change
`@@ -590,6 +590,7 @@ variable "gke_backup_agent_config" {`
`590`	`590`	`description = "Whether Backup for GKE agent is enabled for this cluster."`
`591`	`591`	`default = false`
`592`	`592`	`}`
	`593`	`+`
`593`	`594`	`variable "timeouts" {`
`594`	`595`	`type = map(string)`
`595`	`596`	`description = "Timeout for cluster operations."`
Original file line number	Diff line number	Diff line change
`@@ -560,6 +560,7 @@ variable "gke_backup_agent_config" {`
`560`	`560`	`description = "Whether Backup for GKE agent is enabled for this cluster."`
`561`	`561`	`default = false`
`562`	`562`	`}`
	`563`	`+`
`563`	`564`	`variable "timeouts" {`
`564`	`565`	`type = map(string)`
`565`	`566`	`description = "Timeout for cluster operations."`