Removing remaining tests and updating database_encryption wrapper

Author: marko7460

autogen/cluster_regional.tf

@@ -114,7 +114,7 @@ resource "google_container_cluster" "primary" {
 {% endif %}
 
   remove_default_node_pool = "${var.remove_default_node_pool}"
-  database_encryption      = "${var.database_encryption}"
+  database_encryption      = ["${var.database_encryption}"]
 }
 
 /******************************************

autogen/cluster_zonal.tf

@@ -114,7 +114,7 @@ resource "google_container_cluster" "zonal_primary" {
 {% endif %}
 
   remove_default_node_pool = "${var.remove_default_node_pool}"
-  database_encryption      = "${var.database_encryption}"
+  database_encryption      = ["${var.database_encryption}"]
 }
 
 /******************************************

cluster_regional.tf

@@ -102,7 +102,7 @@ resource "google_container_cluster" "primary" {
   }
 
   remove_default_node_pool = "${var.remove_default_node_pool}"
-  database_encryption      = "${var.database_encryption}"
+  database_encryption      = ["${var.database_encryption}"]
 }
 
 /******************************************

cluster_zonal.tf

@@ -102,7 +102,7 @@ resource "google_container_cluster" "zonal_primary" {
   }
 
   remove_default_node_pool = "${var.remove_default_node_pool}"
-  database_encryption      = "${var.database_encryption}"
+  database_encryption      = ["${var.database_encryption}"]
 }
 
 /******************************************

modules/private-cluster/cluster_regional.tf

@@ -110,7 +110,7 @@ resource "google_container_cluster" "primary" {
   }
 
   remove_default_node_pool = "${var.remove_default_node_pool}"
-  database_encryption      = "${var.database_encryption}"
+  database_encryption      = ["${var.database_encryption}"]
 }
 
 /******************************************

modules/private-cluster/cluster_zonal.tf

@@ -110,7 +110,7 @@ resource "google_container_cluster" "zonal_primary" {
   }
 
   remove_default_node_pool = "${var.remove_default_node_pool}"
-  database_encryption      = "${var.database_encryption}"
+  database_encryption      = ["${var.database_encryption}"]
 }
 
 /******************************************

test/ci/database-encryption.yml

@@ -31,9 +31,3 @@ variable "zones" {
 variable "compute_engine_service_account" {
   description = "The email address of the service account to associate with the GKE cluster"
 }
-
-variable "database_encryption" {
-  description = "Database encryption key and state"
-  type        = "list"
-  default     = []
-}