Skip to content

attempt-fix-sorting #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ishtayger wants to merge 1 commit into from
Closed

attempt-fix-sorting #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions sysdig/data_source_sysdig_secure_posture_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package sysdig

import (
"cmp"
"context"
v2 "github.com/draios/terraform-provider-sysdig/sysdig/internal/client/v2"
"github.com/hashicorp/terraform-plugin-log/tflog"
"slices"
"strconv"
"time"

Expand Down Expand Up @@ -75,7 +79,15 @@ func dataSourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.Reso
if err != nil {
return diag.FromErr(err)
}

tflog.Info(ctx, "Policy Details in data")
for rg_i, rg := range policy.RequirementsGroup {
for r_i, r := range rg.Requirements {
slices.SortFunc(r.Controls, func(a, b v2.Control) int {
return cmp.Compare(a.Name, b.Name)
})
policy.RequirementsGroup[rg_i].Requirements[r_i].Controls = r.Controls
}
}
d.SetId(policy.ID)

err = d.Set(SchemaNameKey, policy.Name)
Expand Down Expand Up @@ -118,7 +130,7 @@ func dataSourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.Reso
return diag.FromErr(err)
}

groupsData, err := setGroups(d, policy.RequirementsGroup)
groupsData, err := setGroups(ctx, d, policy.RequirementsGroup)
if err != nil {
return diag.FromErr(err)
}
Expand Down
7 changes: 7 additions & 0 deletions sysdig/internal/client/v2/posture_policies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package v2
import (
"context"
"fmt"
"github.com/hashicorp/terraform-plugin-log/tflog"
"net/http"
)

Expand All @@ -22,6 +23,7 @@ type PosturePolicyInterface interface {
}

