From a358f4147f90036dfb96511990e9c6efc7856fe0 Mon Sep 17 00:00:00 2001
From: Riley Karson <rileykarson@google.com>
Date: Wed, 28 Jun 2017 12:49:12 -0700
Subject: [PATCH] Clear BigtableTable schema when resource missing, pass along
 missing error.

---
 google/resource_bigtable_table.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/google/resource_bigtable_table.go b/google/resource_bigtable_table.go
index b662aa61..550f00b8 100644
--- a/google/resource_bigtable_table.go
+++ b/google/resource_bigtable_table.go
@@ -6,6 +6,7 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 
 	"golang.org/x/net/context"
+	"log"
 )
 
 func resourceBigtableTable() *schema.Resource {
@@ -99,7 +100,9 @@ func resourceBigtableTableRead(d *schema.ResourceData, meta interface{}) error {
 	name := d.Id()
 	_, err = c.TableInfo(ctx, name)
 	if err != nil {
-		return fmt.Errorf("Error retrieving table. Could not find %s in %s.", name, instanceName)
+		log.Printf("[WARN] Removing %s because it's gone", name)
+		d.SetId("")
+		return fmt.Errorf("Error retrieving table. Could not find %s in %s. %s", name, instanceName, err)
 	}
 
 	return nil