Skip to content

fix | set nested groups #528

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

Merged
merged 1 commit into from
Jun 25, 2024
Merged

fix | set nested groups #528

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
2 changes: 1 addition & 1 deletion sysdig/data_source_sysdig_secure_posture_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func dataSourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.Reso
}

// Set groups
if err := setGroups(d, policy.RequirementsGroup); err != nil {
if _, err := setGroups(d, policy.RequirementsGroup); err != nil {
return diag.FromErr(err)
}

Expand Down
15 changes: 7 additions & 8 deletions sysdig/resource_sysdig_secure_posture_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,7 @@ func resourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.Resour
}

// Set groups
if err := setGroups(d, policy.RequirementsGroup); err != nil {
return diag.FromErr(err)
}
if err != nil {
if _, err := setGroups(d, policy.RequirementsGroup); err != nil {
return diag.FromErr(err)
}
return nil
Expand All @@ -308,7 +305,7 @@ func resourceSysdigSecurePosturePolicyDelete(ctx context.Context, d *schema.Reso
return nil
}

func setGroups(d *schema.ResourceData, groups []v2.RequirementsGroup) error {
func setGroups(d *schema.ResourceData, groups []v2.RequirementsGroup) ([]interface{}, error) {
var groupsData []interface{}
for _, group := range groups {
groupData := map[string]interface{}{
Expand All @@ -323,13 +320,15 @@ func setGroups(d *schema.ResourceData, groups []v2.RequirementsGroup) error {
groupData["requirement"] = requirementsData
}
if len(group.Folders) > 0 {
nestedGroupsData := setGroups(d, group.Folders)
nestedGroupsData, err := setGroups(d, group.Folders)
if err != nil {
return nil, err
}
groupData["group"] = nestedGroupsData
}

groupsData = append(groupsData, groupData)
}
return d.Set(SchemaGroupKey, groupsData)
return groupsData, nil
}

func setRequirements(requirements []v2.Requirement) []interface{} {
Expand Down