Add timeouts support for BigTable operations (#8037) (#14861)

* Update resource_bigtable_gc_policy.go

* Update resource_bigtable_instance.go

* Update resource_bigtable_table.go

* Improve timeout handling

* Improve timeout handling

* Adjust default timeout value

* Adjust default timeout value

* Add example

* Fixed according to review

* Fixed according to review

* remove unneeded example

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/8037.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+bigtable: add timeout support for bigtable admin operations 
+```

google/resource_bigtable_gc_policy.go

@@ -71,6 +71,11 @@ func ResourceBigtableGCPolicy() *schema.Resource {
 		Update:        resourceBigtableGCPolicyUpsert,
 		CustomizeDiff: resourceBigtableGCPolicyCustomizeDiff,
 
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(20 * time.Minute),
+			Delete: schema.DefaultTimeout(20 * time.Minute),
+		},
+
 		Schema: map[string]*schema.Schema{
 			"instance_name": {
 				Type:             schema.TypeString,

google/resource_bigtable_instance.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"log"
 	"strings"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -29,6 +30,11 @@ func ResourceBigtableInstance() *schema.Resource {
 			State: resourceBigtableInstanceImport,
 		},
 
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(20 * time.Minute),
+			Update: schema.DefaultTimeout(20 * time.Minute),
+		},
+
 		CustomizeDiff: customdiff.All(
 			resourceBigtableInstanceClusterReorderTypeList,
 		),
@@ -213,8 +219,9 @@ func resourceBigtableInstanceCreate(d *schema.ResourceData, meta interface{}) er
 
 	defer c.Close()
 
-	err = c.CreateInstanceWithClusters(ctx, conf)
-	if err != nil {
+	ctxWithTimeout, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutCreate))
+	defer cancel()
+	if err := c.CreateInstanceWithClusters(ctxWithTimeout, conf); err != nil {
 		return fmt.Errorf("Error creating instance. %s", err)
 	}
 
@@ -349,8 +356,9 @@ func resourceBigtableInstanceUpdate(d *schema.ResourceData, meta interface{}) er
 		return err
 	}
 
-	_, err = bigtable.UpdateInstanceAndSyncClusters(ctx, c, conf)
-	if err != nil {
+	ctxWithTimeout, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutUpdate))
+	defer cancel()
+	if _, err := bigtable.UpdateInstanceAndSyncClusters(ctxWithTimeout, c, conf); err != nil {
 		return fmt.Errorf("Error updating instance. %s", err)
 	}
 

google/resource_bigtable_table.go

@@ -30,6 +30,7 @@ func ResourceBigtableTable() *schema.Resource {
 		// Set a longer timeout for table creation as adding column families can be slow.
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(45 * time.Minute),
+			Update: schema.DefaultTimeout(20 * time.Minute),
 		},
 
 		// ----------------------------------------------------------------------
@@ -157,7 +158,7 @@ func resourceBigtableTableCreate(d *schema.ResourceData, meta interface{}) error
 	// This method may return before the table's creation is complete - we may need to wait until
 	// it exists in the future.
 	// Set a longer timeout as creating table and adding column families can be pretty slow.
-	ctxWithTimeout, cancel := context.WithTimeout(ctx, 20*time.Minute)
+	ctxWithTimeout, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutCreate))
 	defer cancel() // Always call cancel.
 	err = c.CreateTableFromConf(ctxWithTimeout, &tblConf)
 	if err != nil {
@@ -276,14 +277,16 @@ func resourceBigtableTableUpdate(d *schema.ResourceData, meta interface{}) error
 		}
 	}
 
+	ctxWithTimeout, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutCreate))
+	defer cancel()
 	if d.HasChange("deletion_protection") {
 		deletionProtection := d.Get("deletion_protection")
 		if deletionProtection == "PROTECTED" {
-			if err := c.UpdateTableWithDeletionProtection(ctx, name, bigtable.Protected); err != nil {
+			if err := c.UpdateTableWithDeletionProtection(ctxWithTimeout, name, bigtable.Protected); err != nil {
 				return fmt.Errorf("Error updating deletion protection in table %v: %s", name, err)
 			}
 		} else if deletionProtection == "UNPROTECTED" {
-			if err := c.UpdateTableWithDeletionProtection(ctx, name, bigtable.Unprotected); err != nil {
+			if err := c.UpdateTableWithDeletionProtection(ctxWithTimeout, name, bigtable.Unprotected); err != nil {
 				return fmt.Errorf("Error updating deletion protection in table %v: %s", name, err)
 			}
 		}