From 9576e75323689052a160157ad193b9e082df69f7 Mon Sep 17 00:00:00 2001
From: "R.I.Pienaar" <rip@devco.net>
Date: Thu, 26 May 2022 17:07:02 +0200
Subject: [PATCH] (#1665) allow discovery method and options to be templat
 parsed

Signed-off-by: R.I.Pienaar <rip@devco.net>
---
 providers/appbuilder/rpc/rpc.go |  1 -
 providers/appbuilder/util.go    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/providers/appbuilder/rpc/rpc.go b/providers/appbuilder/rpc/rpc.go
index 39ec0e562..8cb4e4a60 100644
--- 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
index 759a8d652..41f649d44 100644
--- 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 {