Merge pull request #125 from mxmorin/master

Management of missing resources
goharbor · May 27, 2021 · 34bf1cf · 34bf1cf
2 parents aeb3502 + 68898b7
commit 34bf1cf
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 7 deletions.
diff --git a/provider/resource_config_auth.go b/provider/resource_config_auth.go
@@ -168,7 +168,8 @@ func resourceConfigAuthRead(d *schema.ResourceData, m interface{}) error {
 
 	resp, _, err := apiClient.SendRequest("GET", models.PathConfig, nil, 200)
 	if err != nil {
-		return err
+		d.SetId("")
+		return nil
 	}
 
 	err = client.SetAuthValues(d, resp)

diff --git a/provider/resource_config_email.go b/provider/resource_config_email.go
@@ -69,7 +69,8 @@ func resourceConfigEmailRead(d *schema.ResourceData, m interface{}) error {
 
 	resp, _, err := apiClient.SendRequest("GET", models.PathConfig, nil, 200)
 	if err != nil {
-		return err
+		d.SetId("")
+		return nil
 	}
 
 	var jsonData models.ConfigBodyResponse

diff --git a/provider/resource_garbage_collection.go b/provider/resource_garbage_collection.go
@@ -45,7 +45,8 @@ func resourceGCRead(d *schema.ResourceData, m interface{}) error {
 
 	resp, _, err := apiClient.SendRequest("GET", models.PathGC, nil, 200)
 	if err != nil {
-		return err
+		d.SetId("")
+		return nil
 	}
 
 	var jsonData models.SystemBody

diff --git a/provider/resource_labels.go b/provider/resource_labels.go
@@ -64,7 +64,8 @@ func resourceLabelRead(d *schema.ResourceData, m interface{}) error {
 
 	resp, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
 	if err != nil {
-		return err
+		d.SetId("")
+		return nil
 	}
 
 	var jsonData models.Labels

diff --git a/provider/resource_project.go b/provider/resource_project.go
@@ -88,7 +88,8 @@ func resourceProjectRead(d *schema.ResourceData, m interface{}) error {
 
 	resp, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
 	if err != nil {
-		return err
+		d.SetId("")
+		return nil
 	}
 
 	var jsonData models.ProjectsBodyResponses

diff --git a/provider/resource_project_member_group.go b/provider/resource_project_member_group.go
@@ -92,7 +92,8 @@ func resourceMembersGroupRead(d *schema.ResourceData, m interface{}) error {
 
 	resp, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
 	if err != nil {
-		fmt.Println(err)
+		d.SetId("")
+		return nil
 	}
 
 	var jsonData models.ProjectMembersBody

diff --git a/provider/resource_project_member_user.go b/provider/resource_project_member_user.go
@@ -70,7 +70,8 @@ func resourceMembersUserRead(d *schema.ResourceData, m interface{}) error {
 
 	resp, _, err := apiClient.SendRequest("GET", d.Id(), nil, 200)
 	if err != nil {
-		fmt.Println(err)
+		d.SetId("")
+		return nil
 	}
 
 	var jsonData models.ProjectMembersBody

diff --git a/provider/resource_registry.go b/provider/resource_registry.go
@@ -89,6 +89,7 @@ func resourceRegistryRead(d *schema.ResourceData, m interface{}) error {
 	var jsonData models.RegistryBody
 	err = json.Unmarshal([]byte(resp), &jsonData)
 	if err != nil {
+		d.SetId("")
 		return fmt.Errorf("Resource not found %s", d.Id())
 	}
 

diff --git a/provider/resource_retention_policy.go b/provider/resource_retention_policy.go
@@ -20,6 +20,7 @@ func resourceRentention() *schema.Resource {
 			"scope": {
 				Type:     schema.TypeString,
 				Required: true,
+				ForceNew: true, 
 			},
 			"rule": {
 				Type:     schema.TypeList,