Merge pull request #3 from Optum/uppercase-arguments

Support uppercased arguments

Author: JohnMThayer

envvars-lib/src/main/java/com/optum/envvars/set/EnvVarsStaticSets.java

@@ -91,6 +91,7 @@ private Map<String, String> processParameterizedDefineSetReferences(String setKe
             String arg = rawarg.trim();
             boolean foundOneOfThisArg = false;
             final String argHolder = "{{$" + (whichArg) + "}}";
+            final String uppercaseArgHolder = "{{^$" + (whichArg) + "}}";
 
             // Replace keys
             for(int i=0; i<count; i++) {
@@ -99,6 +100,10 @@ private Map<String, String> processParameterizedDefineSetReferences(String setKe
                     foundOneOfThisArg = true;
                     String newValue = key.replace(argHolder, arg);
                     keys.set(i, newValue);
+                } else if (key.contains(uppercaseArgHolder)) {
+                    foundOneOfThisArg = true;
+                    String newValue = key.replace(uppercaseArgHolder, arg.toUpperCase());
+                    keys.set(i, newValue);
                 }
             }
 
@@ -109,6 +114,10 @@ private Map<String, String> processParameterizedDefineSetReferences(String setKe
                     foundOneOfThisArg = true;
                     String newValue = value.replace(argHolder, arg);
                     values.set(i, newValue);
+                } else if (value.contains(uppercaseArgHolder)) {
+                    foundOneOfThisArg = true;
+                    String newValue = value.replace(uppercaseArgHolder, arg.toUpperCase());
+                    values.set(i, newValue);
                 }
             }
 
@@ -208,12 +217,17 @@ private List<String> processParameterizedInjectSetReferences(String key, String[
             String arg = rawarg.trim();
             boolean foundOneOfThisArg = false;
             final String argHolder = "{{$" + (whichArg) + "}}";
+            final String uppercaseArgHolder = "{{^$" + (whichArg) + "}}";
             for(int i=0; i<values.size(); i++) {
                 String value = values.get(i);
                 if (value.contains(argHolder)) {
                     foundOneOfThisArg = true;
                     String newValue = value.replace(argHolder, arg);
                     values.set(i, newValue);
+                } else if (value.contains(uppercaseArgHolder)) {
+                    foundOneOfThisArg = true;
+                    String newValue = value.replace(uppercaseArgHolder, arg.toUpperCase());
+                    values.set(i, newValue);
                 }
             }
             if (!foundOneOfThisArg) {

envvars-lib/src/test/groovy/com/optum/envvars/EnvVarEngineSpec.groovy

@@ -832,6 +832,20 @@ class EnvVarEngineSpec extends Specification {
         results.get("MYDATABASE_Main") == "https://Main:3306"
     }
 
+    final Map uppercaseDefineSetsParam = ["Database": ['MYDATABASE_{{^$1}}': 'https://{{^$1}}:3306']]
+
+    def "Parameterized Uppercase Declares"() {
+        when:
+        EnvVarsStaticSets envVarsStaticSets = new EnvVarsStaticSets(Collections.emptyMap(), uppercaseDefineSetsParam)
+        EnvVarsEngine envVarsEngine = new EnvVarsEngine(envVarsStaticSets)
+        EnvVarsRuntimeSelectors.Node node = new EnvVarsRuntimeSelectors.Node("environments", true, "dev", true, EnvVarsMapDataEngine.DefaultProcessingPolicy.SUPPORTED, StandardNodeSectionsPolicy.NOSECRETS)
+        final EnvVarsMapDataEngine nestedMap = new EnvVarsMapDataEngine(null, envVarsStaticSets, declareParam)
+        envVarsEngine.add(nestedMap.get(new EnvVarsRuntimeSelectors(Collections.singletonList(node))))
+        Map<String, String> results = envVarsEngine.generateBridgeData()
+        then:
+        results.get("MYDATABASE_MAIN") == "https://MAIN:3306"
+    }
+
     final Map declareCascade = new JsonSlurper().parseText(
             """{
 "environments": {