Skip to content

Commit 9cdac5a

Browse files
set nested groups (#528)
1 parent 9ce2c75 commit 9cdac5a

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

sysdig/data_source_sysdig_secure_posture_policy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func dataSourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.Reso
121121
}
122122

123123
// Set groups
124-
if err := setGroups(d, policy.RequirementsGroup); err != nil {
124+
if _, err := setGroups(d, policy.RequirementsGroup); err != nil {
125125
return diag.FromErr(err)
126126
}
127127

sysdig/resource_sysdig_secure_posture_policy.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,7 @@ func resourceSysdigSecurePosturePolicyRead(ctx context.Context, d *schema.Resour
280280
}
281281

282282
// Set groups
283-
if err := setGroups(d, policy.RequirementsGroup); err != nil {
284-
return diag.FromErr(err)
285-
}
286-
if err != nil {
283+
if _, err := setGroups(d, policy.RequirementsGroup); err != nil {
287284
return diag.FromErr(err)
288285
}
289286
return nil
@@ -308,7 +305,7 @@ func resourceSysdigSecurePosturePolicyDelete(ctx context.Context, d *schema.Reso
308305
return nil
309306
}
310307

311-
func setGroups(d *schema.ResourceData, groups []v2.RequirementsGroup) error {
308+
func setGroups(d *schema.ResourceData, groups []v2.RequirementsGroup) ([]interface{}, error) {
312309
var groupsData []interface{}
313310
for _, group := range groups {
314311
groupData := map[string]interface{}{
@@ -323,13 +320,15 @@ func setGroups(d *schema.ResourceData, groups []v2.RequirementsGroup) error {
323320
groupData["requirement"] = requirementsData
324321
}
325322
if len(group.Folders) > 0 {
326-
nestedGroupsData := setGroups(d, group.Folders)
323+
nestedGroupsData, err := setGroups(d, group.Folders)
324+
if err != nil {
325+
return nil, err
326+
}
327327
groupData["group"] = nestedGroupsData
328328
}
329-
330329
groupsData = append(groupsData, groupData)
331330
}
332-
return d.Set(SchemaGroupKey, groupsData)
331+
return groupsData, nil
333332
}
334333

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

0 commit comments

Comments
 (0)