Commit e3aba332 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Fix runtime env values display in devconsole config view.

parent 68c4ffd9

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Upper bound on socket buffer sizes. Flush buffer more than once per message if payload size exceeds buffer size.

- Build with Go 1.14.2 release.



### Fixed

- Ensure runtime environment values do not appear multiple times in the devconsole configuration view.



## [2.11.1] - 2020-03-29

### Changed

- Update protobuf (1.3.5), websocket (1.4.2), opencensus (0.22.3), atomic (1.6.0), zap (1.14.1) dependencies.

server/config.go

+6 −3
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ func ParseArgs(logger *zap.Logger, args []string) Config { 
	// Parse config file if path is set.

	mainConfig := NewConfig(logger)

	runtimeEnvironment := mainConfig.GetRuntime().Environment

	var runtimeEnvironmentList []string

	for _, cfg := range configFilePath.Config {

		data, err := ioutil.ReadFile(cfg)

		if err != nil {
@@ -84,7 +83,6 @@ func ParseArgs(logger *zap.Logger, args []string) Config { 


		// Convert and preserve the runtime environment key-value pairs.

		runtimeEnvironment = convertRuntimeEnv(logger, runtimeEnvironment, mainConfig.GetRuntime().Env)

		runtimeEnvironmentList = append(runtimeEnvironmentList, mainConfig.GetRuntime().Env...)

		logger.Info("Successfully loaded config file", zap.String("path", cfg))

	}

	// Preserve the config file path arguments.
@@ -104,7 +102,12 @@ func ParseArgs(logger *zap.Logger, args []string) Config { 
	}



	mainConfig.GetRuntime().Environment = convertRuntimeEnv(logger, runtimeEnvironment, mainConfig.GetRuntime().Env)

	mainConfig.GetRuntime().Env = append(runtimeEnvironmentList, mainConfig.GetRuntime().Env...)

	mainConfig.GetRuntime().Env = make([]string, 0, len(mainConfig.GetRuntime().Environment))

	for k, v := range mainConfig.GetRuntime().Environment {

		mainConfig.GetRuntime().Env = append(mainConfig.GetRuntime().Env, fmt.Sprintf("%v=%v", k, v))

	}



	logger.Warn("ENVIRONMENT", zap.Any("environment", mainConfig.GetRuntime().Environment), zap.Any("env", mainConfig.GetRuntime().Env))



	return mainConfig

}