From d44bb56dbad2a8be9f6fd4ae388f56fa92ecc174 Mon Sep 17 00:00:00 2001 From: apavlitschenko Date: Thu, 21 Nov 2024 11:47:32 +0100 Subject: [PATCH] Dirty-fix for known bug #307: Ignore keys containing '$'. --- pkg/builder/objects.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkg/builder/objects.go b/pkg/builder/objects.go index 085e15af..c18dd365 100644 --- a/pkg/builder/objects.go +++ b/pkg/builder/objects.go @@ -2,6 +2,7 @@ package builder import ( "fmt" + "log" "strings" ) @@ -82,6 +83,7 @@ func (o ObjectType) ConciseString() string { func printChildren(children map[string]Type, order []string, s string) string { j := "" + order = removeStringsWithDollar(order) for _, name := range order { c := children[name] colon := ":" @@ -119,3 +121,15 @@ func printChildren(children map[string]Type, order []string, s string) string { j = strings.TrimSuffix(j, s) return j } + +func removeStringsWithDollar(input []string) []string { + var result []string + for _, str := range input { + if !strings.Contains(str, "$") { + result = append(result, str) + } else { + log.Default().Printf("Warning: %s contains a '$' and has been ommited from final libsonnet as a temporary fix", str) + } + } + return result +}