Merge pull request #1699 from choria-io/1665.19

(#1665) allow discovery method and options to be templat parsed
choria-io · May 26, 2022 · 90d60f2 · 90d60f2
2 parents 5f511e3 + 9576e75
commit 90d60f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/providers/appbuilder/rpc/rpc.go b/providers/appbuilder/rpc/rpc.go
@@ -410,7 +410,6 @@ func (r *RPC) transformResults(w io.Writer, results *replyfmt.RPCResults, action
 		return err
 	}
 
-	fmt.Printf("transform: %#v", r.def.Transform)
 	return r.def.Transform.FTransformJSON(r.ctx, w, out.Bytes())
 }
 

diff --git a/providers/appbuilder/util.go b/providers/appbuilder/util.go
@@ -12,6 +12,20 @@ import (
 func ProcessStdDiscoveryOptions(f *discovery.StandardOptions, arguments interface{}, flags interface{}, config interface{}) error {
 	var err error
 
+	if f.DiscoveryMethod != "" {
+		f.DiscoveryMethod, err = builder.ParseStateTemplate(f.DiscoveryMethod, arguments, flags, config)
+		if err != nil {
+			return err
+		}
+	}
+
+	for k, v := range f.DiscoveryOptions {
+		f.DiscoveryOptions[k], err = builder.ParseStateTemplate(v, arguments, flags, config)
+		if err != nil {
+			return err
+		}
+	}
+
 	if f.Collective != "" {
 		f.Collective, err = builder.ParseStateTemplate(f.Collective, arguments, flags, config)
 		if err != nil {
-Original file line number
+Diff line change
@@ Expand Up @@
     		return err
     	}
-    	fmt.Printf("transform: %#v", r.def.Transform)
     	return r.def.Transform.FTransformJSON(r.ctx, w, out.Bytes())
     }
@@ Expand Down @@