Skip to content

Added support for field exemptions for std.prune #1167

New issue

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

#

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

Already on GitHub? # to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for field exemptions for std.prune #1167

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
8 changes: 4 additions & 4 deletions stdlib/std.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1611,7 +1611,7 @@ limitations under the License.
local arr = std.split(f, '/');
std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),

prune(a)::
prune(a, ex=[])::
local isContent(b) =
if b == null then
false
Expand All @@ -1622,11 +1622,11 @@ limitations under the License.
else
true;
if std.isArray(a) then
[std.prune(x) for x in a if isContent($.prune(x))]
[$.prune(x, ex) for x in a if isContent($.prune(x, ex))]
else if std.isObject(a) then {
[x]: $.prune(a[x])
[x]: $.prune(a[x], ex)
for x in std.objectFields(a)
if isContent(std.prune(a[x]))
if std.member(ex, x) || isContent($.prune(a[x], ex))
} else
a,

Expand Down
2 changes: 2 additions & 0 deletions test_suite/stdlib.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,6 +1451,8 @@ std.assertEqual(std.prune([[], {}, null]), []) &&
std.assertEqual(std.prune({ a: [[], {}, null], b: { a: [], b: {}, c: null } }), {}) &&
std.assertEqual(std.prune([[[], {}, null], { a: [], b: {}, c: null }]), []) &&
std.assertEqual(std.prune({ a: [{ b: true }] }), { a: [{ b: true }] }) &&
std.assertEqual(std.prune({ a: [{ b: [] }] }, ['b']), { a: [{ b: [] }] }) &&


std.assertEqual(std.parseJson('"foo"'), 'foo') &&
std.assertEqual(std.parseJson('{}'), {}) &&
Expand Down