improve error handling

Signed-off-by: flbla <[email protected]>
goharbor · Sep 29, 2023 · 3f05046 · 3f05046
1 parent 7717006
commit 3f05046
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 26 deletions.
diff --git a/provider/resource_project.go b/provider/resource_project.go
@@ -89,7 +89,7 @@ func resourceProjectCreate(d *schema.ResourceData, m interface{}) error {
 		return err
 	}
 
-	id, err := client.GetID(headers)
+	id, _ := client.GetID(headers)
 	d.SetId(id)
 	return resourceProjectRead(d, m)
 }
@@ -101,12 +101,14 @@ func resourceProjectRead(d *schema.ResourceData, m interface{}) error {
 	if respCode == 404 && err != nil {
 		d.SetId("")
 		return nil
+	} else if err != nil {
+		return fmt.Errorf("resource not found %s", d.Id())
 	}
 
 	var jsonData models.ProjectsBodyResponses
 	err = json.Unmarshal([]byte(resp), &jsonData)
 	if err != nil {
-		d.Set("name", jsonData.Name)
+		return fmt.Errorf("resource not found %s", d.Id())
 	}
 	autoScan := jsonData.Metadata.AutoScan
 	var vuln bool
@@ -185,12 +187,12 @@ func resourceProjectDelete(d *schema.ResourceData, m interface{}) error {
 		projectName := d.Get("name").(string)
 		repos, _ := apiClient.GetProjectRepositories(projectName)
 		if len(repos) != 0 {
-			return fmt.Errorf("Project %s is not empty, please set force_delete to TRUE to clean all repositories", projectName)
+			return fmt.Errorf("project %s is not empty, please set force_delete to TRUE to clean all repositories", projectName)
 		}
 	}
 
 	_, _, respCode, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
-	if respCode == 404 && err != nil { // We can't delete something that doesn't exist. Hence the 404-check
+	if respCode != 404 && err != nil { // We can't delete something that doesn't exist. Hence the 404-check
 		return err
 	}
 	return nil

diff --git a/provider/resource_project_member_group.go b/provider/resource_project_member_group.go
@@ -101,20 +101,19 @@ func resourceMembersGroupRead(d *schema.ResourceData, m interface{}) error {
 	resp, _, respCode, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
 	if respCode == 404 && err != nil {
 		d.SetId("")
-		return fmt.Errorf("Resource not found %s", d.Id())
+		return nil
+	} else if err != nil {
+		return fmt.Errorf("resource not found %s", d.Id())
 	}
 
 	var jsonData models.ProjectMembersBodyResponses
 	err = json.Unmarshal([]byte(resp), &jsonData)
 	if err != nil {
-		d.Set("role", client.RoleTypeNumber(jsonData.RoleID))
-		d.Set("group_name", jsonData.EntityName)
-	}
-	if err == nil {
-		d.Set("role", client.RoleTypeNumber(jsonData.RoleID))
-		d.Set("project_id", checkProjectid(strconv.Itoa(jsonData.ProjectID)))
-		d.Set("group_name", jsonData.EntityName)
+		return fmt.Errorf("resource not found %s", d.Id())
 	}
+	d.Set("role", client.RoleTypeNumber(jsonData.RoleID))
+	d.Set("project_id", checkProjectid(strconv.Itoa(jsonData.ProjectID)))
+	d.Set("group_name", jsonData.EntityName)
 	return nil
 }
 
@@ -133,9 +132,9 @@ func resourceMembersGroupUpdate(d *schema.ResourceData, m interface{}) error {
 func resourceMembersGroupDelete(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	_, _, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
-	if err != nil {
-		fmt.Println(err)
+	_, _, respCode, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
+	if respCode != 404 && err != nil { // We can't delete something that doesn't exist. Hence the 404-check
+		return err
 	}
 	return nil
 }
diff --git a/provider/resource_project_member_user.go b/provider/resource_project_member_user.go
@@ -80,19 +80,20 @@ func resourceMembersUserRead(d *schema.ResourceData, m interface{}) error {
 	resp, _, respCode, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
 	if respCode == 404 && err != nil {
 		d.SetId("")
-		return fmt.Errorf("Resource not found %s", d.Id())
+		return nil
+	} else if err != nil {
+		return fmt.Errorf("resource not found %s", d.Id())
 	}
+
 	var jsonData models.ProjectMembersBodyResponses
 	err = json.Unmarshal([]byte(resp), &jsonData)
 	if err != nil {
-		d.Set("role", client.RoleTypeNumber(jsonData.RoleID))
-		d.Set("user_name", jsonData.EntityName)
-	}
-	if err == nil {
-		d.Set("role", client.RoleTypeNumber(jsonData.RoleID))
-		d.Set("project_id", checkProjectid(strconv.Itoa(jsonData.ProjectID)))
-		d.Set("user_name", jsonData.EntityName)
+		return fmt.Errorf("resource not found %s", d.Id())
 	}
+	d.Set("role", client.RoleTypeNumber(jsonData.RoleID))
+	d.Set("project_id", checkProjectid(strconv.Itoa(jsonData.ProjectID)))
+	d.Set("user_name", jsonData.EntityName)
+
 	return nil
 }
 
@@ -111,9 +112,9 @@ func resourceMembersUserUpdate(d *schema.ResourceData, m interface{}) error {
 func resourceMembersUserDelete(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	_, _, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
-	if err != nil {
-		fmt.Println(err)
+	_, _, respCode, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
+	if respCode != 404 && err != nil { // We can't delete something that doesn't exist. Hence the 404-check
+		return err
 	}
 	return nil
 }