Nil return for absent Bigtable resources (#5331)

Signed-off-by: Modular Magician <magic-modules@google.com> Co-authored-by: Brian Hildebrandt <brian3.14159@gmail.com>
hashicorp · Jan 7, 2020 · f79d431 · f79d431
1 parent 2c3f94b
commit f79d431
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/google/resource_bigtable_gc_policy.go b/google/resource_bigtable_gc_policy.go
@@ -151,7 +151,7 @@ func resourceBigtableGCPolicyRead(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		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
 	}
 
 	for _, fi := range ti.FamilyInfos {

diff --git a/google/resource_bigtable_instance.go b/google/resource_bigtable_instance.go
@@ -159,7 +159,7 @@ func resourceBigtableInstanceRead(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		log.Printf("[WARN] Removing %s because it's gone", instanceName)
 		d.SetId("")
-		return fmt.Errorf("Error retrieving instance. Could not find %s. %s", instanceName, err)
+		return nil
 	}
 
 	d.Set("project", project)

diff --git a/google/resource_bigtable_table.go b/google/resource_bigtable_table.go
@@ -142,7 +142,7 @@ func resourceBigtableTableRead(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		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
 	}
 
 	d.Set("project", project)