Make read callbacks graceful for gitlab_project_share_group, gitlab_b…

…ranch_protection and gitlab_label resources (#223)
gitlabhq · Nov 28, 2019 · b173eeb · b173eeb
1 parent 5d0afe0
commit b173eeb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/gitlab/resource_gitlab_branch_protection.go b/gitlab/resource_gitlab_branch_protection.go
@@ -89,7 +89,9 @@ func resourceGitlabBranchProtectionRead(d *schema.ResourceData, meta interface{}
 
 	pb, _, err := client.ProtectedBranches.GetProtectedBranch(project, branch)
 	if err != nil {
-		return err
+		log.Printf("[DEBUG] failed to read gitlab branch protection for project %s, branch %s: %s", project, branch, err)
+		d.SetId("")
+		return nil
 	}
 
 	d.Set("project", project)

diff --git a/gitlab/resource_gitlab_label.go b/gitlab/resource_gitlab_label.go
@@ -70,7 +70,9 @@ func resourceGitlabLabelRead(d *schema.ResourceData, meta interface{}) error {
 
 	labels, _, err := client.Labels.ListLabels(project, nil)
 	if err != nil {
-		return err
+		log.Printf("[DEBUG] failed to read gitlab label %s/%s: %s", project, labelName, err)
+		d.SetId("")
+		return nil
 	}
 	found := false
 	for _, label := range labels {

diff --git a/gitlab/resource_gitlab_project_share_group.go b/gitlab/resource_gitlab_project_share_group.go
@@ -76,7 +76,9 @@ func resourceGitlabProjectShareGroupRead(d *schema.ResourceData, meta interface{
 
 	projectInformation, _, err := client.Projects.GetProject(projectId, nil)
 	if err != nil {
-		return err
+		log.Printf("[DEBUG] failed to read gitlab project %s: %s", id, err)
+		d.SetId("")
+		return nil
 	}
 
 	for _, v := range projectInformation.SharedWithGroups {