refactoring of gateway channel variable handling

Author: tuunit

cluster.tf

@@ -49,10 +49,10 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "gateway_api_config" {
-    for_each = local.gateway_api_config
+    for_each = local.gateway_api_channel
 
     content {
-      channel = gateway_api_config.value.channel
+      channel = gateway_api_channel.value
     }
   }
 

main.tf

@@ -50,8 +50,8 @@ locals {
   windows_node_pool_names = [for np in toset(var.windows_node_pools) : np.name]
   windows_node_pools      = zipmap(local.windows_node_pool_names, tolist(toset(var.windows_node_pools)))
 
-  release_channel    = var.release_channel != null ? [{ channel : var.release_channel }] : []
-  gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
+  release_channel     = var.release_channel != null ? [{ channel : var.release_channel }] : []
+  gateway_api_channel = var.gateway_api_channel
 
   autoscaling_resource_limits = var.cluster_autoscaling.enabled ? concat([{
     resource_type = "cpu"

outputs.tf

@@ -150,7 +150,7 @@ output "release_channel" {
 
 output "gateway_api_channel" {
   description = "The gateway api channel of this cluster"
-  value       = var.gateway_api_channel
+  value       = local.gateway_api_config.channel
 }
 
 output "identity_namespace" {