Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,5 @@ output "github_channel_repository" {
}

output "agent_channel_command" {
value = nullplatform_notification_channel.custom_agent.configuration[0].agent[0].command[0].data.cmdline
value = nullplatform_notification_channel.agent.configuration[0].agent[0].command[0].data.cmdline
}
10 changes: 8 additions & 2 deletions nullplatform/resource_notification_channel.go
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,11 @@ func NotificationChannelCreate(d *schema.ResourceData, m any) error {
if err := json.Unmarshal([]byte(v.(string)), &filtersMap); err != nil {
return fmt.Errorf("invalid filters JSON: %v", err)
}
newChannel.Filters = filtersMap
if pruned, keep := pruneNulls(filtersMap); keep {
newChannel.Filters = pruned.(map[string]interface{})
} else {
newChannel.Filters = make(map[string]interface{})
}
} else {
newChannel.Filters = make(map[string]interface{})
}
Expand Down Expand Up @@ -518,7 +522,9 @@ func NotificationChannelUpdate(d *schema.ResourceData, m any) error {
if err := json.Unmarshal([]byte(v.(string)), &filtersMap); err != nil {
return fmt.Errorf("invalid filters JSON: %v", err)
}
updateChannel.Filters = filtersMap
if pruned, keep := pruneNulls(filtersMap); keep {
updateChannel.Filters = pruned.(map[string]interface{})
}
}

if err := nullOps.UpdateNotificationChannel(d.Id(), updateChannel); err != nil {
Expand Down
33 changes: 33 additions & 0 deletions nullplatform/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,36 @@ func tryParseJSON(value string) any {
}
return parsedValue
}


func pruneNulls(v interface{}) (interface{}, bool) {
switch t := v.(type) {
case map[string]interface{}:
out := make(map[string]interface{}, len(t))
for k, vv := range t {
if pruned, keep := pruneNulls(vv); keep {
out[k] = pruned
}
}
if len(out) == 0 {
return nil, false
}
return out, true
case []interface{}:
out := make([]interface{}, 0, len(t))
for _, vv := range t {
if pruned, keep := pruneNulls(vv); keep {
out = append(out, pruned)
}
}
if len(out) == 0 {
return nil, false
}
return out, true
default:
if t == nil {
return nil, false
}
return t, true
}
}