Skip to content

Commit

Permalink
[Jasoet] Change Config Mechanism
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasoet
jasoet committed Aug 15, 2019
1 parent 8cc23d8 commit 1983073
Show file tree
Hide file tree
Showing 24 changed files with 247 additions and 360 deletions.
1 change: 1 addition & 0 deletions .env.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ export PROCTOR_MAIL_SERVER_PORT=123
export PROCTOR_JOB_POD_ANNOTATIONS={\"key.one\":\"true\"}
export PROCTOR_SENTRY_DSN=foo
export PROCTOR_DOCS_PATH=/path/to/docs/dir
export PROCTOR_AUTH_PLUGIN_BINARY=
export PROCTOR_AUTH_PLUGIN_EXPORTED=Auth
6 changes: 3 additions & 3 deletions internal/app/service/execution/handler/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ type executionHTTPHandler struct {
}

var upgrader = websocket.Upgrader{
ReadBufferSize: config.LogsStreamReadBufferSize(),
WriteBufferSize: config.LogsStreamWriteBufferSize(),
ReadBufferSize: config.Config().LogsStreamReadBufferSize,
WriteBufferSize: config.Config().LogsStreamWriteBufferSize,
}

func NewExecutionHTTPHandler(
Expand Down Expand Up @@ -91,7 +91,7 @@ func (httpHandler *executionHTTPHandler) GetLogs() http.HandlerFunc {

if context.Status == executionStatus.Created {
logger.Debug("Execution is Created, Stream output from pod")
waitTime := config.KubeLogProcessWaitTime() * time.Second
waitTime := config.Config().KubeLogProcessWaitTime * time.Second
podLog, _err := httpHandler.service.StreamJobLogs(context.Name, waitTime)

logger.LogErrors(_err, "stream job log by execution name", context.Name)
Expand Down
2 changes: 1 addition & 1 deletion internal/app/service/execution/service/execution.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (service *executionService) update(executionContext model.ExecutionContext)
func (service *executionService) watchProcess(context model.ExecutionContext) {
logger.Info("Start Watch Process for Job With Context ID: ", context.ExecutionID, ", name: ", context.Name, ", and Status: "+context.Status)

waitTime := config.KubeLogProcessWaitTime() * time.Second
waitTime := config.Config().KubeLogProcessWaitTime * time.Second
err := service.kubernetesClient.WaitForReadyJob(context.Name, waitTime)

if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/app/service/execution/service/execution_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (suite *TestExecutionIntegrationSuite) TestStreamLogsSuccess() {
executedJobname, err := suite.kubernetesClient.ExecuteJobWithCommand(sampleImageName, envVarsForContainer, []string{"echo", "Bimo Horizon"})
assert.NoError(t, err)

waitTime := config.KubePodsListWaitTime() * time.Second
waitTime := config.Config().KubePodsListWaitTime * time.Second
logStream, err := suite.service.StreamJobLogs(executedJobname, waitTime)
assert.NoError(t, err)

Expand Down
255 changes: 109 additions & 146 deletions internal/app/service/infra/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,173 +4,136 @@ import (
"encoding/json"
"fmt"
"github.com/spf13/viper"
"sync"
"time"
)

func init() {
viper.AutomaticEnv()
viper.SetEnvPrefix("PROCTOR")
func GetStringDefault(viper *viper.Viper, key string, defaultValue string) string {
viper.SetDefault(key, defaultValue)
return viper.GetString(key)
}

func KubeConfig() string {
return viper.GetString("KUBE_CONFIG")
func GetInt64Ref(viper *viper.Viper, key string) *int64 {
value := viper.GetInt64(key)
return &value
}

func KubeContext() string {
viper.SetDefault("KUBE_CONTEXT", "default")
return viper.GetString("KUBE_CONTEXT")
func GetInt32Ref(viper *viper.Viper, key string) *int32 {
value := viper.GetInt32(key)
return &value
}

func LogLevel() string {
return viper.GetString("LOG_LEVEL")
}

func AppPort() string {
return viper.GetString("APP_PORT")
}

func DefaultNamespace() string {
return viper.GetString("DEFAULT_NAMESPACE")
}

func RedisAddress() string {
return viper.GetString("REDIS_ADDRESS")
}

//TODO remove
func KubeClusterHostName() string {
return viper.GetString("KUBE_CLUSTER_HOST_NAME")
}

//TODO Should Not be Used since we use ~/.kube/config
func KubeCACertEncoded() string {
return viper.GetString("KUBE_CA_CERT_ENCODED")
}

//TODO remove
func KubeBasicAuthEncoded() string {
return viper.GetString("KUBE_BASIC_AUTH_ENCODED")
}

func RedisMaxActiveConnections() int {
return viper.GetInt("REDIS_MAX_ACTIVE_CONNECTIONS")
}

func LogsStreamReadBufferSize() int {
return viper.GetInt("LOGS_STREAM_READ_BUFFER_SIZE")
}

func LogsStreamWriteBufferSize() int {
return viper.GetInt("LOGS_STREAM_WRITE_BUFFER_SIZE")
}

//TODO test
func KubePodsListWaitTime() time.Duration {
return time.Duration(viper.GetInt("KUBE_POD_LIST_WAIT_TIME"))
}

//TODO test
func KubeLogProcessWaitTime() time.Duration {
return time.Duration(viper.GetInt("KUBE_LOG_PROCESS_WAIT_TIME"))
}

func KubeJobActiveDeadlineSeconds() *int64 {
kubeJobActiveDeadlineSeconds := viper.GetInt64("KUBE_JOB_ACTIVE_DEADLINE_SECONDS")
return &kubeJobActiveDeadlineSeconds
}

func KubeJobRetries() *int32 {
kubeJobRetries := int32(viper.GetInt("KUBE_JOB_RETRIES"))
return &kubeJobRetries
}

func PostgresUser() string {
return viper.GetString("POSTGRES_USER")
}

func PostgresPassword() string {
return viper.GetString("POSTGRES_PASSWORD")
}

func PostgresHost() string {
return viper.GetString("POSTGRES_HOST")
}

func PostgresPort() int {
return viper.GetInt("POSTGRES_PORT")
}

func PostgresDatabase() string {
return viper.GetString("POSTGRES_DATABASE")
}

func PostgresMaxConnections() int {
return viper.GetInt("POSTGRES_MAX_CONNECTIONS")
}

func PostgresConnectionMaxLifetime() int {
return viper.GetInt("POSTGRES_CONNECTIONS_MAX_LIFETIME")
}

func NewRelicAppName() string {
return viper.GetString("NEW_RELIC_APP_NAME")
}

func NewRelicLicenceKey() string {
return viper.GetString("NEW_RELIC_LICENCE_KEY")
}

func MinClientVersion() string {
return viper.GetString("MIN_CLIENT_VERSION")
}

func ScheduledJobsFetchIntervalInMins() int {
return viper.GetInt("SCHEDULED_JOBS_FETCH_INTERVAL_IN_MINS")
}

func MailUsername() string {
return viper.GetString("MAIL_USERNAME")
}

func MailPassword() string {
return viper.GetString("MAIL_PASSWORD")
}

func MailServerHost() string {
return viper.GetString("MAIL_SERVER_HOST")
}

func MailServerPort() string {
return viper.GetString("MAIL_SERVER_PORT")
}

func JobPodAnnotations() map[string]string {
var jsonStr = []byte(viper.GetString("JOB_POD_ANNOTATIONS"))
func GetMapFromJson(viper *viper.Viper, key string) map[string]string {
var jsonStr = []byte(viper.GetString(key))
var annotations map[string]string

err := json.Unmarshal(jsonStr, &annotations)
if err != nil {
_ = fmt.Errorf(err.Error(), "Invalid value for key PROCTOR_JOB_POD_ANNOTATIONS")
_ = fmt.Errorf("invalid Value for key %s, errors %v", key, err.Error())
}

return annotations
}

func SentryDSN() string {
return viper.GetString("SENTRY_DSN")
}
var once sync.Once
var config ProctorConfig

type ProctorConfig struct {
viper *viper.Viper
KubeConfig string
KubeContext string
LogLevel string
AppPort string
DefaultNamespace string
RedisAddress string
LogsStreamReadBufferSize int
RedisMaxActiveConnections int
LogsStreamWriteBufferSize int
KubePodsListWaitTime time.Duration
KubeLogProcessWaitTime time.Duration
KubeJobActiveDeadlineSeconds *int64
KubeJobRetries *int32
PostgresUser string
PostgresPassword string
PostgresHost string
PostgresPort int
AuthPluginExported string
PostgresDatabase string
PostgresMaxConnections int
PostgresConnectionMaxLifetime int
NewRelicAppName string
NewRelicLicenceKey string
MinClientVersion string
ScheduledJobsFetchIntervalInMins int
MailUsername string
MailServerHost string
MailPassword string
MailServerPort string
JobPodAnnotations map[string]string
SentryDSN string
DocsPath string
AuthPluginBinary string
}

func Load() ProctorConfig {
fang := viper.New()
fang.AutomaticEnv()
fang.SetEnvPrefix("PROCTOR")
proctorConfig := ProctorConfig{
viper: fang,
KubeConfig: fang.GetString("KUBE_CONFIG"),
KubeContext: GetStringDefault(fang, "KUBE_CONTEXT", "default"),
LogLevel: GetStringDefault(fang, "LOG_LEVEL", "DEBUG"),
AppPort: GetStringDefault(fang, "APP_PORT", "5001"),
DefaultNamespace: fang.GetString("DEFAULT_NAMESPACE"),
RedisAddress: fang.GetString("REDIS_ADDRESS"),
RedisMaxActiveConnections: fang.GetInt("REDIS_MAX_ACTIVE_CONNECTIONS"),
LogsStreamReadBufferSize: fang.GetInt("LOGS_STREAM_READ_BUFFER_SIZE"),
LogsStreamWriteBufferSize: fang.GetInt("LOGS_STREAM_WRITE_BUFFER_SIZE"),
KubePodsListWaitTime: time.Duration(fang.GetInt("KUBE_POD_LIST_WAIT_TIME")),
KubeLogProcessWaitTime: time.Duration(fang.GetInt("KUBE_LOG_PROCESS_WAIT_TIME")),
KubeJobActiveDeadlineSeconds: GetInt64Ref(fang, "KUBE_JOB_ACTIVE_DEADLINE_SECONDS"),
KubeJobRetries: GetInt32Ref(fang, "KUBE_JOB_RETRIES"),
PostgresUser: fang.GetString("POSTGRES_USER"),
PostgresPassword: fang.GetString("POSTGRES_PASSWORD"),
PostgresHost: fang.GetString("POSTGRES_HOST"),
PostgresPort: fang.GetInt("POSTGRES_PORT"),
PostgresDatabase: fang.GetString("POSTGRES_DATABASE"),
PostgresMaxConnections: fang.GetInt("POSTGRES_MAX_CONNECTIONS"),
PostgresConnectionMaxLifetime: fang.GetInt("POSTGRES_CONNECTIONS_MAX_LIFETIME"),
NewRelicAppName: fang.GetString("NEW_RELIC_APP_NAME"),
NewRelicLicenceKey: fang.GetString("NEW_RELIC_LICENCE_KEY"),
MinClientVersion: fang.GetString("MIN_CLIENT_VERSION"),
ScheduledJobsFetchIntervalInMins: fang.GetInt("SCHEDULED_JOBS_FETCH_INTERVAL_IN_MINS"),
MailUsername: fang.GetString("MAIL_USERNAME"),
MailServerHost: fang.GetString("MAIL_SERVER_HOST"),
MailPassword: fang.GetString("MAIL_PASSWORD"),
MailServerPort: fang.GetString("MAIL_SERVER_PORT"),
JobPodAnnotations: GetMapFromJson(fang, "JOB_POD_ANNOTATIONS"),
SentryDSN: fang.GetString("SENTRY_DSN"),
DocsPath: fang.GetString("DOCS_PATH"),
AuthPluginBinary: fang.GetString("AUTH_PLUGIN_BINARY"),
AuthPluginExported: GetStringDefault(fang, "AUTH_PLUGIN_EXPORTED", "Auth"),
}

func DocsPath() string {
return viper.GetString("DOCS_PATH")
return proctorConfig
}

//TODO test
func AuthPluginBinary() string {
return viper.GetString("AUTH_PLUGIN_BINARY")
var reset = false

func Reset() {
reset = true
}

//TODO test
func AuthPluginExported() string {
viper.SetDefault("AUTH_PLUGIN_EXPORTED", "Auth")
return viper.GetString("AUTH_PLUGIN_EXPORTED")
func Config() ProctorConfig {
once.Do(func() {
config = Load()
})

if reset {
config = Load()
reset = false
}

return config
}
Loading

0 comments on commit 1983073

Please sign in to comment.