From bf7da51a563bb87a7dbe7659582e676e0c0450d3 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 14 Mar 2024 02:52:16 -0400
Subject: [PATCH] fix: reference env from config dir

---
 plugins/common/common_test.go   |  4 ++--
 plugins/config/config_test.go   |  7 ++++---
 plugins/config/environment.go   |  4 ++--
 tests/unit/config-oddities.bats | 10 +++++-----
 tests/unit/config.bats          | 10 +++++-----
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/plugins/common/common_test.go b/plugins/common/common_test.go
index e6f0faee5..d6acadf66 100644
--- a/plugins/common/common_test.go
+++ b/plugins/common/common_test.go
@@ -10,11 +10,11 @@ import (
 
 var (
 	testAppName  = "test-app-1"
-	testAppDir   = strings.Join([]string{"/home/dokku/", testAppName}, "")
+	testAppDir   = strings.Join([]string{"/var/lib/dokku/config/config/", testAppName}, "")
 	testEnvFile  = strings.Join([]string{testAppDir, "/ENV"}, "")
 	testEnvLine  = "export testKey=TESTING"
 	testAppName2 = "01-test-app-1"
-	testAppDir2  = strings.Join([]string{"/home/dokku/", testAppName2}, "")
+	testAppDir2  = strings.Join([]string{"/var/lib/dokku/config/config/", testAppName2}, "")
 	testEnvFile2 = strings.Join([]string{testAppDir2, "/ENV"}, "")
 	testEnvLine2 = "export testKey=TESTING"
 )
diff --git a/plugins/config/config_test.go b/plugins/config/config_test.go
index 9eb0d0358..02df8d9bc 100644
--- a/plugins/config/config_test.go
+++ b/plugins/config/config_test.go
@@ -2,6 +2,7 @@ package config
 
 import (
 	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -12,9 +13,9 @@ import (
 
 var (
 	testAppName      = "test-app-1"
-	dokkuRoot        = common.MustGetEnv("DOKKU_ROOT")
-	testAppDir       = strings.Join([]string{dokkuRoot, testAppName}, "/")
-	globalConfigFile = strings.Join([]string{dokkuRoot, "ENV"}, "/")
+	dokkuLibRoot     = common.MustGetEnv("DOKKU_LIB_ROOT")
+	testAppDir       = filepath.Join(dokkuLibRoot, "config", testAppName)
+	globalConfigFile = filepath.Join(dokkuLibRoot, "config", "--global", "ENV")
 )
 
 func setupTests() (err error) {
diff --git a/plugins/config/environment.go b/plugins/config/environment.go
index 6e341dd62..97a7fe8c6 100644
--- a/plugins/config/environment.go
+++ b/plugins/config/environment.go
@@ -392,9 +392,9 @@ func loadFromFileJSON(name string, filename string) (env *Env, err error) {
 	}, nil
 }
 func getAppFile(appName string) (string, error) {
-	return filepath.Join(common.MustGetEnv("DOKKU_ROOT"), appName, "ENV"), nil
+	return filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "config", appName, "ENV"), nil
 }
 
 func getGlobalFile() string {
-	return filepath.Join(common.MustGetEnv("DOKKU_ROOT"), "ENV")
+	return filepath.Join(common.MustGetEnv("DOKKU_ROOT"), "config", "--global", "ENV")
 }
diff --git a/tests/unit/config-oddities.bats b/tests/unit/config-oddities.bats
index 011d46e16..7ec94b7f1 100644
--- a/tests/unit/config-oddities.bats
+++ b/tests/unit/config-oddities.bats
@@ -4,16 +4,16 @@ load test_helper
 
 setup() {
   global_setup
-  [[ -f ${DOKKU_ROOT}/ENV ]] && mv -f ${DOKKU_ROOT}/ENV ${DOKKU_ROOT}/ENV.bak
-  sudo -H -u dokku /bin/bash -c "echo 'export global_test=true' > ${DOKKU_ROOT}/ENV"
+  mkdir -p "${DOKKU_LIB_ROOT}/config/--global"
+  [[ -f ${DOKKU_LIB_ROOT}/config/--global/ENV ]] && mv -f ${DOKKU_LIB_ROOT}/config/--global/ENV ${DOKKU_LIB_ROOT}/config/--global/ENV.bak
+  sudo -H -u dokku /bin/bash -c "echo 'export global_test=true' > ${DOKKU_LIB_ROOT}/config/--global/ENV"
   create_app
 }
 
 teardown() {
   destroy_app
-  ls -la ${DOKKU_ROOT}
-  if [[ -f ${DOKKU_ROOT}/ENV.bak ]]; then
-    mv -f ${DOKKU_ROOT}/ENV.bak ${DOKKU_ROOT}/ENV
+  if [[ -f ${DOKKU_LIB_ROOT}/config/--global/ENV.bak ]]; then
+    mv -f ${DOKKU_LIB_ROOT}/config/--global/ENV.bak ${DOKKU_LIB_ROOT}/config/--global/ENV
   fi
   global_teardown
 }
diff --git a/tests/unit/config.bats b/tests/unit/config.bats
index 1825feb12..4aa053d7f 100644
--- a/tests/unit/config.bats
+++ b/tests/unit/config.bats
@@ -4,16 +4,16 @@ load test_helper
 
 setup() {
   global_setup
-  [[ -f ${DOKKU_ROOT}/ENV ]] && mv -f ${DOKKU_ROOT}/ENV ${DOKKU_ROOT}/ENV.bak
-  sudo -H -u dokku /bin/bash -c "echo 'export global_test=true' > ${DOKKU_ROOT}/ENV"
+  mkdir -p "${DOKKU_LIB_ROOT}/config/--global"
+  [[ -f ${DOKKU_LIB_ROOT}/config/--global/ENV ]] && mv -f ${DOKKU_LIB_ROOT}/config/--global/ENV ${DOKKU_LIB_ROOT}/config/--global/ENV.bak
+  sudo -H -u dokku /bin/bash -c "echo 'export global_test=true' > ${DOKKU_LIB_ROOT}/config/--global/ENV"
   create_app
 }
 
 teardown() {
   destroy_app
-  ls -la ${DOKKU_ROOT}
-  if [[ -f ${DOKKU_ROOT}/ENV.bak ]]; then
-    mv -f ${DOKKU_ROOT}/ENV.bak ${DOKKU_ROOT}/ENV
+  if [[ -f ${DOKKU_LIB_ROOT}/config/--global/ENV.bak ]]; then
+    mv -f ${DOKKU_LIB_ROOT}/config/--global/ENV.bak ${DOKKU_LIB_ROOT}/config/--global/ENV
   fi
   global_teardown
 }