Merge pull request terraform-google-modules#376 from omazin/import-workaround

Make setting 'region' more clear.

Author: morgante

autogen/main.tf.tmpl

@@ -38,7 +38,7 @@ resource "random_shuffle" "available_zones" {
 locals {
  // location
  location = var.regional ? var.region : var.zones[0]
- region = var.region == null ? join("-", slice(split("-", var.zones[0]), 0, 2)) : var.region
+ region = var.regional ? var.region : join("-", slice(split("-", var.zones[0]), 0, 2))
  // for regional cluster - use var.zones if provided, use available otherwise, for zonal cluster use var.zones with first element extracted
  node_locations = var.regional ? coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result)) : slice(var.zones, 1, length(var.zones))
  // kuberentes version

main.tf

@@ -34,7 +34,7 @@ resource "random_shuffle" "available_zones" {
 locals {
  // location
  location = var.regional ? var.region : var.zones[0]
- region = var.region == null ? join("-", slice(split("-", var.zones[0]), 0, 2)) : var.region
+ region = var.regional ? var.region : join("-", slice(split("-", var.zones[0]), 0, 2))
  // for regional cluster - use var.zones if provided, use available otherwise, for zonal cluster use var.zones with first element extracted
  node_locations = var.regional ? coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result)) : slice(var.zones, 1, length(var.zones))
  // kuberentes version

modules/beta-private-cluster-update-variant/main.tf

@@ -34,7 +34,7 @@ resource "random_shuffle" "available_zones" {
 locals {
  // location
  location = var.regional ? var.region : var.zones[0]
- region = var.region == null ? join("-", slice(split("-", var.zones[0]), 0, 2)) : var.region
+ region = var.regional ? var.region : join("-", slice(split("-", var.zones[0]), 0, 2))
  // for regional cluster - use var.zones if provided, use available otherwise, for zonal cluster use var.zones with first element extracted
  node_locations = var.regional ? coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result)) : slice(var.zones, 1, length(var.zones))
  // kuberentes version

modules/beta-private-cluster/main.tf

@@ -34,7 +34,7 @@ resource "random_shuffle" "available_zones" {
 locals {
  // location
  location = var.regional ? var.region : var.zones[0]
- region = var.region == null ? join("-", slice(split("-", var.zones[0]), 0, 2)) : var.region
+ region = var.regional ? var.region : join("-", slice(split("-", var.zones[0]), 0, 2))
  // for regional cluster - use var.zones if provided, use available otherwise, for zonal cluster use var.zones with first element extracted
  node_locations = var.regional ? coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result)) : slice(var.zones, 1, length(var.zones))
  // kuberentes version

modules/beta-public-cluster/main.tf

@@ -34,7 +34,7 @@ resource "random_shuffle" "available_zones" {
 locals {
  // location
  location = var.regional ? var.region : var.zones[0]
- region = var.region == null ? join("-", slice(split("-", var.zones[0]), 0, 2)) : var.region
+ region = var.regional ? var.region : join("-", slice(split("-", var.zones[0]), 0, 2))
  // for regional cluster - use var.zones if provided, use available otherwise, for zonal cluster use var.zones with first element extracted
  node_locations = var.regional ? coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result)) : slice(var.zones, 1, length(var.zones))
  // kuberentes version

modules/private-cluster-update-variant/main.tf

@@ -34,7 +34,7 @@ resource "random_shuffle" "available_zones" {
 locals {
  // location
  location = var.regional ? var.region : var.zones[0]
- region = var.region == null ? join("-", slice(split("-", var.zones[0]), 0, 2)) : var.region
+ region = var.regional ? var.region : join("-", slice(split("-", var.zones[0]), 0, 2))
  // for regional cluster - use var.zones if provided, use available otherwise, for zonal cluster use var.zones with first element extracted
  node_locations = var.regional ? coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result)) : slice(var.zones, 1, length(var.zones))
  // kuberentes version

modules/private-cluster/main.tf

@@ -34,7 +34,7 @@ resource "random_shuffle" "available_zones" {
 locals {
  // location
  location = var.regional ? var.region : var.zones[0]
- region = var.region == null ? join("-", slice(split("-", var.zones[0]), 0, 2)) : var.region
+ region = var.regional ? var.region : join("-", slice(split("-", var.zones[0]), 0, 2))
  // for regional cluster - use var.zones if provided, use available otherwise, for zonal cluster use var.zones with first element extracted
  node_locations = var.regional ? coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result)) : slice(var.zones, 1, length(var.zones))
  // kuberentes version