From 410ae00332b45b07893fd4b6584bf2467efd8abb Mon Sep 17 00:00:00 2001
From: Mathieu Debove <mathieu.debove@sqits.net>
Date: Tue, 15 Jan 2019 16:13:29 +0100
Subject: [PATCH] Remove JSON pre-processing for "SECRET:*" values

---
 engine/appconfig.go     |  8 +-------
 engine/secret/config.go | 17 -----------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/engine/appconfig.go b/engine/appconfig.go
index ced23800..c5e1e959 100644
--- a/engine/appconfig.go
+++ b/engine/appconfig.go
@@ -6,7 +6,6 @@ import (
 	"os"
 
 	"github.com/project-flogo/core/app"
-	"github.com/project-flogo/core/engine/secret"
 	"github.com/project-flogo/core/support"
 )
 
@@ -58,13 +57,8 @@ func LoadAppConfig(flogoJson string, compressed bool) (*app.Config, error) {
 		}
 	}
 
-	updated, err := secret.PreProcessConfig(jsonBytes)
-	if err != nil {
-		return nil, err
-	}
-
 	appConfig := &app.Config{}
-	err = json.Unmarshal(updated, &appConfig)
+	err := json.Unmarshal(jsonBytes, &appConfig)
 	if err != nil {
 		return nil, err
 	}
diff --git a/engine/secret/config.go b/engine/secret/config.go
index 3cca3e73..603667fa 100644
--- a/engine/secret/config.go
+++ b/engine/secret/config.go
@@ -1,26 +1,9 @@
 package secret
 
 import (
-	"regexp"
 	"strings"
 )
 
-func PreProcessConfig(appJson []byte) ([]byte, error) {
-
-	// For now decode secret values
-	re := regexp.MustCompile("SECRET:[^\\\\\"]*")
-	for _, match := range re.FindAll(appJson, -1) {
-		decodedValue, err := resolveSecretValue(string(match))
-		if err != nil {
-			return nil, err
-		}
-		appstring := strings.Replace(string(appJson), string(match), decodedValue, -1)
-		appJson = []byte(appstring)
-	}
-
-	return appJson, nil
-}
-
 func resolveSecretValue(encrypted string) (string, error) {
 	encodedValue := string(encrypted[7:])
 	decodedValue, err := GetSecretValueHandler().DecodeValue(encodedValue)