Support secret scope & convert to secret keys to camelCase (#31)

Readme.md

@@ -134,6 +134,8 @@ HARNESS_MIGRATOR_AUTH=apiKey harness-upgrade --app APP_ID --project PROJECT --or
 ```
 > If you do not provide use `--triggers` flag it will migrate all triggers in the app
 
+> Migrating Triggers is WIP. The current results requires considerable manual effort post migration
+
 ### To create a project
 ```shell
 HARNESS_MIGRATOR_AUTH=apiKey harness-upgrade --account ACCOUNT_ID --env ENV --org ORG project --name PROJECT_NAME --identifier PROJECT_IDENTIFIER create
@@ -196,6 +198,11 @@ Do a dry run on the files without replacing any CG expressions
 harness-upgrade expressions --dry-run
 ```
 
+Secrets referenced in these files are converted to camel case to align with the migrator. You can provide the scope of the secrets using the `--secret-scope` flag.
+```shell
+harness-upgrade --secret-scope account expressions
+```
+
 To provide custom expressions or override default expressions
 ```shell
 harness-upgrade expressions --override /path/to/file.yaml

expressions.go

@@ -13,6 +13,7 @@ import (
 )
 
 const ExpressionPattern = "\\$\\{[\\w-.\"()]+}"
+const SecretExpressionPattern = "\\$\\{secrets.getValue\\([^{}]+\\)}"
 
 var ExpressionsMap = map[string]string{
 	"infra.kubernetes.namespace": "<+infra.namespace>",
@@ -97,14 +98,26 @@ var DynamicExpressions = map[string]interface{}{
 	"environmentVariables": func(key string) string {
 		return "<+env.variables." + key + ">"
 	},
-	"secrets": func(key string) string {
-		return "<+secrets.getValue(\"" + key + "\")>"
+	"secrets.getValue(": func(key string) string {
+		return "<+secrets.getValue(\"" + getSecretKeyWithScope(key) + "\")>"
 	},
 	"app.defaults": func(key string) string {
 		return "<+variable." + key + ">"
 	},
 }
 
+func getSecretKeyWithScope(key string) string {
+	camelCase := ToCamelCase(key)
+	switch migrationReq.SecretScope {
+	case Account:
+		return Account + "." + camelCase
+	case Org:
+		return Org + "." + camelCase
+	default:
+		return camelCase
+	}
+}
+
 func ReplaceCurrentGenExpressionsWithNextGen(*cli.Context) (err error) {
 	loadYamlFromFile(migrationReq.CustomExpressionsFile)
 
@@ -185,8 +198,14 @@ func ReplaceCurrentGenExpressionsWithNextGen(*cli.Context) (err error) {
 }
 
 func FindAllExpressions(str string) []string {
+	// Generic expressions
 	r := regexp.MustCompile(ExpressionPattern)
-	return r.FindAllString(str, -1)
+	allExpressions := r.FindAllString(str, -1)
+
+	// Secret expressions
+	r = regexp.MustCompile(SecretExpressionPattern)
+	allExpressions = append(allExpressions, r.FindAllString(str, -1)...)
+	return allExpressions
 }
 
 func ReplaceAllExpressions(str string, expressions []string) (string, []string) {
@@ -248,7 +267,15 @@ func renderSupportedExpressionsTable(data []string) {
 
 func getDynamicExpressionValue(key string) string {
 	k := getDynamicExpressionKey(key)
-	dynamic := strings.Replace(key, k+".", "", 1)
+	var dynamic string
+	if strings.HasSuffix(k, "(") {
+		dynamic = strings.Replace(key, k, "", 1)
+		if strings.HasSuffix(dynamic, ")") {
+			dynamic = dynamic[0 : len(dynamic)-1]
+		}
+	} else {
+		dynamic = strings.Replace(key, k+".", "", 1)
+	}
 	return DynamicExpressions[k].(func(string2 string) string)(dynamic)
 }
 

helper.go

@@ -158,3 +158,43 @@ func ReadFile(absFilePath string) (string, error) {
 	}
 	return string(d), err
 }
+
+func ToCamelCase(s string) string {
+	s = strings.TrimSpace(s)
+	s = strings.ToLower(s)
+	if s == "" {
+		return s
+	}
+	n := strings.Builder{}
+	n.Grow(len(s))
+	capNext := false
+	for i, v := range []byte(s) {
+		vIsCap := v >= 'A' && v <= 'Z'
+		vIsLow := v >= 'a' && v <= 'z'
+		vIsNum := v >= '0' && v <= '9'
+		if vIsNum && i == 0 {
+			n.WriteByte('_')
+		}
+		if capNext {
+			if vIsLow {
+				v += 'A'
+				v -= 'a'
+			}
+		} else if i == 0 {
+			if vIsCap {
+				v += 'a'
+				v -= 'A'
+			}
+		}
+		if vIsCap || vIsLow {
+			n.WriteByte(v)
+			capNext = false
+		} else if vIsNum {
+			n.WriteByte(v)
+			capNext = true
+		} else {
+			capNext = v == '_' || v == ' ' || v == '-' || v == '.'
+		}
+	}
+	return n.String()
+}