refactor(vulexception): refactor vulexception to v2 client (#315)

Author: filiptubic

sysdig/internal/client/secure/client.go

@@ -12,16 +12,6 @@ import (
 )
 
 type SysdigSecureClient interface {
-	CreateVulnerabilityExceptionList(context.Context, *VulnerabilityExceptionList) (*VulnerabilityExceptionList, error)
-	GetVulnerabilityExceptionListByID(context.Context, string) (*VulnerabilityExceptionList, error)
-	DeleteVulnerabilityExceptionList(context.Context, string) error
-	UpdateVulnerabilityExceptionList(context.Context, *VulnerabilityExceptionList) (*VulnerabilityExceptionList, error)
-
-	CreateVulnerabilityException(context.Context, string, *VulnerabilityException) (*VulnerabilityException, error)
-	GetVulnerabilityExceptionByID(context.Context, string, string) (*VulnerabilityException, error)
-	DeleteVulnerabilityException(context.Context, string, string) error
-	UpdateVulnerabilityException(context.Context, string, *VulnerabilityException) (*VulnerabilityException, error)
-
 	CreateCloudAccount(context.Context, *CloudAccount) (*CloudAccount, error)
 	GetCloudAccountById(context.Context, string) (*CloudAccount, error)
 	DeleteCloudAccount(context.Context, string) error

sysdig/internal/client/secure/models.go

@@ -6,50 +6,6 @@ import (
 	"io"
 )
 
-// -------- VulnerabilityExceptionList --------
-
-type VulnerabilityExceptionList struct {
-	ID      string `json:"id,omitempty"`
-	Version string `json:"version"`
-	Name    string `json:"name"`
-	Comment string `json:"comment"`
-}
-
-func (l *VulnerabilityExceptionList) ToJSON() io.Reader {
-	payload, _ := json.Marshal(*l)
-	return bytes.NewBuffer(payload)
-}
-
-func VulnerabilityExceptionListFromJSON(body []byte) *VulnerabilityExceptionList {
-	var result VulnerabilityExceptionList
-	_ = json.Unmarshal(body, &result)
-
-	return &result
-}
-
-// -------- VulnerabilityException --------
-
-type VulnerabilityException struct {
-	ID             string `json:"id"`
-	Gate           string `json:"gate"`
-	TriggerID      string `json:"trigger_id"`
-	Notes          string `json:"notes"`
-	ExpirationDate *int   `json:"expiration_date,omitempty"`
-	Enabled        bool   `json:"enabled"`
-}
-
-func (e *VulnerabilityException) ToJSON() io.Reader {
-	payload, _ := json.Marshal(*e)
-	return bytes.NewBuffer(payload)
-}
-
-func VulnerabilityExceptionFromJSON(body []byte) *VulnerabilityException {
-	var result VulnerabilityException
-	_ = json.Unmarshal(body, &result)
-
-	return &result
-}
-
 // -------- CloudAccount --------
 
 type CloudAccount struct {

sysdig/internal/client/secure/vulnerability_exception.go

@@ -224,6 +224,22 @@ type MacroCondition struct {
 	Condition string `json:"condition"`
 }
 
+type VulnerabilityExceptionList struct {
+	ID      string `json:"id,omitempty"`
+	Version string `json:"version"`
+	Name    string `json:"name"`
+	Comment string `json:"comment"`
+}
+
+type VulnerabilityException struct {
+	ID             string `json:"id"`
+	Gate           string `json:"gate"`
+	TriggerID      string `json:"trigger_id"`
+	Notes          string `json:"notes"`
+	ExpirationDate *int   `json:"expiration_date,omitempty"`
+	Enabled        bool   `json:"enabled"`
+}
+
 type Rule struct {
 	ID          int      `json:"id,omitempty"`
 	Name        string   `json:"name"`

sysdig/internal/client/v2/model.go

@@ -29,9 +29,11 @@ type SysdigMonitor interface {
 type SysdigSecure interface {
 	SysdigCommon
 	PolicyInterface
+	RuleInterface
 	ListInterface
 	MacroInterface
-	RuleInterface
+	VulnerabilityExceptionListInterface
+	VulnerabilityExceptionInterface
 }
 
 func (sr *SysdigRequest) Request(ctx context.Context, method string, url string, payload io.Reader) (*http.Response, error) {