#1300 Supporting regional clusters for node pools

google/regional_utils.go

@@ -0,0 +1,37 @@
+package google
+
+import (
+	"fmt"
+	"github.com/hashicorp/terraform/helper/schema"
+	"strings"
+)
+
+//These functions are used by both the `resource_container_node_pool` and `resource_container_cluster` for handling regional clusters
+
+func isZone(location string) bool {
+	return len(strings.Split(location, "-")) == 3
+}
+
+func getLocation(d *schema.ResourceData, config *Config) (string, error) {
+	if v, isRegionalCluster := d.GetOk("region"); isRegionalCluster {
+		return v.(string), nil
+	} else {
+		// If region is not explicitly set, use "zone" (or fall back to the provider-level zone).
+		// For now, to avoid confusion, we require region to be set in the config to create a regional
+		// cluster rather than falling back to the provider-level region.
+		return getZone(d, config)
+	}
+}
+
+// getZone reads the "zone" value from the given resource data and falls back
+// to provider's value if not given.  If neither is provided, returns an error.
+func getZone(d TerraformResourceData, config *Config) (string, error) {
+	res, ok := d.GetOk("zone")
+	if !ok {
+		if config.Zone != "" {
+			return config.Zone, nil
+		}
+		return "", fmt.Errorf("Cannot determine zone: set in this resource, or set provider-level zone.")
+	}
+	return GetResourceNameFromSelfLink(res.(string)), nil
+}

google/resource_container_cluster.go

@@ -1564,18 +1564,3 @@ func containerClusterMutexKey(project, location, clusterName string) string {
 func containerClusterFullName(project, location, cluster string) string {
 	return fmt.Sprintf("projects/%s/locations/%s/clusters/%s", project, location, cluster)
 }
-
-func getLocation(d *schema.ResourceData, config *Config) (string, error) {
-	if v, isRegionalCluster := d.GetOk("region"); isRegionalCluster {
-		return v.(string), nil
-	} else {
-		// If region is not explicitly set, use "zone" (or fall back to the provider-level zone).
-		// For now, to avoid confusion, we require region to be set in the config to create a regional
-		// cluster rather than falling back to the provider-level region.
-		return getZone(d, config)
-	}
-}
-
-func isZone(location string) bool {
-	return len(strings.Split(location, "-")) == 3
-}