[configuration] Use process templates in JIT by default when using ap…

…ricot

OCTRL-925

configuration/componentcfg/query.go

@@ -175,7 +175,7 @@ type QueryParameters struct {
 
 func NewQueryParameters(parameters string) (p *QueryParameters, err error) {
 	p = &QueryParameters{
-		ProcessTemplates: false,
+		ProcessTemplates: true,
 		VarStack:         make(map[string]string),
 	}
 	parameters = strings.TrimSpace(parameters)

configuration/template/dplutil.go

@@ -88,8 +88,14 @@ func jitDplGenerate(confSvc ConfigurationService, varStack map[string]string, wo
 		if err != nil {
 			return "", fmt.Errorf("JIT could not create a query out of path '%s'. error: %w", consulKey[1], err)
 		}
-		// parse parameters if they are present
+
 		queryParams := &componentcfg.QueryParameters{ProcessTemplates: false, VarStack: nil}
+		// Configuration library adds "process=true" if apricot backend is used and "process" is missing,
+		// thus using apricot backend with no parameters always implies an expectation to process templates.
+		if strings.HasPrefix(uri, "apricot") {
+			queryParams.ProcessTemplates = true
+		}
+		// parse parameters if they are present
 		if len(consulKeyTokens) == 2 {
 			queryParams, err = componentcfg.NewQueryParameters(consulKeyTokens[1])
 			if err != nil {