github-mirrors/terraform-provider-bitbucketserver
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-provider-bitbucketserver.git synced 2026-03-22 09:29:09 +01:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix an issue where manual user removing requires terraform state rm. (#35)

Browse Source
This commit is contained in:
rayvorn
2021-07-14 20:06:54 -04:00
committed by GitHub
parent 80112bb5a9
commit 4adaea3109
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bitbucket/resource_group.go
View File

@@ -3,6 +3,7 @@ package bitbucket
import ( import (
"fmt" "fmt"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"log"
"net/url" "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 { func resourceGroupUpdate(d *schema.ResourceData, m interface{}) error {

5
bitbucket/resource_user_group.go
View File

@@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"log"
"strings" "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 { func resourceUserGroupDelete(d *schema.ResourceData, m interface{}) error {