support xxx/yyy/global

parse-config.sh

@@ -35,10 +35,34 @@ load_dir() {
           KEY=${KEY#"infrastructure.global."}
         fi
 
+        if [[ "$KEY" =~ infrastructure\.[^.]+\.global\..+ ]]; then
+          # Remove 'infrastructure.' prefix
+          TEMP=${KEY#infrastructure.}
+
+          # Split off the part after 'global.'
+          PART_BEFORE_GLOBAL=${TEMP%%.global.*}
+          PART_AFTER_GLOBAL=${TEMP#*.global.}
+
+          # Combine the parts
+          KEY="${PART_BEFORE_GLOBAL}.${PART_AFTER_GLOBAL}"
+        fi
+
         # Removes the application.global prefix if it exists
         if [[ "$KEY" == "application.global."* ]]; then
           KEY=${KEY#"application.global."}
         fi
+
+        if [[ "$KEY" =~ application\.[^.]+\.global\..+ ]]; then
+          # Remove 'application.' prefix
+          TEMP=${KEY#application.}
+
+          # Split off the part after 'global.'
+          PART_BEFORE_GLOBAL=${TEMP%%.global.*}
+          PART_AFTER_GLOBAL=${TEMP#*.global.}
+
+          # Combine the parts
+          KEY="${PART_BEFORE_GLOBAL}.${PART_AFTER_GLOBAL}"
+        fi
 
         # Removes the application.$application_name prefix if it exists
         if [[ "$KEY" == "application.$APPLICATION_NAME."* ]]; then
@@ -76,3 +100,5 @@ log "Loaded AWS Secret variables"
 log "Loading AWS Application Secret variables..."
 load_dir "$WORKDIR/aws-secret-application" false 0
 log "Loaded AWS Application Secret variables"
+
+sort "$WORKDIR/application.properties" | uniq > "$WORKDIR/temp.properties" && mv "$WORKDIR/temp.properties" "$WORKDIR/application.properties"

test/expectation/.expected

@@ -1,8 +1,8 @@
+auth_password=password
 kerberos.cache.kerberos-authz.url=kerberos-authz.cache.dev.pleo.io
-sqs.sales.endpoint=https://sputnik-buckname.name.com
-msk.endpoint=https://msk.com
 launch-darkly.key=secret_value
+msk.endpoint=https://msk.com
 openai.key=beepboop
 private=password
+sqs.sales.endpoint=https://sputnik-buckname.name.com
 with.special.chars=@sbSZN%r!r!&9bgE%x&IC%2Bh952U%jD!o&Tww4^ztH#ds@3R44
-auth_password=password

test/fixture/volumes/aws-parameter-store/_application_kerberos_global_cache_kerberos-authz_url

@@ -0,0 +1 @@
+kerberos-authz.cache.dev.pleo.io

test/fixture/volumes/aws-secret/infrastructure_launch-darkly_global.key

@@ -0,0 +1 @@
+secret_value

test/validate.sh

@@ -11,4 +11,4 @@ else
     echo $(diff $result $expected)
 
     exit 1
-fi
+fi