Bigtable: Increase timeout in table creation (#6495)

* Increase timeout in table creation

* Variable name change

mmv1/third_party/terraform/resources/resource_bigtable_table.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -19,6 +20,11 @@ func resourceBigtableTable() *schema.Resource {
 			State: resourceBigtableTableImport,
 		},
 
+		// Set a longer timeout for table creation as adding column families can be slow.
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(45 * time.Minute),
+		},
+
 		// ----------------------------------------------------------------------
 		// IMPORTANT: Do not add any additional ForceNew fields to this resource.
 		// Destroying/recreating tables can lead to data loss for users.
@@ -124,7 +130,12 @@ func resourceBigtableTableCreate(d *schema.ResourceData, meta interface{}) error
 			column := co.(map[string]interface{})
 
 			if v, ok := column["family"]; ok {
-				if err := c.CreateColumnFamily(ctx, name, v.(string)); err != nil {
+				// Set a longer timeout as adding column family can be slow. The current timeout
+				// in the Go client is less than one minute. This timeout should not be longer
+				// than the overall timeout.
+				ctxWithTimeout, cancel := context.WithTimeout(ctx, 5*time.Minute)
+				defer cancel() // Always call cancel.
+				if err := c.CreateColumnFamily(ctxWithTimeout, name, v.(string)); err != nil {
 					return fmt.Errorf("Error creating column family %s. %s", v, err)
 				}
 			}