pr comments

Signed-off-by: Andrew Chubatiuk <[email protected]>
crossplane-contrib · Nov 16, 2023 · c11b367 · c11b367
1 parent 1985ae6
commit c11b367
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 38 deletions.
diff --git a/example/custom-delims/composition.yaml b/example/custom-delims/composition.yaml
@@ -14,8 +14,10 @@ spec:
       input:
         apiVersion: gotemplating.fn.crossplane.io/v1beta1
         kind: GoTemplate
-        leftDelims: '[['
-        rightDelims: ']]'
+        config:
+          delims:
+            left: '[['
+            right: ']]'
         source: Inline
         inline:
           template: |

diff --git a/fn.go b/fn.go
@@ -57,7 +57,7 @@ func (f *Function) RunFunction(_ context.Context, req *fnv1beta1.RunFunctionRequ
 		return rsp, nil
 	}
 
-	tmpl, err := GetNewTemplateWithFunctionMaps(in).Parse(tg.GetTemplates())
+	tmpl, err := GetNewTemplateWithFunctionMaps(in.Config).Parse(tg.GetTemplates())
 	if err != nil {
 		response.Fatal(rsp, errors.Wrap(err, "invalid function input: cannot parse the provided templates"))
 		return rsp, nil

diff --git a/function_maps.go b/function_maps.go
@@ -13,11 +13,6 @@ import (
 	"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
 )
 
-var (
-	defaultLeftDelims  = "{{"
-	defaultRightDelims = "}}"
-)
-
 var funcMaps = []template.FuncMap{
 	{
 		"randomChoice": func(choices ...string) string {
@@ -53,14 +48,14 @@ var funcMaps = []template.FuncMap{
 	},
 }
 
-func GetNewTemplateWithFunctionMaps(in *v1beta1.GoTemplate) *template.Template {
-	if in.LeftDelims == nil {
-		in.LeftDelims = &defaultLeftDelims
-	}
-	if in.RightDelims == nil {
-		in.RightDelims = &defaultRightDelims
+func GetNewTemplateWithFunctionMaps(cfg *v1beta1.Config) *template.Template {
+	tpl := template.New("manifests")
+
+	if cfg.Delims != nil {
+		if cfg.Delims.Left != nil && cfg.Delims.Right != nil {
+			tpl = tpl.Delims(*cfg.Delims.Left, *cfg.Delims.Right)
+		}
 	}
-	tpl := template.New("manifests").Delims(*in.LeftDelims, *in.RightDelims)
 
 	for _, f := range funcMaps {
 		tpl.Funcs(f)

diff --git a/input/v1beta1/input.go b/input/v1beta1/input.go
@@ -18,15 +18,9 @@ import (
 type GoTemplate struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	// Template start characters
-	// +kubebuilder:default:="{{"
+	// Go Template Config
 	// +optional
-	LeftDelims *string `json:"leftDelims,omitempty"`
-	// Template end characters
-	// +kubebuilder:default:="}}"
-	// +optional
-	RightDelims *string `json:"rightDelims,omitempty"`
+	Config *Config `json:"config,omitempty"`
 	// Source specifies the different types of input sources that can be used with this function
 	Source TemplateSource `json:"source"`
 	// Inline is the inline form input of the templates
@@ -52,3 +46,20 @@ type TemplateSourceInline struct {
 type TemplateSourceFileSystem struct {
 	DirPath string `json:"dirPath,omitempty"`
 }
+
+type Config struct {
+	// Template delimiters
+	// +optional
+	Delims *Delims `json:"delims,omitempty"`
+}
+
+type Delims struct {
+	// Template start characters
+	// +kubebuilder:default:="{{"
+	// +optional
+	Left *string `json:"left,omitempty"`
+	// Template end characters
+	// +kubebuilder:default:="}}"
+	// +optional
+	Right *string `json:"right,omitempty"`
+}
diff --git a/input/v1beta1/zz_generated.deepcopy.go b/input/v1beta1/zz_generated.deepcopy.go
diff --git a/package/input/gotemplating.fn.crossplane.io_gotemplates.yaml b/package/input/gotemplating.fn.crossplane.io_gotemplates.yaml
@@ -26,6 +26,22 @@ spec:
               of an object. Servers should convert recognized schemas to the latest
               internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
+          config:
+            description: Go Template Config
+            properties:
+              delims:
+                description: Template delimiters
+                properties:
+                  left:
+                    default: '{{'
+                    description: Template start characters
+                    type: string
+                  right:
+                    default: '}}'
+                    description: Template end characters
+                    type: string
+                type: object
+            type: object
           fileSystem:
             description: FileSystem is the folder path where the templates are located
             properties:
@@ -43,16 +59,8 @@ spec:
               object represents. Servers may infer this from the endpoint the client
               submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
-          leftDelims:
-            default: '{{'
-            description: Template start characters
-            type: string
           metadata:
             type: object
-          rightDelims:
-            default: '}}'
-            description: Template end characters
-            type: string
           source:
             description: Source specifies the different types of input sources that
               can be used with this function