diff --git a/server/constants/env.go b/server/constants/env.go index 26eb8bd..4206c37 100644 --- a/server/constants/env.go +++ b/server/constants/env.go @@ -1,5 +1,7 @@ package constants +var VERSION = "0.0.1" + const ( // Envstore identifier // StringStore string store identifier @@ -13,8 +15,6 @@ const ( EnvKeyEnv = "ENV" // EnvKeyEnvPath key for cli arg variable ENV_PATH EnvKeyEnvPath = "ENV_PATH" - // EnvKeyVersion key for build arg version - EnvKeyVersion = "VERSION" // EnvKeyAuthorizerURL key for env variable AUTHORIZER_URL // TODO: remove support AUTHORIZER_URL env EnvKeyAuthorizerURL = "AUTHORIZER_URL" diff --git a/server/main.go b/server/main.go index 4af8299..9a21b29 100644 --- a/server/main.go +++ b/server/main.go @@ -21,7 +21,8 @@ func main() { envstore.ARG_ENV_FILE = flag.String("env_file", "", "Env file path") flag.Parse() - envstore.EnvStoreObj.UpdateEnvVariable(constants.StringStoreIdentifier, constants.EnvKeyVersion, VERSION) + log.Println("=> version:", VERSION) + constants.VERSION = VERSION // initialize required envs (mainly db & env file path) err := env.InitRequiredEnv() diff --git a/server/test/resolvers_test.go b/server/test/resolvers_test.go index f47e034..bc8eedc 100644 --- a/server/test/resolvers_test.go +++ b/server/test/resolvers_test.go @@ -15,7 +15,7 @@ func TestResolvers(t *testing.T) { // constants.DbTypeArangodb: "http://localhost:8529", // constants.DbTypeMongodb: "mongodb://localhost:27017", } - envstore.EnvStoreObj.UpdateEnvVariable(constants.StringStoreIdentifier, constants.EnvKeyVersion, "test") + for dbType, dbURL := range databases { s := testSetup() envstore.EnvStoreObj.UpdateEnvVariable(constants.StringStoreIdentifier, constants.EnvKeyDatabaseURL, dbURL) diff --git a/server/utils/meta.go b/server/utils/meta.go index 916e3f1..bf33250 100644 --- a/server/utils/meta.go +++ b/server/utils/meta.go @@ -9,7 +9,7 @@ import ( // GetMeta helps in getting the meta data about the deployment from EnvData func GetMetaInfo() model.Meta { return model.Meta{ - Version: envstore.EnvStoreObj.GetStringStoreEnvVariable(constants.EnvKeyVersion), + Version: constants.VERSION, ClientID: envstore.EnvStoreObj.GetStringStoreEnvVariable(constants.EnvKeyClientID), IsGoogleLoginEnabled: envstore.EnvStoreObj.GetStringStoreEnvVariable(constants.EnvKeyGoogleClientID) != "" && envstore.EnvStoreObj.GetStringStoreEnvVariable(constants.EnvKeyGoogleClientSecret) != "", IsGithubLoginEnabled: envstore.EnvStoreObj.GetStringStoreEnvVariable(constants.EnvKeyGithubClientID) != "" && envstore.EnvStoreObj.GetStringStoreEnvVariable(constants.EnvKeyGithubClientSecret) != "",