fix: Do not error out when removing deleted users from teams (#620)

* fix: Do not error out when removing deleted users from teams
Closes #475

* lint!

Author: julienduchesne

grafana/resource_team.go

@@ -242,7 +242,12 @@ func addMemberIdsToChanges(meta interface{}, changes []MemberChange) ([]MemberCh
 	for _, change := range changes {
 		id, ok := gUserMap[change.Member.Email]
 		if !ok {
-			return nil, fmt.Errorf("error adding user %s. User does not exist in Grafana", change.Member.Email)
+			if change.Type == AddMember {
+				return nil, fmt.Errorf("error adding user %s. User does not exist in Grafana", change.Member.Email)
+			} else {
+				log.Printf("[DEBUG] Skipping removal of user %s. User does not exist in Grafana", change.Member.Email)
+				continue
+			}
 		}
 
 		change.Member.ID = id

grafana/resource_team_test.go

@@ -122,6 +122,57 @@ func TestAccTeam_Members(t *testing.T) {
 	})
 }
 
+// Test that deleted users can still be removed as members of a team
+func TestAccTeam_RemoveUnexistingMember(t *testing.T) {
+	CheckOSSTestsEnabled(t)
+	client := testAccProvider.Meta().(*client).gapi
+
+	var team gapi.Team
+	var userID int64 = -1
+
+	resource.Test(t, resource.TestCase{
+		ProviderFactories: testAccProviderFactories,
+		CheckDestroy:      testAccTeamCheckDestroy(&team),
+		Steps: []resource.TestStep{
+			{
+				PreConfig: func() {
+					// Create user
+					user := gapi.User{
+						Email:    "[email protected]",
+						Login:    "[email protected]",
+						Name:     "user1",
+						Password: "123456",
+					}
+					var err error
+					userID, err = client.CreateUser(user)
+					if err != nil {
+						t.Fatal(err)
+					}
+				},
+				Config: testAccTeam_withMember("[email protected]"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccTeamCheckExists("grafana_team.test", &team),
+					resource.TestCheckResourceAttr("grafana_team.test", "members.#", "1"),
+					resource.TestCheckResourceAttr("grafana_team.test", "members.0", "[email protected]"),
+				),
+			},
+			{
+				PreConfig: func() {
+					// Delete the user
+					if err := client.DeleteUser(userID); err != nil {
+						t.Fatal(err)
+					}
+				},
+				Config: testAccTeamConfig_basic,
+				Check: resource.ComposeTestCheckFunc(
+					testAccTeamCheckExists("grafana_team.test", &team),
+					resource.TestCheckResourceAttr("grafana_team.test", "members.#", "0"),
+				),
+			},
+		},
+	})
+}
+
 //nolint:unparam // `rn` always receives `"grafana_team.test"`
 func testAccTeamCheckExists(rn string, a *gapi.Team) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
@@ -220,3 +271,12 @@ resource "grafana_team" "test" {
   members = [ ]
 }
 `
+
+func testAccTeam_withMember(user string) string {
+	return fmt.Sprintf(`
+  resource "grafana_team" "test" {
+	name    = "terraform-acc-test"
+  	email   = "[email protected]"
+  	members = ["%s"]
+  }`, user)
+}