From 4adaea3109bad4c345e4359cd85cbf67c0e331ee Mon Sep 17 00:00:00 2001
From: rayvorn <33153399+rayvorn@users.noreply.github.com>
Date: Wed, 14 Jul 2021 20:06:54 -0400
Subject: [PATCH] Fix an issue where manual user removing requires terraform
 state rm. (#35)

---
 bitbucket/resource_group.go      | 5 ++++-
 bitbucket/resource_user_group.go | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bitbucket/resource_group.go b/bitbucket/resource_group.go
index bb875e3..9fab849 100644
--- a/bitbucket/resource_group.go
+++ b/bitbucket/resource_group.go
@@ -3,6 +3,7 @@ package bitbucket
 import (
 	"fmt"
 	"github.com/hashicorp/terraform/helper/schema"
+	"log"
 	"net/url"
 )
 
@@ -74,7 +75,9 @@ func resourceGroupRead(d *schema.ResourceData, m interface{}) error {
 		}
 	}
 
-	return fmt.Errorf("unable to find a matching group %s", groupName)
+	d.SetId("")
+	log.Printf("[WARN] Group %s not found, removing from state", groupName)
+	return nil
 }
 
 func resourceGroupUpdate(d *schema.ResourceData, m interface{}) error {
diff --git a/bitbucket/resource_user_group.go b/bitbucket/resource_user_group.go
index 56849e1..a105d24 100644
--- a/bitbucket/resource_user_group.go
+++ b/bitbucket/resource_user_group.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/hashicorp/terraform/helper/schema"
+	"log"
 	"strings"
 )
 
@@ -103,7 +104,9 @@ func resourceUserGroupRead(d *schema.ResourceData, m interface{}) error {
 		}
 	}
 
-	return fmt.Errorf("unable to find a matching user %s in group %s", userGroup.User, userGroup.Group)
+	d.SetId("")
+	log.Printf("[WARN] User %s in group %s not found, removing from state", userGroup.User, userGroup.Group)
+	return nil
 }
 
 func resourceUserGroupDelete(d *schema.ResourceData, m interface{}) error {