ssprod_41907 | add get full policy (#513)

hila-krut-sysdig · web-flow · commit dd669256d208 · 2024-05-23T12:03:19.000+03:00
* add full policy

* add type to request
diff --git a/sysdig/internal/client/v2/model.go b/sysdig/internal/client/v2/model.go
@@ -926,24 +926,39 @@ type PosturePolicyZoneMeta struct {
 }
 
 type PosturePolicy struct {
-	ID                string                  `json:"id,omitempty"`
-	Name              string                  `json:"name,omitempty"`
-	Type              int                     `json:"type,omitempty"`
-	Kind              int                     `json:"kind,omitempty"`
-	Description       string                  `json:"description,omitempty"`
-	Version           string                  `json:"version,omitempty"`
-	Link              string                  `json:"link,omitempty"`
-	Authors           string                  `json:"authors,omitempty"`
-	PublishedData     string                  `json:"publishedDate,omitempty"`
-	RequirementsGroup []RequirementsGroup     `json:"requirementFolders,omitempty"`
-	MinKubeVersion    float64                 `json:"minKubeVersion,omitempty"`
-	MaxKubeVersion    float64                 `json:"maxKubeVersion,omitempty"`
-	IsCustom          bool                    `json:"isCustom,omitempty"`
-	IsActive          bool                    `json:"isActive,omitempty"`
-	Platform          string                  `json:"platform,omitempty"`
-	Zones             []PosturePolicyZoneMeta `json:"zones,omitempty"`
+	ID             string                  `json:"id,omitempty"`
+	Name           string                  `json:"name,omitempty"`
+	Type           int                     `json:"type,omitempty"`
+	Kind           int                     `json:"kind,omitempty"`
+	Description    string                  `json:"description,omitempty"`
+	Version        string                  `json:"version,omitempty"`
+	Link           string                  `json:"link,omitempty"`
+	Authors        string                  `json:"authors,omitempty"`
+	PublishedData  string                  `json:"publishedDate,omitempty"`
+	MinKubeVersion float64                 `json:"minKubeVersion,omitempty"`
+	MaxKubeVersion float64                 `json:"maxKubeVersion,omitempty"`
+	IsCustom       bool                    `json:"isCustom,omitempty"`
+	IsActive       bool                    `json:"isActive,omitempty"`
+	Platform       string                  `json:"platform,omitempty"`
+	Zones          []PosturePolicyZoneMeta `json:"zones,omitempty"`
+}
+
+type FullPosturePolicy struct {
+	ID                string              `json:"id,omitempty"`
+	Name              string              `json:"name,omitempty"`
+	Type              string              `json:"type,omitempty"`
+	Description       string              `json:"description,omitempty"`
+	Version           string              `json:"version,omitempty"`
+	Link              string              `json:"link,omitempty"`
+	Authors           string              `json:"authors,omitempty"`
+	PublishedData     string              `json:"publishedDate,omitempty"`
+	RequirementsGroup []RequirementsGroup `json:"requirementFolders,omitempty"`
+	MinKubeVersion    float64             `json:"minKubeVersion,omitempty"`
+	MaxKubeVersion    float64             `json:"maxKubeVersion,omitempty"`
+	IsCustom          bool                `json:"isCustom,omitempty"`
+	IsActive          bool                `json:"isActive,omitempty"`
+	Platform          string              `json:"platform,omitempty"`
 }
-
 type RequirementsGroup struct {
 	ID                        string              `json:"id,omitempty"`
 	Name                      string              `json:"name,omitempty"`
@@ -1005,6 +1020,9 @@ type PosturePolicyResponse struct {
 	Data PosturePolicy `json:"data"`
 }
 
+type FullPosturePolicyResponse struct {
+	Data FullPosturePolicy `json:"data"`
+}
 type PostureZonePolicyListResponse struct {
 	Data []PosturePolicy `json:"data"`
 }
diff --git a/sysdig/internal/client/v2/posture_policies.go b/sysdig/internal/client/v2/posture_policies.go
@@ -9,14 +9,14 @@ import (
 const (
 	PosturePolicyListPath   = "%s/api/cspm/v1/policy/policies/list"
 	PosturePolicyCreatePath = "%s/api/cspm/v1/policy"
-	PosturePolicyGetPath    = "%s/api/cspm/v1/policy/policies/view/%d"
+	PosturePolicyGetPath    = "%s/api/cspm/v1/policy/posture/policies/%d?include_controls=true"
 )
 
 type PosturePolicyInterface interface {
 	Base
 	ListPosturePolicies(ctx context.Context) ([]PosturePolicy, error)
-	CreateOrUpdatePosturePolicy(ctx context.Context, p *CreatePosturePolicy) (*PosturePolicy, string, error)
-	GetPosturePolicy(ctx context.Context, id int64) (*PosturePolicy, error)
+	CreateOrUpdatePosturePolicy(ctx context.Context, p *CreatePosturePolicy) (*FullPosturePolicy, string, error)
+	GetPosturePolicy(ctx context.Context, id int64) (*FullPosturePolicy, error)
 }
 
 func (client *Client) ListPosturePolicies(ctx context.Context) ([]PosturePolicy, error) {
@@ -34,7 +34,7 @@ func (client *Client) ListPosturePolicies(ctx context.Context) ([]PosturePolicy,
 	return resp.Data, nil
 }
 
-func (client *Client) CreateOrUpdatePosturePolicy(ctx context.Context, p *CreatePosturePolicy) (*PosturePolicy, string, error) {
+func (client *Client) CreateOrUpdatePosturePolicy(ctx context.Context, p *CreatePosturePolicy) (*FullPosturePolicy, string, error) {
 	payload, err := Marshal(p)
 	if err != nil {
 		return nil, "", err
@@ -48,25 +48,24 @@ func (client *Client) CreateOrUpdatePosturePolicy(ctx context.Context, p *Create
 		errStatus, err := client.ErrorAndStatusFromResponse(response)
 		return nil, errStatus, err
 	}
-	resp, err := Unmarshal[PosturePolicyResponse](response.Body)
+	resp, err := Unmarshal[FullPosturePolicyResponse](response.Body)
 	if err != nil {
 		return nil, "", err
 	}
 	return &resp.Data, "", nil
 }
 
-func (client *Client) GetPosturePolicy(ctx context.Context, id int64) (*PosturePolicy, error) {
+func (client *Client) GetPosturePolicy(ctx context.Context, id int64) (*FullPosturePolicy, error) {
 	response, err := client.requester.Request(ctx, http.MethodGet, client.getPolicyUrl(id), nil)
 	if err != nil {
 		return nil, err
 	}
 	defer response.Body.Close()
 
-	wrapper, err := Unmarshal[PosturePolicyResponse](response.Body)
+	wrapper, err := Unmarshal[FullPosturePolicyResponse](response.Body)
 	if err != nil {
 		return nil, err
 	}
-
 	return &wrapper.Data, nil
 }
 
diff --git a/sysdig/resource_sysdig_secure_posture_policy.go b/sysdig/resource_sysdig_secure_posture_policy.go
@@ -201,6 +201,7 @@ func resourceSysdigSecurePosturePolicyCreateOrUpdate(ctx context.Context, d *sch
 	req := &v2.CreatePosturePolicy{
 		ID:                getStringValue(d, SchemaIDKey),
 		Name:              getStringValue(d, SchemaNameKey),
+		Type:              getStringValue(d, SchemaTypeKey),
 		Description:       getStringValue(d, SchemaDescriptionKey),
 		MinKubeVersion:    getFloatValue(d, SchemaMinKubeVersionKey),
 		MaxKubeVersion:    getFloatValue(d, SchemaMaxKubeVersionKey),
@@ -249,9 +250,7 @@ func resourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.Resour
 		return diag.FromErr(err)
 	}
 
-	strconv.Itoa(policy.Type)
-
-	err = d.Set(SchemaTypeKey, strconv.Itoa(policy.Type))
+	err = d.Set(SchemaTypeKey, policy.Type)
 	if err != nil {
 		return diag.FromErr(err)
 	}
diff --git a/sysdig/resource_sysdig_secure_posture_policy_test.go b/sysdig/resource_sysdig_secure_posture_policy_test.go
@@ -34,6 +34,6 @@ func createPolicyResource(name string) string {
 		name = "policy-test-%s"
 		description = "policy description"
 		is_active = true
-		type = "0"
+		type = "Unknown"
 	}`, name)
 }

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@ import (`
`9`	`9`	`const (`
`10`	`10`	`PosturePolicyListPath = "%s/api/cspm/v1/policy/policies/list"`
`11`	`11`	`PosturePolicyCreatePath = "%s/api/cspm/v1/policy"`
`12`		`- PosturePolicyGetPath = "%s/api/cspm/v1/policy/policies/view/%d"`
	`12`	`+ PosturePolicyGetPath = "%s/api/cspm/v1/policy/posture/policies/%d?include_controls=true"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`type PosturePolicyInterface interface {`
`16`	`16`	`Base`
`17`	`17`	`ListPosturePolicies(ctx context.Context) ([]PosturePolicy, error)`
`18`		`- CreateOrUpdatePosturePolicy(ctx context.Context, p CreatePosturePolicy) (PosturePolicy, string, error)`
`19`		`- GetPosturePolicy(ctx context.Context, id int64) (*PosturePolicy, error)`
	`18`	`+ CreateOrUpdatePosturePolicy(ctx context.Context, p CreatePosturePolicy) (FullPosturePolicy, string, error)`
	`19`	`+ GetPosturePolicy(ctx context.Context, id int64) (*FullPosturePolicy, error)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func (client *Client) ListPosturePolicies(ctx context.Context) ([]PosturePolicy, error) {`
`@@ -34,7 +34,7 @@ func (client *Client) ListPosturePolicies(ctx context.Context) ([]PosturePolicy,`
`34`	`34`	`return resp.Data, nil`
`35`	`35`	`}`
`36`	`36`
`37`		`-func (client Client) CreateOrUpdatePosturePolicy(ctx context.Context, p CreatePosturePolicy) (*PosturePolicy, string, error) {`
	`37`	`+func (client Client) CreateOrUpdatePosturePolicy(ctx context.Context, p CreatePosturePolicy) (*FullPosturePolicy, string, error) {`
`38`	`38`	`payload, err := Marshal(p)`
`39`	`39`	`if err != nil {`
`40`	`40`	`return nil, "", err`
`@@ -48,25 +48,24 @@ func (client Client) CreateOrUpdatePosturePolicy(ctx context.Context, p Create`
`48`	`48`	`errStatus, err := client.ErrorAndStatusFromResponse(response)`
`49`	`49`	`return nil, errStatus, err`
`50`	`50`	`}`
`51`		`- resp, err := Unmarshal[PosturePolicyResponse](response.Body)`
	`51`	`+ resp, err := Unmarshal[FullPosturePolicyResponse](response.Body)`
`52`	`52`	`if err != nil {`
`53`	`53`	`return nil, "", err`
`54`	`54`	`}`
`55`	`55`	`return &resp.Data, "", nil`
`56`	`56`	`}`
`57`	`57`
`58`		`-func (client Client) GetPosturePolicy(ctx context.Context, id int64) (PosturePolicy, error) {`
	`58`	`+func (client Client) GetPosturePolicy(ctx context.Context, id int64) (FullPosturePolicy, error) {`
`59`	`59`	`response, err := client.requester.Request(ctx, http.MethodGet, client.getPolicyUrl(id), nil)`
`60`	`60`	`if err != nil {`
`61`	`61`	`return nil, err`
`62`	`62`	`}`
`63`	`63`	`defer response.Body.Close()`
`64`	`64`
`65`		`- wrapper, err := Unmarshal[PosturePolicyResponse](response.Body)`
	`65`	`+ wrapper, err := Unmarshal[FullPosturePolicyResponse](response.Body)`
`66`	`66`	`if err != nil {`
`67`	`67`	`return nil, err`
`68`	`68`	`}`
`69`		`-`
`70`	`69`	`return &wrapper.Data, nil`
`71`	`70`	`}`
`72`	`71`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ func createPolicyResource(name string) string {`
`34`	`34`	`name = "policy-test-%s"`
`35`	`35`	`description = "policy description"`
`36`	`36`	`is_active = true`
`37`		`- type = "0"`
	`37`	`+ type = "Unknown"`
`38`	`38`	}`, name)
`39`	`39`	`}`