fix: re-create risk if it was removed from the UI

Author: tembleking

sysdig/internal/client/v2/vulnerability_accept_risk.go

@@ -9,10 +9,10 @@ import (
 type PostureVulnerabilityAcceptRiskInterface interface {
 	Base
 
-	SaveAcceptVulnerabilityRisk(ctx context.Context, p *AcceptVulnerabilityRiskRequest) (*AcceptVulnerabilityRisk, string, error)
-	GetAcceptanceVulnerabilityRisk(ctx context.Context, id string) (*AcceptVulnerabilityRisk, string, error)
+	SaveAcceptVulnerabilityRisk(ctx context.Context, p *AcceptVulnerabilityRiskRequest) (*AcceptVulnerabilityRisk, int, error)
+	GetAcceptanceVulnerabilityRisk(ctx context.Context, id string) (*AcceptVulnerabilityRisk, int, error)
 	DeleteAcceptanceVulnerabilityRisk(ctx context.Context, id string) error
-	UpdateAcceptanceVulnerabilityRisk(ctx context.Context, p *UpdateAcceptVulnerabilityRiskRequest) (*AcceptVulnerabilityRisk, string, error)
+	UpdateAcceptanceVulnerabilityRisk(ctx context.Context, p *UpdateAcceptVulnerabilityRiskRequest) (*AcceptVulnerabilityRisk, int, error)
 }
 
 const (
@@ -22,49 +22,47 @@ const (
 	AcceptVulnerabilityRiskUpdatePath = "%s/secure/vulnerability/v1beta1/accepted-risks/%s"
 )
 
-func (c *Client) SaveAcceptVulnerabilityRisk(ctx context.Context, p *AcceptVulnerabilityRiskRequest) (*AcceptVulnerabilityRisk, string, error) {
+func (c *Client) SaveAcceptVulnerabilityRisk(ctx context.Context, p *AcceptVulnerabilityRiskRequest) (*AcceptVulnerabilityRisk, int, error) {
 	payload, err := Marshal(p)
 	if err != nil {
-		return nil, "", err
+		return nil, 0, err
 	}
 
 	response, err := c.requester.Request(ctx, http.MethodPost, fmt.Sprintf(AcceptVulnerabilityRiskCreatePath, c.config.url), payload)
 	if err != nil {
-		return nil, "", err
+		return nil, 0, err
 	}
 	defer response.Body.Close()
 
 	if response.StatusCode != http.StatusCreated {
-		errStatus, err := c.ErrorAndStatusFromResponse(response)
-		return nil, errStatus, err
+		return nil, response.StatusCode, c.ErrorFromResponse(response)
 	}
 
 	resp, err := Unmarshal[AcceptVulnerabilityRisk](response.Body)
 	if err != nil {
-		return nil, "", err
+		return nil, 0, err
 	}
 
-	return &resp, "", nil
+	return &resp, 0, nil
 }
 
-func (c *Client) GetAcceptanceVulnerabilityRisk(ctx context.Context, id string) (*AcceptVulnerabilityRisk, string, error) {
+func (c *Client) GetAcceptanceVulnerabilityRisk(ctx context.Context, id string) (*AcceptVulnerabilityRisk, int, error) {
 	response, err := c.requester.Request(ctx, http.MethodGet, fmt.Sprintf(AcceptVulnerabilityRiskGetPath, c.config.url, id), nil)
 	if err != nil {
-		return nil, "", err
+		return nil, 0, err
 	}
 	defer response.Body.Close()
 
 	if response.StatusCode != http.StatusOK {
-		errStatus, err := c.ErrorAndStatusFromResponse(response)
-		return nil, errStatus, err
+		return nil, response.StatusCode, c.ErrorFromResponse(response)
 	}
 
 	resp, err := Unmarshal[AcceptVulnerabilityRisk](response.Body)
 	if err != nil {
-		return nil, "", err
+		return nil, 0, err
 	}
 
-	return &resp, "", nil
+	return &resp, 0, nil
 }
 
 func (c *Client) DeleteAcceptanceVulnerabilityRisk(ctx context.Context, id string) error {
@@ -81,27 +79,26 @@ func (c *Client) DeleteAcceptanceVulnerabilityRisk(ctx context.Context, id strin
 	return nil
 }
 
-func (c *Client) UpdateAcceptanceVulnerabilityRisk(ctx context.Context, p *UpdateAcceptVulnerabilityRiskRequest) (*AcceptVulnerabilityRisk, string, error) {
+func (c *Client) UpdateAcceptanceVulnerabilityRisk(ctx context.Context, p *UpdateAcceptVulnerabilityRiskRequest) (*AcceptVulnerabilityRisk, int, error) {
 	payload, err := Marshal(p)
 	if err != nil {
-		return nil, "", err
+		return nil, 0, err
 	}
 
 	response, err := c.requester.Request(ctx, http.MethodPut, fmt.Sprintf(AcceptVulnerabilityRiskUpdatePath, c.config.url, p.ID), payload)
 	if err != nil {
-		return nil, "", err
+		return nil, 0, err
 	}
 	defer response.Body.Close()
 
 	if response.StatusCode != http.StatusOK {
-		errStatus, err := c.ErrorAndStatusFromResponse(response)
-		return nil, errStatus, err
+		return nil, response.StatusCode, c.ErrorFromResponse(response)
 	}
 
 	resp, err := Unmarshal[AcceptVulnerabilityRisk](response.Body)
 	if err != nil {
-		return nil, "", err
+		return nil, 0, err
 	}
 
-	return &resp, "", nil
+	return &resp, 0, nil
 }

sysdig/resource_sysdig_secure_accept_vulnerability_risk.go

@@ -3,6 +3,7 @@ package sysdig
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"regexp"
 	"strings"
 
@@ -251,9 +252,13 @@ func resourceSysdigSecureVulnerabilityAcceptRiskRead(ctx context.Context, d *sch
 	}
 
 	id := d.Id()
-	result, _, err := client.GetAcceptanceVulnerabilityRisk(ctx, id)
+	result, statusCode, err := client.GetAcceptanceVulnerabilityRisk(ctx, id)
 	if err != nil {
-		return diag.FromErr(err)
+		if statusCode == http.StatusNotFound {
+			d.SetId("")
+		} else {
+			return diag.FromErr(err)
+		}
 	}
 	_ = d.Set("reason", result.Reason)
 	_ = d.Set("description", result.Description)