added reponse code var

client/project.go

@@ -1,8 +1,8 @@
 package client
 
 import (
-	"fmt"
 	"encoding/json"
+	"fmt"
 	"log"
 	"strconv"
 	"strings"
@@ -66,7 +66,7 @@ func expandCveAllowList(cveAllowlist []interface{}) models.CveAllowlistItems {
 }
 
 func (client *Client) UpdateStorageQuota(d *schema.ResourceData) (err error) {
-	resp, _, err := client.SendRequest("GET", models.PathConfig, nil, 200)
+	resp, _, _, err := client.SendRequest("GET", models.PathConfig, nil, 200)
 
 	var jsonData models.ConfigBodyResponse
 	err = json.Unmarshal([]byte(resp), &jsonData)
@@ -82,7 +82,7 @@ func (client *Client) UpdateStorageQuota(d *schema.ResourceData) (err error) {
 			for {
 				quotasPath := fmt.Sprintf("/quotas/?page=%d&page_size=100", page)
 
-				resp, _, err := client.SendRequest("GET", quotasPath, nil, 200)
+				resp, _, _, err := client.SendRequest("GET", quotasPath, nil, 200)
 				if err != nil {
 					return err
 				}
@@ -109,7 +109,7 @@ func (client *Client) UpdateStorageQuota(d *schema.ResourceData) (err error) {
 						}
 						body := models.StorageQuota{quota}
 
-						_, _, err = client.SendRequest("PUT", quotaID, body, 200)
+						_, _, _, err = client.SendRequest("PUT", quotaID, body, 200)
 						if err != nil {
 							return err
 						}

provider/data_project.go

@@ -39,7 +39,7 @@ func dataProjectRead(d *schema.ResourceData, m interface{}) error {
 	name := d.Get("name").(string)
 	projectPath := models.PathProjects + "?name=" + name
 
-	resp, _, err := apiClient.SendRequest("GET", projectPath, nil, 200)
+	resp, _, _, err := apiClient.SendRequest("GET", projectPath, nil, 200)
 	if err != nil {
 		return err
 	}

provider/data_registry.go

@@ -50,7 +50,7 @@ func dataRegistryRead(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 	name := d.Get("name").(string)
 	registryPath := models.PathRegistries + "?name=" + name
-	resp, _, err := apiClient.SendRequest("GET", registryPath, nil, 200)
+	resp, _, _, err := apiClient.SendRequest("GET", registryPath, nil, 200)
 	if err != nil {
 		return err
 	}

provider/provider_test.go

@@ -29,12 +29,6 @@ func testProvider(t *testing.T) {
 
 func testAccPreCheck(t *testing.T) {
 
-	// apiClient := testAccProvider.Meta().(*client.Client)
-	// _, _, err := apiClient.SendRequest("GET", "/health", nil, 200)
-	// if err != nil {
-	// 	t.Fatal("Harbor instamce is not healthy")
-	// }
-
 	if v := os.Getenv("HARBOR_URL"); v == "" {
 		t.Fatal("HARBOR_URL must be set for acceptance tests")
 	}

provider/resource_config_auth.go

@@ -79,7 +79,7 @@ func resourceConfigAuth() *schema.Resource {
 				Type:          schema.TypeString,
 				Optional:      true,
 				ConflictsWith: ldapConflictsWith(),
-				RequiredWith:  ldapRequiredWith(),				
+				RequiredWith:  ldapRequiredWith(),
 			},
 			"ldap_uid": {
 				Type:          schema.TypeString,
@@ -155,7 +155,7 @@ func resourceConfigAuthCreate(d *schema.ResourceData, m interface{}) error {
 
 	body := client.GetConfigAuth(d)
 
-	_, _, err := apiClient.SendRequest("PUT", models.PathConfig, body, 200)
+	_, _, _, err := apiClient.SendRequest("PUT", models.PathConfig, body, 200)
 	if err != nil {
 		return err
 	}
@@ -166,7 +166,7 @@ func resourceConfigAuthCreate(d *schema.ResourceData, m interface{}) error {
 func resourceConfigAuthRead(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	resp, _, err := apiClient.SendRequest("GET", models.PathConfig, nil, 200)
+	resp, _, _, err := apiClient.SendRequest("GET", models.PathConfig, nil, 200)
 	if err != nil {
 		d.SetId("")
 		return nil

provider/resource_config_email.go

@@ -56,7 +56,7 @@ func resourceConfigEmailCreate(d *schema.ResourceData, m interface{}) error {
 
 	body := client.GetConfigEmail(d)
 
-	_, _, err := apiClient.SendRequest("PUT", models.PathConfig, body, 200)
+	_, _, _, err := apiClient.SendRequest("PUT", models.PathConfig, body, 200)
 	if err != nil {
 		return err
 	}
@@ -67,7 +67,7 @@ func resourceConfigEmailCreate(d *schema.ResourceData, m interface{}) error {
 func resourceConfigEmailRead(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	resp, _, err := apiClient.SendRequest("GET", models.PathConfig, nil, 200)
+	resp, _, _, err := apiClient.SendRequest("GET", models.PathConfig, nil, 200)
 	if err != nil {
 		d.SetId("")
 		return nil

provider/resource_config_system.go

@@ -41,7 +41,7 @@ func resourceConfigSystemCreate(d *schema.ResourceData, m interface{}) error {
 
 	body := client.GetConfigSystem(d)
 
-	_, _, err := apiClient.SendRequest("PUT", models.PathConfig, body, 200)
+	_, _, _, err := apiClient.SendRequest("PUT", models.PathConfig, body, 200)
 	if err != nil {
 		return err
 	}
@@ -54,19 +54,6 @@ func resourceConfigSystemRead(d *schema.ResourceData, m interface{}) error {
 	return nil
 }
 
-// func resourceConfigSystemUpdate(d *schema.ResourceData, m interface{}) error {
-// 	apiClient := m.(*client.Client)
-
-// 	body := client.GetConfigSystem(d)
-
-// 	_, _, err := apiClient.SendRequest("PUT", models.PathConfig, body, 200)
-// 	if err != nil {
-// 		return err
-// 	}
-
-// 	return resourceConfigSystemRead(d, m)
-// }
-
 func resourceConfigSystemDelete(d *schema.ResourceData, m interface{}) error {
 	return nil
 }

provider/resource_garbage_collection.go

@@ -43,7 +43,7 @@ func resourceGCCreate(d *schema.ResourceData, m interface{}) error {
 func resourceGCRead(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	resp, _, err := apiClient.SendRequest("GET", models.PathGC, nil, 200)
+	resp, _, _, err := apiClient.SendRequest("GET", models.PathGC, nil, 200)
 	if err != nil {
 		d.SetId("")
 		return nil
@@ -80,7 +80,7 @@ func resourceGCDelete(d *schema.ResourceData, m interface{}) error {
 	body.Schedule.Type = "None"
 	body.Parameters.DeleteUntagged = false
 
-	_, _, err := apiClient.SendRequest("PUT", models.PathGC, body, 200)
+	_, _, _, err := apiClient.SendRequest("PUT", models.PathGC, body, 200)
 	if err != nil {
 		return err
 	}

provider/resource_garbage_collection_test.go

@@ -1,3 +1,4 @@
+//go:build external_auth
 // +build external_auth
 
 package provider
@@ -21,7 +22,7 @@ func testAccCheckGCDestroy(s *terraform.State) error {
 			continue
 		}
 
-		resp, _, err := apiClient.SendRequest("GET", rs.Primary.ID, nil, 200)
+		resp, _, _, err := apiClient.SendRequest("GET", rs.Primary.ID, nil, 200)
 		if err != nil {
 			return fmt.Errorf("Resouse was not delete \n %s", resp)
 		}

provider/resource_group.go

@@ -17,10 +17,10 @@ func resourceGroup() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
-                        "group_type": {
-                                Type:     schema.TypeInt,
-                                Required: true,
-                        },
+			"group_type": {
+				Type:     schema.TypeInt,
+				Required: true,
+			},
 		},
 		Create: resourceGroupCreate,
 		Read:   resourceGroupRead,
@@ -37,7 +37,7 @@ func resourceGroupCreate(d *schema.ResourceData, m interface{}) error {
 
 	body := client.GroupBody(d)
 
-	_, header, err := apiClient.SendRequest("POST", models.PathGroups, &body, 201)
+	_, header, _, err := apiClient.SendRequest("POST", models.PathGroups, &body, 201)
 	if err != nil {
 		return err
 	}
@@ -53,7 +53,7 @@ func resourceGroupCreate(d *schema.ResourceData, m interface{}) error {
 
 func resourceGroupRead(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
-	resp, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
+	resp, _, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
 	if err != nil {
 		return err
 	}
@@ -76,7 +76,7 @@ func resourceGroupUpdate(d *schema.ResourceData, m interface{}) error {
 func resourceGroupDelete(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	_, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
+	_, _, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
 	if err != nil {
 		return err
 	}

provider/resource_harbor_project_webhook.go

@@ -71,7 +71,7 @@ func resourceProjectWebhookCreate(d *schema.ResourceData, m interface{}) error {
 	body := client.ProjectWebhookBody(d)
 
 	url := d.Get("project_id").(string) + "/webhook/policies"
-	_, headers, err := apiClient.SendRequest("POST", url, body, 201)
+	_, headers, _, err := apiClient.SendRequest("POST", url, body, 201)
 	if err != nil {
 		return err
 	}
@@ -84,7 +84,7 @@ func resourceProjectWebhookCreate(d *schema.ResourceData, m interface{}) error {
 func resourceProjectWebhookRead(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	resp, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
+	resp, _, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
 	if err != nil {
 		d.SetId("")
 		return nil
@@ -111,7 +111,7 @@ func resourceProjectWebhookUpdate(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 	body := client.ProjectWebhookBody(d)
 
-	_, _, err := apiClient.SendRequest("PUT", d.Id(), body, 200)
+	_, _, _, err := apiClient.SendRequest("PUT", d.Id(), body, 200)
 	if err != nil {
 		return err
 	}
@@ -122,7 +122,7 @@ func resourceProjectWebhookUpdate(d *schema.ResourceData, m interface{}) error {
 func resourceProjectWebhookDelete(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	_, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
+	_, _, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
 	if err != nil {
 		return err
 	}

provider/resource_harbor_project_webhook_test.go

@@ -58,7 +58,7 @@ func testAccCheckProjectWebhookDestroy(s *terraform.State) error {
 			continue
 		}
 
-		resp, _, err := apiClient.SendRequest("GET", rs.Primary.ID, nil, 404)
+		resp, _, _, err := apiClient.SendRequest("GET", rs.Primary.ID, nil, 404)
 		if err != nil {
 			return fmt.Errorf("Resouse was not delete \n %s", resp)
 		}

provider/resource_immutable_tag_rule.go

@@ -65,7 +65,7 @@ func resourceImmutableTagRuleCreate(d *schema.ResourceData, m interface{}) error
 	body := client.GetImmutableTagRuleBody(d)
 	id := ""
 
-	_, headers, err := apiClient.SendRequest("POST", path, body, 201)
+	_, headers, _, err := apiClient.SendRequest("POST", path, body, 201)
 	if err != nil {
 		return err
 	}
@@ -86,7 +86,7 @@ func resourceImmutableTagRuleRead(d *schema.ResourceData, m interface{}) error {
 	}
 	log.Printf("[DEBUG] Path to immutable tag rules: %+v\n", projectImmutableTagRulePath)
 
-	resp, _, err := apiClient.SendRequest("GET", projectImmutableTagRulePath, nil, 200)
+	resp, _, _, err := apiClient.SendRequest("GET", projectImmutableTagRulePath, nil, 200)
 	if err != nil {
 		return fmt.Errorf("Resource not found %s", projectImmutableTagRulePath)
 	}
@@ -128,7 +128,7 @@ func resourceImmutableTagRuleUpdate(d *schema.ResourceData, m interface{}) error
 	body := client.GetImmutableTagRuleBody(d)
 	id := d.Id()
 	log.Printf("[DEBUG] Update Id: %+v\n", id)
-	_, _, err := apiClient.SendRequest("PUT", id, body, 200)
+	_, _, _, err := apiClient.SendRequest("PUT", id, body, 200)
 	if err != nil {
 		return err
 	}
@@ -139,7 +139,7 @@ func resourceImmutableTagRuleUpdate(d *schema.ResourceData, m interface{}) error
 func resourceImmutableTagRuleDelete(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	_, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
+	_, _, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
 	if err != nil {
 		return err
 	}

provider/resource_interrogation_services.go

@@ -53,7 +53,7 @@ func resourceVulnDelete(d *schema.ResourceData, m interface{}) error {
 	body.Schedule.Cron = ""
 	body.Schedule.Type = "None"
 
-	_, _, err := apiClient.SendRequest("PUT", models.PathVuln, body, 200)
+	_, _, _, err := apiClient.SendRequest("PUT", models.PathVuln, body, 200)
 	if err != nil {
 		return err
 	}

provider/resource_labels.go

@@ -49,7 +49,7 @@ func resourceLabelCreate(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 	body := client.LabelsBody(d)
 
-	_, headers, err := apiClient.SendRequest("POST", models.PathLabel, body, 201)
+	_, headers, _, err := apiClient.SendRequest("POST", models.PathLabel, body, 201)
 	if err != nil {
 		return err
 	}
@@ -62,7 +62,7 @@ func resourceLabelCreate(d *schema.ResourceData, m interface{}) error {
 func resourceLabelRead(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	resp, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
+	resp, _, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
 	if err != nil {
 		d.SetId("")
 		return nil
@@ -86,7 +86,7 @@ func resourceLabelUpdate(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 	body := client.LabelsBody(d)
 
-	_, _, err := apiClient.SendRequest("PUT", d.Id(), body, 200)
+	_, _, _, err := apiClient.SendRequest("PUT", d.Id(), body, 200)
 	if err != nil {
 		return err
 	}
@@ -97,7 +97,7 @@ func resourceLabelUpdate(d *schema.ResourceData, m interface{}) error {
 func resourceLabelDelete(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	_, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
+	_, _, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
 	if err != nil {
 		return err
 	}

provider/resource_labels_test.go

@@ -20,7 +20,7 @@ func testAccCheckLabelDestroy(s *terraform.State) error {
 			continue
 		}
 
-		resp, _, err := apiClient.SendRequest("GET", rs.Primary.ID, nil, 404)
+		resp, _, _, err := apiClient.SendRequest("GET", rs.Primary.ID, nil, 404)
 		if err != nil {
 			return fmt.Errorf("Resouse was not delete \n %s", resp)
 		}

provider/resource_project.go

@@ -79,7 +79,7 @@ func resourceProjectCreate(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 	body := client.ProjectBody(d)
 
-	_, headers, err := apiClient.SendRequest("POST", models.PathProjects, body, 201)
+	_, headers, _, err := apiClient.SendRequest("POST", models.PathProjects, body, 201)
 	if err != nil {
 		return err
 	}
@@ -92,7 +92,7 @@ func resourceProjectCreate(d *schema.ResourceData, m interface{}) error {
 func resourceProjectRead(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 
-	resp, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
+	resp, _, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
 	if err != nil {
 		d.SetId("")
 		return nil
@@ -140,7 +140,7 @@ func resourceProjectUpdate(d *schema.ResourceData, m interface{}) error {
 	apiClient := m.(*client.Client)
 	body := client.ProjectBody(d)
 
-	_, _, err := apiClient.SendRequest("PUT", d.Id(), body, 200)
+	_, _, _, err := apiClient.SendRequest("PUT", d.Id(), body, 200)
 	if err != nil {
 		return err
 	}
@@ -166,7 +166,7 @@ func resourceProjectDelete(d *schema.ResourceData, m interface{}) error {
 		}
 	}
 
-	_, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
+	_, _, _, err := apiClient.SendRequest("DELETE", d.Id(), nil, 200)
 	if err != nil {
 		return err
 	}