Improve error handling

Author: sudoapt-getclean

gitlab/resource_gitlab_group_membership.go

@@ -85,7 +85,7 @@ func resourceGitlabGroupMembershipRead(d *schema.ResourceData, meta interface{})
 	groupMember, resp, err := client.GroupMembers.GetGroupMember(groupId, userId)
 	if err != nil {
 		if resp.StatusCode == 404 {
-			log.Printf("[WARN] removing group groupMember %v for %s from state because it no longer exists in gitlab", userId, groupId)
+			log.Printf("[WARN] Group member %v not found in group %s", userId, groupId)
 			d.SetId("")
 			return nil
 		}
@@ -122,8 +122,13 @@ func resourceGitlabGroupMembershipUpdate(d *schema.ResourceData, meta interface{
 	}
 	log.Printf("[DEBUG] update gitlab group membership %v for %s", userId, groupId)
 
-	_, _, err := client.GroupMembers.EditGroupMember(groupId, userId, &options)
+	_, resp, err := client.GroupMembers.EditGroupMember(groupId, userId, &options)
 	if err != nil {
+		if resp.StatusCode == 404 {
+			log.Printf("[WARN] Group member %v not found in group %s, removing from state", userId, groupId)
+			d.SetId("")
+			return nil
+		}
 		return err
 	}
 

gitlab/resource_gitlab_group_variable.go

@@ -44,9 +44,9 @@ func resourceGitlabGroupVariable() *schema.Resource {
 func resourceGitlabGroupVariableCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*gitlab.Client)
 
-	group 	  := d.Get("group").(string)
-	key 	  := d.Get("key").(string)
-	value 	  := d.Get("value").(string)
+	group := d.Get("group").(string)
+	key := d.Get("key").(string)
+	value := d.Get("value").(string)
 	protected := d.Get("protected").(bool)
 
 	options := gitlab.CreateVariableOptions{
@@ -77,26 +77,29 @@ func resourceGitlabGroupVariableRead(d *schema.ResourceData, meta interface{}) e
 
 	log.Printf("[DEBUG] read gitlab group variable %s/%s", group, key)
 
-	v, _, err := client.GroupVariables.GetVariable(group, key)
+	v, resp, err := client.GroupVariables.GetVariable(group, key)
 	if err != nil {
+		if resp.StatusCode == 404 {
+			log.Printf("[WARN] Group variable %v for group %s not found in gitlab", key, group)
+			d.SetId("")
+			return nil
+		}
 		return err
 	}
 
 	d.Set("key", v.Key)
 	d.Set("value", v.Value)
 	d.Set("group", group)
 	d.Set("protected", v.Protected)
-	d.SetId(buildTwoPartID(&group, &v.Key))
-
 	return nil
 }
 
 func resourceGitlabGroupVariableUpdate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*gitlab.Client)
 
-	group 	  := d.Get("group").(string)
-	key 	  := d.Get("key").(string)
-	value 	  := d.Get("value").(string)
+	group := d.Get("group").(string)
+	key := d.Get("key").(string)
+	value := d.Get("value").(string)
 	protected := d.Get("protected").(bool)
 
 	options := &gitlab.UpdateVariableOptions{
@@ -107,13 +110,15 @@ func resourceGitlabGroupVariableUpdate(d *schema.ResourceData, meta interface{})
 	}
 	log.Printf("[DEBUG] update gitlab group variable %s/%s", group, key)
 
-	v, _, err := client.GroupVariables.UpdateVariable(group, key, options)
+	_, resp, err := client.GroupVariables.UpdateVariable(group, key, options)
 	if err != nil {
+		if resp.StatusCode == 404 {
+			log.Printf("[WARN] Group variable %v for group %s not found in gitlab, removing from state", key, group)
+			d.SetId("")
+			return nil
+		}
 		return err
 	}
-
-	d.SetId(buildTwoPartID(&group, &v.Key))
-
 	return resourceGitlabGroupVariableRead(d, meta)
 }
 

gitlab/resource_gitlab_project_membership.go

@@ -80,7 +80,7 @@ func resourceGitlabProjectMembershipRead(d *schema.ResourceData, meta interface{
 	projectMember, resp, err := client.ProjectMembers.GetProjectMember(projectId, userId)
 	if err != nil {
 		if resp.StatusCode == 404 {
-			log.Printf("[WARN] removing project projectMember %v for %s from state because it no longer exists in gitlab", userId, projectId)
+			log.Printf("[WARN] Project member %v not found in project %s", userId, projectId)
 			d.SetId("")
 			return nil
 		}
@@ -115,11 +115,15 @@ func resourceGitlabProjectMembershipUpdate(d *schema.ResourceData, meta interfac
 	}
 	log.Printf("[DEBUG] update gitlab project membership %v for %s", userId, projectId)
 
-	_, _, err := client.ProjectMembers.EditProjectMember(projectId, userId, &options)
+	_, resp, err := client.ProjectMembers.EditProjectMember(projectId, userId, &options)
 	if err != nil {
+		if resp.StatusCode == 404 {
+			log.Printf("[WARN] Project member %v not found in project %s, removing from state", userId, projectId)
+			d.SetId("")
+			return nil
+		}
 		return err
 	}
-
 	return resourceGitlabProjectMembershipRead(d, meta)
 }
 

gitlab/resource_gitlab_project_variable.go

@@ -77,17 +77,20 @@ func resourceGitlabProjectVariableRead(d *schema.ResourceData, meta interface{})
 
 	log.Printf("[DEBUG] read gitlab project variable %s/%s", project, key)
 
-	v, _, err := client.ProjectVariables.GetVariable(project, key)
+	v, resp, err := client.ProjectVariables.GetVariable(project, key)
 	if err != nil {
+		if resp.StatusCode == 404 {
+			log.Printf("[WARN] Project variable %v for project %s not found in gitlab", key, project)
+			d.SetId("")
+			return nil
+		}
 		return err
 	}
 
 	d.Set("key", v.Key)
 	d.Set("value", v.Value)
 	d.Set("project", project)
 	d.Set("protected", v.Protected)
-	d.SetId(buildTwoPartID(&project, &v.Key))
-
 	return nil
 }
 
@@ -107,13 +110,16 @@ func resourceGitlabProjectVariableUpdate(d *schema.ResourceData, meta interface{
 	}
 	log.Printf("[DEBUG] update gitlab project variable %s/%s", project, key)
 
-	v, _, err := client.ProjectVariables.UpdateVariable(project, key, options)
+	_, resp, err := client.ProjectVariables.UpdateVariable(project, key, options)
 	if err != nil {
+		if resp.StatusCode == 404 {
+			log.Printf("[WARN] Project variable %v for project %s not found in gitlab, removing from state", key, project)
+			d.SetId("")
+			return nil
+		}
 		return err
 	}
 
-	d.SetId(buildTwoPartID(&project, &v.Key))
-
 	return resourceGitlabProjectVariableRead(d, meta)
 }