From 36aade24c93ae942567b0c15992430595edf35fd Mon Sep 17 00:00:00 2001 From: Alex Dzeda Date: Mon, 8 Jan 2024 10:23:18 -0600 Subject: [PATCH] move imports to systems.go --- docker-compose.migrate.yml | 1 - docker-compose.yml | 1 - ssas/cfg/configs/dev.env | 1 + ssas/cfg/configs/local.env | 1 + ssas/cfg/configs/opensbx.env | 1 + ssas/cfg/configs/prod.env | 1 + ssas/cfg/configs/test.env | 1 + ssas/service/main/main.go | 9 --------- ssas/systems.go | 9 +++++++++ 9 files changed, 14 insertions(+), 11 deletions(-) diff --git a/docker-compose.migrate.yml b/docker-compose.migrate.yml index 51f67a9f..24765a25 100644 --- a/docker-compose.migrate.yml +++ b/docker-compose.migrate.yml @@ -5,4 +5,3 @@ services: image: migrate/migrate volumes: - .:/go/src/github.com/CMSgov/bcda-ssas-app - - ./ssas/cfg/configs:/usr/local/configs diff --git a/docker-compose.yml b/docker-compose.yml index cafb54c1..3570fb25 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,6 @@ services: - BCDA_AUTH_PROVIDER=${BCDA_AUTH_PROVIDER} - BCDA_SSAS_CLIENT_ID=${BCDA_SSAS_CLIENT_ID} - BCDA_SSAS_SECRET=${BCDA_SSAS_SECRET} - - DEBUG=true - DEPLOYMENT_TARGET=local - SSAS_ADMIN_SIGNING_KEY_PATH=../shared_files/ssas/admin_test_signing_key.pem - SSAS_PUBLIC_SIGNING_KEY_PATH=../shared_files/ssas/public_test_signing_key.pem diff --git a/ssas/cfg/configs/dev.env b/ssas/cfg/configs/dev.env index 37d85bd7..8577dc8d 100644 --- a/ssas/cfg/configs/dev.env +++ b/ssas/cfg/configs/dev.env @@ -1,3 +1,4 @@ +DEBUG=TRUE DEPLOYMENT_TARGET=dev SSAS_DEFAULT_SYSTEM_SCOPE=bcda-api SSAS_IDLE_TIMEOUT=120 diff --git a/ssas/cfg/configs/local.env b/ssas/cfg/configs/local.env index 6b200057..d4158ace 100644 --- a/ssas/cfg/configs/local.env +++ b/ssas/cfg/configs/local.env @@ -1,3 +1,4 @@ +DEBUG=TRUE DEPLOYMENT_TARGET=local SSAS_DEFAULT_SYSTEM_SCOPE=bcda-api SSAS_IDLE_TIMEOUT=120 diff --git a/ssas/cfg/configs/opensbx.env b/ssas/cfg/configs/opensbx.env index a95aaa58..e0608b2e 100644 --- a/ssas/cfg/configs/opensbx.env +++ b/ssas/cfg/configs/opensbx.env @@ -1,3 +1,4 @@ +DEBUG=FALSE DEPLOYMENT_TARGET=opensbx SSAS_DEFAULT_SYSTEM_SCOPE=bcda-api SSAS_IDLE_TIMEOUT=120 diff --git a/ssas/cfg/configs/prod.env b/ssas/cfg/configs/prod.env index 10d77ca3..eee51ad4 100644 --- a/ssas/cfg/configs/prod.env +++ b/ssas/cfg/configs/prod.env @@ -1,3 +1,4 @@ +DEBUG=FALSE DEPLOYMENT_TARGET=prod SSAS_DEFAULT_SYSTEM_SCOPE=bcda-api SSAS_IDLE_TIMEOUT=120 diff --git a/ssas/cfg/configs/test.env b/ssas/cfg/configs/test.env index db31fdaa..c5d1107d 100644 --- a/ssas/cfg/configs/test.env +++ b/ssas/cfg/configs/test.env @@ -1,3 +1,4 @@ +DEBUG=FALSE DEPLOYMENT_TARGET=test SSAS_DEFAULT_SYSTEM_SCOPE=bcda-api SSAS_IDLE_TIMEOUT=120 diff --git a/ssas/service/main/main.go b/ssas/service/main/main.go index 83e4e1c7..0cb280f1 100644 --- a/ssas/service/main/main.go +++ b/ssas/service/main/main.go @@ -49,7 +49,6 @@ import ( "github.com/CMSgov/bcda-ssas-app/ssas/service/public" "github.com/go-chi/chi/v5" gcmw "github.com/go-chi/chi/v5/middleware" - "github.com/joho/godotenv" "github.com/newrelic/go-agent/v3/newrelic" "gorm.io/gorm" ) @@ -81,14 +80,6 @@ func init() { if nil != err { ssas.Logger.Warnf("New Relic integration is disabled: %s", err) } - env := os.Getenv("DEPLOYMENT_TARGET") - envPath := fmt.Sprintf("/usr/local/configs/%s.env", env) - err = godotenv.Load(envPath) - - if err != nil { - ssas.Logger.Error("Unable to load environment file, exiting.") - os.Exit(-1) - } } diff --git a/ssas/systems.go b/ssas/systems.go index 67884f36..416c5f92 100644 --- a/ssas/systems.go +++ b/ssas/systems.go @@ -17,6 +17,7 @@ import ( "time" "github.com/CMSgov/bcda-ssas-app/ssas/cfg" + "github.com/joho/godotenv" "github.com/pborman/uuid" "gorm.io/gorm" ) @@ -31,6 +32,14 @@ func init() { } func getEnvVars() { + env := os.Getenv("DEPLOYMENT_TARGET") + envPath := fmt.Sprintf("/usr/local/configs/%s.env", env) + err := godotenv.Load(envPath) + + if err != nil { + //ssas.Logger.Error("Unable to load environment file, exiting.") + os.Exit(-1) + } DefaultScope = os.Getenv("SSAS_DEFAULT_SYSTEM_SCOPE") if DefaultScope == "" {