Add support for instance_type to google_bigtable_instance.

google/resource_bigtable_instance.go

@@ -44,11 +44,17 @@ func resourceBigtableInstance() *schema.Resource {
 			},
 
 			"num_nodes": {
-				Type:         schema.TypeInt,
+				Type:     schema.TypeInt,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"instance_type": {
+				Type:         schema.TypeString,
 				Optional:     true,
 				ForceNew:     true,
-				Default:      3,
-				ValidateFunc: IntAtLeast(3),
+				Default:      "PRODUCTION",
+				ValidateFunc: validation.StringInSlice([]string{"DEVELOPMENT", "PRODUCTION"}, false),
 			},
 
 			"storage_type": {
@@ -91,13 +97,27 @@ func resourceBigtableInstanceCreate(d *schema.ResourceData, meta interface{}) er
 		storageType = bigtable.SSD
 	}
 
+	numNodes := int32(d.Get("num_nodes").(int))
+	var instanceType bigtable.InstanceType
+	switch value := d.Get("instance_type"); value {
+	case "DEVELOPMENT":
+		instanceType = bigtable.DEVELOPMENT
+
+		if numNodes > 0 {
+			return fmt.Errorf("Can't specify a non-zero number of nodes: %d for DEVELOPMENT Bigtable instance: %s", numNodes, name)
+		}
+	case "PRODUCTION":
+		instanceType = bigtable.PRODUCTION
+	}
+
 	instanceConf := &bigtable.InstanceConf{
-		InstanceId:  name,
-		DisplayName: displayName.(string),
-		ClusterId:   d.Get("cluster_id").(string),
-		NumNodes:    int32(d.Get("num_nodes").(int)),
-		StorageType: storageType,
-		Zone:        d.Get("zone").(string),
+		InstanceId:   name,
+		DisplayName:  displayName.(string),
+		ClusterId:    d.Get("cluster_id").(string),
+		NumNodes:     numNodes,
+		InstanceType: instanceType,
+		StorageType:  storageType,
+		Zone:         d.Get("zone").(string),
 	}
 
 	c, err := config.bigtableClientFactory.NewInstanceAdminClient(project)
@@ -172,22 +192,3 @@ func resourceBigtableInstanceDestroy(d *schema.ResourceData, meta interface{}) e
 
 	return nil
 }
-
-// IntAtLeast returns a SchemaValidateFunc which tests if the provided value
-// is of type int and is above min (inclusive)
-func IntAtLeast(min int) schema.SchemaValidateFunc {
-	return func(i interface{}, k string) (s []string, es []error) {
-		v, ok := i.(int)
-		if !ok {
-			es = append(es, fmt.Errorf("expected type of %s to be int", k))
-			return
-		}
-
-		if v < min {
-			es = append(es, fmt.Errorf("expected %s to be at least %d, got %d", k, min, v))
-			return
-		}
-
-		return
-	}
-}

google/resource_bigtable_instance_test.go

@@ -29,6 +29,25 @@ func TestAccBigtableInstance_basic(t *testing.T) {
 	})
 }
 
+func TestAccBigtableInstance_development(t *testing.T) {
+	instanceName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckBigtableInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccBigtableInstance_development(instanceName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccBigtableInstanceExists(
+						"google_bigtable_instance.instance"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckBigtableInstanceDestroy(s *terraform.State) error {
 	var ctx = context.Background()
 	for _, rs := range s.RootModule().Resources {
@@ -92,3 +111,14 @@ resource "google_bigtable_instance" "instance" {
 }
 `, instanceName, instanceName)
 }
+
+func testAccBigtableInstance_development(instanceName string) string {
+	return fmt.Sprintf(`
+resource "google_bigtable_instance" "instance" {
+	name          = "%s"
+	cluster_id    = "%s"
+	zone          = "us-central1-b"
+	instance_type = "DEVELOPMENT"
+}
+`, instanceName, instanceName)
+}

google/resource_bigtable_table_test.go

@@ -106,11 +106,10 @@ func testAccBigtableTableExists(n string) resource.TestCheckFunc {
 func testAccBigtableTable(instanceName, tableName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name         = "%s"
-  cluster_id   = "%s"
-  zone         = "us-central1-b"
-  num_nodes    = 3
-  storage_type = "HDD"
+  name          = "%s"
+  cluster_id    = "%s"
+  zone          = "us-central1-b"
+  instance_type = "DEVELOPMENT"
 }
 
 resource "google_bigtable_table" "table" {
@@ -123,11 +122,10 @@ resource "google_bigtable_table" "table" {
 func testAccBigtableTable_splitKeys(instanceName, tableName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name         = "%s"
-  cluster_id   = "%s"
-  zone         = "us-central1-b"
-  num_nodes    = 3
-  storage_type = "HDD"
+  name          = "%s"
+  cluster_id    = "%s"
+  zone          = "us-central1-b"
+  instance_type = "DEVELOPMENT"
 }
 
 resource "google_bigtable_table" "table" {