Merge pull request #404 from insolar/penv-514

penv-514 removed "-" from env prefixes
insolar · Aug 27, 2020 · 96fb9dc · 96fb9dc
2 parents e7d2efc + a051bc7
commit 96fb9dc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cmd/binance-collector/main.go b/cmd/binance-collector/main.go
@@ -38,7 +38,7 @@ var symbol = flag.String("symbol", "", "token symbol")
 func main() {
 	cfg := &configuration.CollectorBinance{}
 	params := insconfig.Params{
-		EnvPrefix: "binance-collector",
+		EnvPrefix: "binancecollector",
 		ConfigPathGetter: &insconfig.FlagPathGetter{
 			GoFlags: flag.CommandLine,
 		},

diff --git a/cmd/coin-market-cap-collector/main.go b/cmd/coin-market-cap-collector/main.go
@@ -41,7 +41,7 @@ var symbol = flag.String("symbol", "", "symbol for fetching from coin market cap
 func main() {
 	cfg := &configuration.CollectorCoinMarketCap{}
 	params := insconfig.Params{
-		EnvPrefix: "coin-market-cap-collector",
+		EnvPrefix: "coinmarketcapcollector",
 		ConfigPathGetter: &insconfig.FlagPathGetter{
 			GoFlags: flag.CommandLine,
 		},

diff --git a/cmd/stats-collector/main.go b/cmd/stats-collector/main.go
@@ -26,7 +26,7 @@ import (
 func main() {
 	cfg := &configuration.StatsCollector{}
 	params := insconfig.Params{
-		EnvPrefix:        "stats-collector",
+		EnvPrefix:        "statscollector",
 		ConfigPathGetter: &insconfig.DefaultPathGetter{},
 	}
 	insConfigurator := insconfig.New(params)

diff --git a/internal/integration/cli_test.go b/internal/integration/cli_test.go
@@ -58,7 +58,7 @@ func runCommand(cmdName string, args ...string) (string, error) {
 	cmd := exec.Command("./bin/"+cmdName, args...)
 	cmd.Env = append(
 		os.Environ(),
-		strings.ToUpper(cmdName)+"_DB_URL=postgres://"+pgOptions.User+":"+pgOptions.Password+"@"+
+		strings.ToUpper(strings.Replace(cmdName, "-", "", -1))+"_DB_URL=postgres://"+pgOptions.User+":"+pgOptions.Password+"@"+
 			pgOptions.Addr+"/"+pgOptions.Database+"?sslmode=disable",
 	)
 	output, err := cmd.CombinedOutput()