Refactor scanningpolicies (#317)

* refactor(scanningpolicies): refactor scanning policies to v2 client

Author: filiptubic

sysdig/internal/client/secure/client.go

@@ -17,15 +17,6 @@ type SysdigSecureClient interface {
 	DeleteCloudAccount(context.Context, string) error
 	UpdateCloudAccount(context.Context, string, *CloudAccount) (*CloudAccount, error)
 	GetTrustedCloudIdentity(context.Context, string) (string, error)
-
-	CreateScanningPolicy(context.Context, ScanningPolicy) (ScanningPolicy, error)
-	GetScanningPolicyById(context.Context, string) (ScanningPolicy, error)
-	DeleteScanningPolicyById(context.Context, string) error
-	UpdateScanningPolicyById(context.Context, ScanningPolicy) (ScanningPolicy, error)
-
-	CreateScanningPolicyAssignmentList(context.Context, ScanningPolicyAssignmentList) (ScanningPolicyAssignmentList, error)
-	GetScanningPolicyAssignmentList(context.Context) (ScanningPolicyAssignmentList, error)
-	DeleteScanningPolicyAssignmentList(context.Context, ScanningPolicyAssignmentList) error
 }
 
 func WithExtraHeaders(client SysdigSecureClient, extraHeaders map[string]string) SysdigSecureClient {

sysdig/internal/client/secure/models.go

@@ -30,68 +30,3 @@ func CloudAccountFromJSON(body []byte) *CloudAccount {
 
 	return &result
 }
-
-// -------- Scanning Policies --------
-type ScanningPolicy struct {
-	ID             string         `json:"id,omitempty"`
-	Version        string         `json:"version,omitempty"`
-	Name           string         `json:"name"`
-	Comment        string         `json:"comment"`
-	IsDefault      bool           `json:"isDefault,omitempty"`
-	PolicyBundleId string         `json:"policyBundleId,omitempty"`
-	Rules          []ScanningGate `json:"rules"`
-}
-
-type ScanningGate struct {
-	ID      string              `json:"id,omitempty"`
-	Gate    string              `json:"gate"`
-	Trigger string              `json:"trigger"`
-	Action  string              `json:"action"`
-	Params  []ScanningGateParam `json:"params"`
-}
-
-type ScanningGateParam struct {
-	Name  string `json:"name"`
-	Value string `json:"value"`
-}
-
-func (policy *ScanningPolicy) ToJSON() io.Reader {
-	payload, _ := json.Marshal(policy)
-	return bytes.NewBuffer(payload)
-}
-
-func ScanningPolicyFromJSON(body []byte) (result ScanningPolicy) {
-	_ = json.Unmarshal(body, &result)
-	return result
-}
-
-// -------- Scanning Policy Assignments --------
-type ScanningPolicyAssignmentList struct {
-	Items          []ScanningPolicyAssignment `json:"items"`
-	PolicyBundleId string                     `json:"policyBundleId"`
-}
-
-type ScanningPolicyAssignment struct {
-	ID           string                        `json:"id,omitempty"`
-	Name         string                        `json:"name"`
-	Registry     string                        `json:"registry"`
-	Repository   string                        `json:"repository"`
-	Image        ScanningPolicyAssignmentImage `json:"image"`
-	PolicyIDs    []string                      `json:"policy_ids"`
-	WhitelistIDs []string                      `json:"whitelist_ids"`
-}
-
-type ScanningPolicyAssignmentImage struct {
-	Type  string `json:"type"`
-	Value string `json:"value"`
-}
-
-func (policy *ScanningPolicyAssignmentList) ToJSON() io.Reader {
-	payload, _ := json.Marshal(policy)
-	return bytes.NewBuffer(payload)
-}
-
-func ScanningPolicyAssignmentFromJSON(body []byte) (result ScanningPolicyAssignmentList) {
-	_ = json.Unmarshal(body, &result)
-	return result
-}

sysdig/internal/client/secure/scanningpolicies.go

@@ -325,3 +325,46 @@ type Exception struct {
 	Comps  interface{} `json:"comps,omitempty"`
 	Values interface{} `json:"values,omitempty"`
 }
+
+type ScanningPolicy struct {
+	ID             string         `json:"id,omitempty"`
+	Version        string         `json:"version,omitempty"`
+	Name           string         `json:"name"`
+	Comment        string         `json:"comment"`
+	IsDefault      bool           `json:"isDefault,omitempty"`
+	PolicyBundleId string         `json:"policyBundleId,omitempty"`
+	Rules          []ScanningGate `json:"rules"`
+}
+
+type ScanningGate struct {
+	ID      string              `json:"id,omitempty"`
+	Gate    string              `json:"gate"`
+	Trigger string              `json:"trigger"`
+	Action  string              `json:"action"`
+	Params  []ScanningGateParam `json:"params"`
+}
+
+type ScanningGateParam struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+type ScanningPolicyAssignmentList struct {
+	Items          []ScanningPolicyAssignment `json:"items"`
+	PolicyBundleId string                     `json:"policyBundleId"`
+}
+
+type ScanningPolicyAssignment struct {
+	ID           string                        `json:"id,omitempty"`
+	Name         string                        `json:"name"`
+	Registry     string                        `json:"registry"`
+	Repository   string                        `json:"repository"`
+	Image        ScanningPolicyAssignmentImage `json:"image"`
+	PolicyIDs    []string                      `json:"policy_ids"`
+	WhitelistIDs []string                      `json:"whitelist_ids"`
+}
+
+type ScanningPolicyAssignmentImage struct {
+	Type  string `json:"type"`
+	Value string `json:"value"`
+}