-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20 from isd-sgcu/JOH-37/migrate-to-envs
[JOH-37] Migrate from Config to Envs
- Loading branch information
Showing
13 changed files
with
141 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| APP_PORT=3003 | ||
| APP_ENV=development | ||
|
|
||
| DB_URL=postgres://root:root@localhost:5432/johnjud_db | ||
|
|
||
| SERVICE_FILE=localhost:3004 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ | |
| config.yaml | ||
| .env | ||
| .env.prod | ||
| .env.file | ||
|
|
||
| # idea | ||
| .idea | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| version: "3.9" | ||
|
|
||
| services: | ||
| backend: | ||
| container_name: johnjud-backend | ||
| restart: unless-stopped | ||
| build: . | ||
| ports: | ||
| - 3003:3003 | ||
| environment: | ||
| - APP_PORT=3003 | ||
| - APP_ENV=production | ||
| - DB_URL=postgres://root:root@johnjud-local-db:5432/johnjud_db | ||
| - SERVICE_FILE=localhost:3004 | ||
| networks: | ||
| - johnjud | ||
| local-file: | ||
| image: ghcr.io/isd-sgcu/johnjud-file | ||
| container_name: johnjud-file | ||
| depends_on: | ||
| - local-db | ||
| restart: unless-stopped | ||
| environment: | ||
| - APP_PORT=3004 | ||
| - APP_ENV=production | ||
| - DB_URL=postgres://root:root@johnjud-local-db:5432/johnjud_db | ||
| - BUCKET_ENDPOINT=BUCKET_ENDPOINT | ||
| - BUCKET_ACCESS_KEY=BUCKET_ACCESS_KEY | ||
| - BUCKET_SECRET_KEY=BUCKET_SECRET_KEY | ||
| - BUCKET_NAME=johnjud-pet-images | ||
| - BUCKET_USE_SSL=false | ||
| ports: | ||
| - "3004:3004" | ||
| networks: | ||
| - johnjud | ||
|
|
||
| local-db: | ||
| image: postgres:15.1-alpine3.17 | ||
| container_name: johnjud-local-db | ||
| restart: unless-stopped | ||
| environment: | ||
| POSTGRES_USER: root | ||
| POSTGRES_PASSWORD: root | ||
| POSTGRES_DB: johnjud_db | ||
| volumes: | ||
| - postgres:/var/lib/postgresql/data | ||
| ports: | ||
| - "5432:5432" | ||
| networks: | ||
| - johnjud | ||
|
|
||
| volumes: | ||
| postgres: | ||
| networks: | ||
| johnjud: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,65 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "github.com/pkg/errors" | ||
| "github.com/spf13/viper" | ||
| ) | ||
|
|
||
| type Database struct { | ||
| Host string `mapstructure:"host"` | ||
| Port int `mapstructure:"port"` | ||
| Name string `mapstructure:"name"` | ||
| Username string `mapstructure:"username"` | ||
| Password string `mapstructure:"password"` | ||
| SSL string `mapstructure:"ssl"` | ||
| Url string `mapstructure:"URL"` | ||
| } | ||
|
|
||
| type App struct { | ||
| Port int `mapstructure:"port"` | ||
| Debug bool `mapstructure:"debug"` | ||
| Port int `mapstructure:"PORT"` | ||
| Env string `mapstructure:"ENV"` | ||
| } | ||
|
|
||
| type Service struct { | ||
| File string `mapstructure:"file"` | ||
| File string `mapstructure:"FILE"` | ||
| } | ||
|
|
||
| type Config struct { | ||
| App App `mapstructure:"app"` | ||
| Database Database `mapstructure:"database"` | ||
| Service Service `mapstructure:"service"` | ||
| App App | ||
| Database Database | ||
| Service Service | ||
| } | ||
|
|
||
| func LoadConfig() (config *Config, err error) { | ||
| viper.AddConfigPath("./config") | ||
| viper.SetConfigName("config") | ||
| viper.SetConfigType("yaml") | ||
| func LoadConfig() (*Config, error) { | ||
| dbCfgLdr := viper.New() | ||
| dbCfgLdr.SetEnvPrefix("DB") | ||
| dbCfgLdr.AutomaticEnv() | ||
| dbCfgLdr.AllowEmptyEnv(false) | ||
| dbConfig := Database{} | ||
| if err := dbCfgLdr.Unmarshal(&dbConfig); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| viper.AutomaticEnv() | ||
| appCfgLdr := viper.New() | ||
| appCfgLdr.SetEnvPrefix("APP") | ||
| appCfgLdr.AutomaticEnv() | ||
| dbCfgLdr.AllowEmptyEnv(false) | ||
| appConfig := App{} | ||
| if err := appCfgLdr.Unmarshal(&appConfig); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| err = viper.ReadInConfig() | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "error occurs while reading the config") | ||
| serviceCfgLdr := viper.New() | ||
| serviceCfgLdr.SetEnvPrefix("SERVICE") | ||
| serviceCfgLdr.AutomaticEnv() | ||
| dbCfgLdr.AllowEmptyEnv(false) | ||
| serviceConfig := Service{} | ||
| if err := serviceCfgLdr.Unmarshal(&serviceConfig); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| err = viper.Unmarshal(&config) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "error occurs while unmarshal the config") | ||
| config := &Config{ | ||
| Database: dbConfig, | ||
| App: appConfig, | ||
| Service: serviceConfig, | ||
| } | ||
|
|
||
| return | ||
| return config, nil | ||
| } | ||
|
|
||
| func (ac *App) IsDevelopment() bool { | ||
| return ac.Env == "development" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/bin/sh | ||
|
|
||
| ## Usage: | ||
| ## . ./export-env.sh ; $COMMAND | ||
| ## . ./export-env.sh ; echo ${MINIENTREGA_FECHALIMITE} | ||
|
|
||
| unamestr=$(uname) | ||
| if [ "$unamestr" = 'Linux' ]; then | ||
|
|
||
| export $(grep -v '^#' .env | xargs -d '\n') | ||
|
|
||
| elif [ "$unamestr" = 'FreeBSD' ] || [ "$unamestr" = 'Darwin' ]; then | ||
|
|
||
| export $(grep -v '^#' .env | xargs -0) | ||
|
|
||
| fi |