diff --git a/prototype/snippet/jsonnet/snippet.go b/prototype/snippet/jsonnet/snippet.go index 8e672d1bc1ba3001a94d749de0a534fb017ae27c..ad00f736b769e81dfb644d27dc2a46dafb8973f4 100644 --- a/prototype/snippet/jsonnet/snippet.go +++ b/prototype/snippet/jsonnet/snippet.go @@ -28,8 +28,7 @@ import ( const ( paramPrefix = "param://" - paramReplacementPrefix = "${" - paramReplacementSuffix = "}" + paramReplacementPrefix = "params." ) // Parse rewrites the imports in a Jsonnet file before returning the parsed @@ -301,7 +300,7 @@ func visitLocalBind(node ast.LocalBind, imports *[]ast.Import) error { // --------------------------------------------------------------------------- // replace converts all parameters in the passed Jsonnet of form -// `import 'param://port'` into `${port}`. +// `import 'param://port'` into `params.port`. func replace(jsonnet string, imports []ast.Import) string { lines := strings.Split(jsonnet, "\n") @@ -315,7 +314,7 @@ func replace(jsonnet string, imports []ast.Import) string { }) for _, im := range imports { - param := paramReplacementPrefix + strings.TrimPrefix(im.File.Value, paramPrefix) + paramReplacementSuffix + param := paramReplacementPrefix + strings.TrimPrefix(im.File.Value, paramPrefix) lineStart := im.Loc().Begin.Line lineEnd := im.Loc().End.Line diff --git a/prototype/snippet/jsonnet/snippet_test.go b/prototype/snippet/jsonnet/snippet_test.go index 6cb1f071de19dc9ef7913bce5324c1d3dee5ad2b..4fd213d48d9774e60e4facf93af1cafbfde05467 100644 --- a/prototype/snippet/jsonnet/snippet_test.go +++ b/prototype/snippet/jsonnet/snippet_test.go @@ -49,9 +49,9 @@ func TestParse(t *testing.T) { local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; - local port = servicePort.new((${port}), (${portName})); + local port = servicePort.new((params.port), (params.portName)); - local name = ${name}; + local name = params.name; k.core.v1.service.new('%s-service' % [name], {app: name}, port)`, }, // Test where an import param is split over multiple lines. @@ -66,7 +66,7 @@ func TestParse(t *testing.T) { ` local f = ( - ${f} + params.f );