func (client *Client) ListPosturePolicies(ctx context.Context) ([]PosturePolicy, error) {
tflog.Info(ctx, "============= API:ListPosturePolicies ============")
response, err := client.requester.Request(ctx, http.MethodGet, client.getPosturePolicyURL(PosturePolicyListPath), nil)
if err != nil {
return nil, err
Expand All @@ -41,11 +43,13 @@ func (client *Client) ListPosturePolicies(ctx context.Context) ([]PosturePolicy,
}

func (client *Client) CreateOrUpdatePosturePolicy(ctx context.Context, p *CreatePosturePolicy) (*FullPosturePolicy, string, error) {
tflog.Info(ctx, "============= API:CreateOrUpdatePosturePolicy ============")
payload, err := Marshal(p)
if err != nil {
return nil, "", err
}
response, err := client.requester.Request(ctx, http.MethodPost, client.getPosturePolicyURL(PosturePolicyCreatePath), payload)
tflog.Info(ctx, fmt.Sprintf("======== Create Payload: %v", p))
if err != nil {
return nil, "", err
}
Expand All @@ -58,10 +62,12 @@ func (client *Client) CreateOrUpdatePosturePolicy(ctx context.Context, p *Create
if err != nil {
return nil, "", err
}
tflog.Info(ctx, fmt.Sprintf("======== Create Payload Response: %v", resp.Data.RequirementsGroup))
return &resp.Data, "", nil
}

func (client *Client) GetPosturePolicy(ctx context.Context, id int64) (*FullPosturePolicy, error) {
tflog.Info(ctx, "============= API:GetPosturePolicy ============")
response, err := client.requester.Request(ctx, http.MethodGet, client.getPolicyUrl(id), nil)
if err != nil {
return nil, err
Expand All @@ -76,6 +82,7 @@ func (client *Client) GetPosturePolicy(ctx context.Context, id int64) (*FullPost
}

func (client *Client) DeletePosturePolicy(ctx context.Context, id int64) error {
tflog.Info(ctx, "============= API:DeletePosturePolicy ============")
response, err := client.requester.Request(ctx, http.MethodDelete, client.deletePolicyUrl(id), nil)
if err != nil {
return err
Expand Down
69 changes: 60 additions & 9 deletions sysdig/resource_sysdig_secure_posture_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package sysdig

import (
"cmp"
"context"
"fmt"
"github.com/hashicorp/terraform-plugin-log/tflog"
"slices"
"strconv"
"time"

Expand Down Expand Up @@ -44,7 +48,7 @@ func createGroupSchema(i int) *schema.Resource {
Required: true,
},
"control": {
Type: schema.TypeList,
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -140,6 +144,13 @@ func resourceSysdigSecurePosturePolicy() *schema.Resource {
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(timeout),
},
//CustomizeDiff: func(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error {
// tflog.Info(ctx, "============= CustomizeDiff ============")
// for k, v := range diff.GetRawPlan().AsValueMap() {
// tflog.Info(ctx, fmt.Sprintf("%s, %v", k, v.AsValueMap()))
// }
// return nil
//},
Schema: map[string]*schema.Schema{
SchemaIDKey: {
Type: schema.TypeString,
Expand Down Expand Up @@ -243,6 +254,7 @@ func resourceSysdigSecurePosturePolicyCreateOrUpdate(ctx context.Context, d *sch
}

func resourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
tflog.Info(ctx, "============= resourceSysdigSecurePosturePolicyRead ============")
client, err := getPosturePolicyClient(meta.(SysdigClients))
if err != nil {
return diag.FromErr(err)
Expand All @@ -257,6 +269,17 @@ func resourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.Resour
if err != nil {
return diag.FromErr(err)
}

// Sort controls
for rg_i, rg := range policy.RequirementsGroup {
for r_i, r := range rg.Requirements {
slices.SortFunc(r.Controls, func(a, b v2.Control) int {
return cmp.Compare(a.Name, b.Name)
})
policy.RequirementsGroup[rg_i].Requirements[r_i].Controls = r.Controls
}
}

err = d.Set(SchemaIDKey, policy.ID)
if err != nil {
return diag.FromErr(err)
Expand Down Expand Up @@ -308,7 +331,7 @@ func resourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.Resour
return diag.FromErr(err)
}
// Set groups
groupsData, err := setGroups(d, policy.RequirementsGroup)
groupsData, err := setGroups(ctx, d, policy.RequirementsGroup)
if err != nil {
return diag.FromErr(err)
}
Expand All @@ -317,7 +340,7 @@ func resourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.Resour
if err != nil {
return diag.FromErr(err)
}

tflog.Info(ctx, "============= resourceSysdigSecurePosturePolicyRead ENDED ============")
return nil
}

Expand All @@ -340,7 +363,7 @@ func resourceSysdigSecurePosturePolicyDelete(ctx context.Context, d *schema.Reso
return nil
}

func setGroups(d *schema.ResourceData, groups []v2.RequirementsGroup) ([]interface{}, error) {
func setGroups(ctx context.Context, d *schema.ResourceData, groups []v2.RequirementsGroup) ([]interface{}, error) {
var groupsData []interface{}
for _, group := range groups {
groupData := map[string]interface{}{
Expand All @@ -351,11 +374,11 @@ func setGroups(d *schema.ResourceData, groups []v2.RequirementsGroup) ([]interfa

// Recursively set nested groups and requirements
if len(group.Requirements) > 0 {
requirementsData := setRequirements(group.Requirements)
requirementsData := setRequirements(ctx, group.Requirements)
groupData["requirement"] = requirementsData
}
if len(group.Folders) > 0 {
nestedGroupsData, err := setGroups(d, group.Folders)
nestedGroupsData, err := setGroups(ctx, d, group.Folders)
if err != nil {
return nil, err
}
Expand All @@ -366,7 +389,7 @@ func setGroups(d *schema.ResourceData, groups []v2.RequirementsGroup) ([]interfa
return groupsData, nil
}

func setRequirements(requirements []v2.Requirement) []interface{} {
func setRequirements(ctx context.Context, requirements []v2.Requirement) []interface{} {
var requirementsData []interface{}
for _, req := range requirements {
reqData := map[string]interface{}{
Expand All @@ -377,7 +400,16 @@ func setRequirements(requirements []v2.Requirement) []interface{} {

// Set controls for each requirement
if len(req.Controls) > 0 {
controlsData := setControls(req.Controls)
controlsData := setControls(ctx, req.Controls)

slices.SortFunc(controlsData, func(a, b interface{}) int {
aMap := a.(map[string]interface{})
bMap := b.(map[string]interface{})

aName := aMap["name"].(string)
bName := bMap["name"].(string)
return cmp.Compare(aName, bName)
})
reqData["control"] = controlsData
}

Expand All @@ -386,7 +418,7 @@ func setRequirements(requirements []v2.Requirement) []interface{} {
return requirementsData
}

func setControls(controls []v2.Control) []interface{} {
func setControls(ctx context.Context, controls []v2.Control) []interface{} {
var controlsData []interface{}
for _, ctrl := range controls {
ctrlData := map[string]interface{}{
Expand All @@ -395,6 +427,17 @@ func setControls(controls []v2.Control) []interface{} {
}
controlsData = append(controlsData, ctrlData)
}

tflog.Info(ctx, fmt.Sprintf("Controls BEFORE SORT: %v", controlsData))
slices.SortFunc(controlsData, func(a, b interface{}) int {
aMap := a.(map[string]interface{})
bMap := b.(map[string]interface{})

aName := aMap["name"].(string)
bName := bMap["name"].(string)
return cmp.Compare(aName, bName)
})
tflog.Info(ctx, fmt.Sprintf("Controls AFTER SORT: %v", controlsData))
return controlsData
}

Expand Down Expand Up @@ -474,6 +517,14 @@ func extractGroupsRecursive(data interface{}) []v2.CreateRequirementsGroup {
}

if controlsData, ok := reqMap["control"].([]interface{}); ok {
slices.SortFunc(controlsData, func(a, b interface{}) int {
aMap := a.(map[string]interface{})
bMap := b.(map[string]interface{})

aName := aMap["name"].(string)
bName := bMap["name"].(string)
return cmp.Compare(aName, bName)
})
for _, controlData := range controlsData {
controlMap := controlData.(map[string]interface{})
control := v2.CreateRequirementControl{
Expand Down
Loading