Fix Issue With Handling Missing Policy (#265)

* Fix Issue With Handling Missing Policy

* Fix Issue With Handling Missing Policy

* Fix Issue With Handling Missing Policy

Author: jacklongsd

sysdig/internal/client/secure/client.go

@@ -15,7 +15,7 @@ type SysdigSecureClient interface {
 	CreatePolicy(context.Context, Policy) (Policy, error)
 	DeletePolicy(context.Context, int) error
 	UpdatePolicy(context.Context, Policy) (Policy, error)
-	GetPolicyById(context.Context, int) (Policy, error)
+	GetPolicyById(context.Context, int) (Policy, int, error)
 
 	CreateRule(context.Context, Rule) (Rule, error)
 	GetRuleByID(context.Context, int) (Rule, error)

sysdig/internal/client/secure/policies.go

@@ -67,20 +67,20 @@ func (client *sysdigSecureClient) UpdatePolicy(ctx context.Context, policyReques
 	return PolicyFromJSON(body), nil
 }
 
-func (client *sysdigSecureClient) GetPolicyById(ctx context.Context, policyID int) (policy Policy, err error) {
+func (client *sysdigSecureClient) GetPolicyById(ctx context.Context, policyID int) (policy Policy, statusCode int, err error) {
 	response, err := client.doSysdigSecureRequest(ctx, http.MethodGet, client.policyURL(policyID), nil)
 	if err != nil {
 		return
 	}
 	defer response.Body.Close()
 
 	if response.StatusCode != http.StatusOK {
-		return Policy{}, errorFromResponse(response)
+		return Policy{}, response.StatusCode, errorFromResponse(response)
 	}
 
 	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		return
 	}
-	return PolicyFromJSON(body), nil
+	return PolicyFromJSON(body), http.StatusOK, nil
 }

sysdig/resource_sysdig_secure_policy.go

@@ -2,6 +2,7 @@ package sysdig
 
 import (
 	"context"
+	"net/http"
 	"strconv"
 	"strings"
 	"time"
@@ -254,11 +255,13 @@ func resourceSysdigPolicyRead(ctx context.Context, d *schema.ResourceData, meta
 	}
 
 	id, _ := strconv.Atoi(d.Id())
-	policy, err := client.GetPolicyById(ctx, id)
+	policy, statusCode, err := client.GetPolicyById(ctx, id)
 
 	if err != nil {
 		d.SetId("")
-		return diag.FromErr(err)
+		if statusCode == http.StatusNotFound {
+			return diag.FromErr(err)
+		}
 	}
 
 	policyToResourceData(&policy, d)