Merge pull request #653 from cloudfoundry/improvement-allow-interpola…

…tion-with-whitespace allow white-space in (( var_name )) template
cloudfoundry · Jun 6, 2024 · c5662d1 · c5662d1
2 parents 38ff205 + 55cc5bc
commit c5662d1
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/director/template/template.go b/director/template/template.go
@@ -88,7 +88,7 @@ func (t Template) interpolateRoot(obj interface{}, tracker varsTracker) (interfa
 type interpolator struct{}
 
 var (
-	interpolationRegex         = regexp.MustCompile(`\(\((!?[-/\.\w\pL]+)\)\)`)
+	interpolationRegex         = regexp.MustCompile(`\(\( ?(!?[-/\.\w\pL]+) ?\)\)`)
 	interpolationAnchoredRegex = regexp.MustCompile("\\A" + interpolationRegex.String() + "\\z")
 )
 

diff --git a/director/template/template_test.go b/director/template/template_test.go
@@ -20,6 +20,44 @@ var _ = Describe("Template", func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(result).To(Equal([]byte("foo\n")))
 	})
+	Context("the (( variable )) placeholder uses spaces", func() {
+		It(`can interpolate values even if var name is prefixed with a whitespace`, func() {
+			template := NewTemplate([]byte("(( key))"))
+			vars := StaticVariables{"key": "foo"}
+
+			result, err := template.Evaluate(vars, nil, EvaluateOpts{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(result).To(Equal([]byte("foo\n")))
+		})
+		It(`can interpolate values even if var name is suffixed with a whitespace`, func() {
+			template := NewTemplate([]byte("((key ))"))
+			vars := StaticVariables{"key": "foo"}
+
+			result, err := template.Evaluate(vars, nil, EvaluateOpts{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(result).To(Equal([]byte("foo\n")))
+		})
+		It(`can interpolate values even if var name is surrounded by whitespace`, func() {
+			template := NewTemplate([]byte("(( key ))"))
+			vars := StaticVariables{"key": "foo"}
+
+			result, err := template.Evaluate(vars, nil, EvaluateOpts{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(result).To(Equal([]byte("foo\n")))
+		})
+		It("can interpolate a specific indexed value of an variable that is an array", func() {
+			template := NewTemplate([]byte("(( key)): (( value.1))"))
+			vars := StaticVariables{
+				"key":   "foo",
+				"value": []interface{}{"bar", "baz"},
+			}
+
+			result, err := template.Evaluate(vars, nil, EvaluateOpts{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(result).To(Equal([]byte("foo: baz\n")))
+		})
+
+	})
 
 	It("can interpolate a specific indexed value of an variable that is an array", func() {
 		template := NewTemplate([]byte("((key)): ((value.1))"))