Spanner Fixes

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

google/resource_spanner_database.go

@@ -119,6 +119,20 @@ func resourceSpannerDatabaseCreate(d *schema.ResourceData, meta interface{}) err
 	}
 	d.SetId(id)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+	waitErr := spannerOperationWaitTime(
+		config, res, project, "Creating Database",
+		int(d.Timeout(schema.TimeoutCreate).Minutes()))
+
+	if waitErr != nil {
+		// The resource didn't actually create
+		d.SetId("")
+		return fmt.Errorf("Error waiting to create Database: %s", waitErr)
+	}
+
 	log.Printf("[DEBUG] Finished creating Database %q: %#v", d.Id(), res)
 
 	return resourceSpannerDatabaseRead(d, meta)

google/resource_spanner_instance.go

@@ -261,19 +261,6 @@ func resourceSpannerInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 		return fmt.Errorf("Error updating Instance %q: %s", d.Id(), err)
 	}
 
-	project, err := getProject(d, config)
-	if err != nil {
-		return err
-	}
-
-	err = spannerOperationWaitTime(
-		config, res, project, "Updating Instance",
-		int(d.Timeout(schema.TimeoutUpdate).Minutes()))
-
-	if err != nil {
-		return err
-	}
-
 	return resourceSpannerInstanceRead(d, meta)
 }
 
@@ -292,19 +279,6 @@ func resourceSpannerInstanceDelete(d *schema.ResourceData, meta interface{}) err
 		return handleNotFoundError(err, d, "Instance")
 	}
 
-	project, err := getProject(d, config)
-	if err != nil {
-		return err
-	}
-
-	err = spannerOperationWaitTime(
-		config, res, project, "Deleting Instance",
-		int(d.Timeout(schema.TimeoutDelete).Minutes()))
-
-	if err != nil {
-		return err
-	}
-
 	log.Printf("[DEBUG] Finished deleting Instance %q: %#v", d.Id(), res)
 	return nil
 }