From 72c1eba1a3ee76a26f1d5f48f516b28dfc1cbacf Mon Sep 17 00:00:00 2001 From: dd84ai Date: Sat, 8 Jun 2024 08:22:44 +0200 Subject: [PATCH] refactor: last touches to env vars --- .vscode/settings.example.json | 8 ++++---- app/settings/main.go | 4 ++-- tf/modules/darkbot/main.tf | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.vscode/settings.example.json b/.vscode/settings.example.json index d4b946a..ec9a61f 100644 --- a/.vscode/settings.example.json +++ b/.vscode/settings.example.json @@ -3,8 +3,8 @@ "-v" ], "go.testEnvVars": { - "SCRAPPY_PLAYER_URL": "**********", // Not required for dev env if u use "DEVENV_MOCK_API": "true" - "SCRAPPY_BASE_URL": "**********", // Not required for dev env if u use "DEVENV_MOCK_API": "true" + "SCRAPPY_PLAYER_URL": "**********", // Not required for dev env if u use "DEV_ENV_MOCK_API": "true" + "SCRAPPY_BASE_URL": "**********", // Not required for dev env if u use "DEV_ENV_MOCK_API": "true" // "DARK_TEST_REGENERATE": "false", "DEV_ENV": "true", "DEV_ENV_MOCK_API": "true", @@ -15,8 +15,8 @@ "go.testTimeout": "30000s", "editor.formatOnSave": true, "terminal.integrated.env.linux": { - "SCRAPPY_PLAYER_URL": "**********", // Not required for dev env if u use "DEVENV_MOCK_API": "true" - "SCRAPPY_BASE_URL": "**********", // Not required for dev env if u use "DEVENV_MOCK_API": "true" + "SCRAPPY_PLAYER_URL": "**********", // Not required for dev env if u use "DEV_ENV_MOCK_API": "true" + "SCRAPPY_BASE_URL": "**********", // Not required for dev env if u use "DEV_ENV_MOCK_API": "true" // "DARK_TEST_REGENERATE": "false", "DEV_ENV": "true", "DEV_ENV_MOCK_API": "true", diff --git a/app/settings/main.go b/app/settings/main.go index 5f2bfd8..ee48d3d 100644 --- a/app/settings/main.go +++ b/app/settings/main.go @@ -58,10 +58,10 @@ func init() { if !Env.DevEnvMockApi { if Env.ScrappyBaseUrl == "" { - logus.Log.Panic("DEVENV_MOCK_API=false, Expected SCRAPPY_BASE_URL env var to be defined") + logus.Log.Panic("DevEnvMockApi=false, Expected SCRAPPY_BASE_URL env var to be defined") } if Env.ScrappyPlayerUrl == "" { - logus.Log.Panic("DEVENV_MOCK_API=false, Expected SCRAPPY_PLAYER_URL env var to be defined") + logus.Log.Panic("DevEnvMockApi=false, Expected SCRAPPY_PLAYER_URL env var to be defined") } } } diff --git a/tf/modules/darkbot/main.tf b/tf/modules/darkbot/main.tf index 5311a62..17b818a 100644 --- a/tf/modules/darkbot/main.tf +++ b/tf/modules/darkbot/main.tf @@ -11,7 +11,7 @@ locals { CONSOLER_PREFIX = "${var.consoler_prefix}" SCRAPPY_LOOP_DELAY = "60" VIEWER_LOOP_DELAY = "10" - DEVENV_MOCK_API = "false" + DEV_ENV_MOCK_API = "false" DARKBOT_LOG_LEVEL = "${var.debug ? "DEBUG" : "WARN"}" } }