nhyatt/mutating-webhook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configuration is now more dynamic.

Browse Source
This commit is contained in:
Hyatt 2022-10-10 14:12:41 -05:00
parent 9881d35bce
commit 0ea59c1f23
Signed by: nhyatt
GPG Key ID: C50D0BBB5BC40BEA
3 changed files with 71 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/webhook/main.go
View File

@ -22,9 +22,10 @@ func main() {
log.Println("[DEBUG] shutdown sequence complete") log.Println("[DEBUG] shutdown sequence complete")
}() }()
// initialize application configuration
initialize.Init() initialize.Init()
//go httpServer(config.WebSrvIP, config.WebSrvPort) //go httpServer(cfg.WebSrvIP, cfg.WebSrvPort)
forever() forever()
} }

54
internal/config/config.go
View File

@ -2,6 +2,11 @@ package config
import ( import (
"fmt" "fmt"
"log"
"mutating-webhook/internal/envconfig"
"os"
"reflect"
"strconv"
"time" "time"
"github.com/hashicorp/logutils" "github.com/hashicorp/logutils"
@ -10,8 +15,9 @@ import (
type Config struct { type Config struct {
// time configuration // time configuration
TimeFormat string `env:"TIME_FORMAT" default:"2006-01-02 15:04:05"` TimeFormat string `env:"TIME_FORMAT" default:"2006-01-02 15:04:05"`
TimeZoneLocal *time.Location TimeZoneLocal string `env:"TIME_ZONE" default:"America/Chicago"`
TimeZoneUTC *time.Location TZoneLocal *time.Location
TZoneUTC *time.Location
// logging // logging
LogLevel int `env:"LOG_LEVEL" default:"50"` LogLevel int `env:"LOG_LEVEL" default:"50"`
@ -25,10 +31,13 @@ type Config struct {
WebServerIdleTimeout int `env:"WEBSERVER_IDLE_TIMEOUT" default:"2"` WebServerIdleTimeout int `env:"WEBSERVER_IDLE_TIMEOUT" default:"2"`
} }
func NewConfig() (*Config, error) { func DefaultConfig() *Config {
cfg := &Config{} return &Config{
Log: &logutils.LevelFilter{
return cfg, nil Levels: []logutils.LogLevel{"TRACE", "DEBUG", "INFO", "WARNING", "ERROR"},
Writer: os.Stderr,
},
}
} }
func (cfg *Config) Validate() error { func (cfg *Config) Validate() error {
@ -53,3 +62,36 @@ func (cfg *Config) Validate() error {
return nil return nil
} }
func (cfg *Config) SetLogLevel() {
switch {
case cfg.LogLevel <= 20:
cfg.Log.SetMinLevel(logutils.LogLevel("ERROR"))
case cfg.LogLevel > 20 && cfg.LogLevel <= 40:
cfg.Log.SetMinLevel(logutils.LogLevel("WARNING"))
case cfg.LogLevel > 40 && cfg.LogLevel <= 60:
cfg.Log.SetMinLevel(logutils.LogLevel("INFO"))
case cfg.LogLevel > 60 && cfg.LogLevel <= 80:
cfg.Log.SetMinLevel(logutils.LogLevel("DEBUG"))
case cfg.LogLevel > 80:
cfg.Log.SetMinLevel(logutils.LogLevel("TRACE"))
}
log.SetOutput(cfg.Log)
}
func (cfg *Config) PrintRunningConfig(cfgInfo []envconfig.StructInfo) {
log.Printf("[DEBUG] Current Running Configuration Values:")
for _, info := range cfgInfo {
switch info.Type.String() {
case "string":
p := reflect.ValueOf(cfg).Elem().FieldByName(info.Name).Addr().Interface().(*string)
log.Printf("[DEBUG]\t%s\t\t= %s\n", info.Alt, *p)
case "bool":
p := reflect.ValueOf(cfg).Elem().FieldByName(info.Name).Addr().Interface().(*bool)
log.Printf("[DEBUG]\t%s\t\t= %s\n", info.Alt, strconv.FormatBool(*p))
case "int":
p := reflect.ValueOf(cfg).Elem().FieldByName(info.Name).Addr().Interface().(*int)
log.Printf("[DEBUG]\t%s\t\t= %s\n", info.Alt, strconv.FormatInt(int64(*p), 10))
}
}
}

104
internal/initialize/initialize.go
View File

@ -6,6 +6,7 @@ import (
"os" "os"
"reflect" "reflect"
"strconv" "strconv"
"time"
"mutating-webhook/internal/config" "mutating-webhook/internal/config"
"mutating-webhook/internal/envconfig" "mutating-webhook/internal/envconfig"
@ -58,35 +59,8 @@ func getEnvBool(env string, def bool) bool {
return retVal return retVal
} }
/* func Init() *config.Config {
func setLogLevel(l int) { cfg := config.DefaultConfig()
switch {
case l <= 20:
config.Log.SetMinLevel(logutils.LogLevel("ERROR"))
case l > 20 && l <= 40:
config.Log.SetMinLevel(logutils.LogLevel("WARNING"))
case l > 40 && l <= 60:
config.Log.SetMinLevel(logutils.LogLevel("INFO"))
case l > 60 && l <= 80:
config.Log.SetMinLevel(logutils.LogLevel("DEBUG"))
case l > 80:
config.Log.SetMinLevel(logutils.LogLevel("TRACE"))
}
}
*/
func Init() {
/*
var (
tz string
err error
)
*/
cfg, err := config.NewConfig()
if err != nil {
log.Fatalf("[FATAL] Unable to initialize.")
}
cfgInfo, err := envconfig.GetStructInfo(cfg) cfgInfo, err := envconfig.GetStructInfo(cfg)
if err != nil { if err != nil {
@ -123,64 +97,28 @@ func Init() {
} }
flag.Parse() flag.Parse()
// set logging level
cfg.SetLogLevel()
//
if err = cfg.Validate(); err != nil { if err = cfg.Validate(); err != nil {
log.Fatalf("[FATAL] %v", err) log.Fatalf("[FATAL] %v", err)
} }
/* // timezone & format configuration
// log configuration cfg.TZoneUTC, _ = time.LoadLocation("UTC")
flag.IntVar(&config.LogLevel, if err != nil {
"log", log.Fatalf("[ERROR] Unable to parse timezone string. Please use one of the timezone database values listed here: %s", "https://en.wikipedia.org/wiki/List_of_tz_database_time_zones")
getEnvInt("LOG_LEVEL", 50), }
"(LOG_LEVEL)\nlog level") cfg.TZoneLocal, err = time.LoadLocation(cfg.TimeZoneLocal)
// local webserver configuration if err != nil {
flag.IntVar(&config.WebSrvPort, log.Fatalf("[ERROR] Unable to parse timezone string. Please use one of the timezone database values listed here: %s", "https://en.wikipedia.org/wiki/List_of_tz_database_time_zones")
"http-port", }
getEnvInt("HTTP_PORT", 8080), time.Now().Format(cfg.TimeFormat)
"(HTTP_PORT)\nlisten port for internal webserver")
flag.StringVar(&config.WebSrvIP,
"http-ip",
getEnvString("HTTP_IP", ""),
"(HTTP_IP)\nlisten ip for internal webserver")
flag.IntVar(&config.WebSrvReadTimeout,
"http-read-timeout",
getEnvInt("HTTP_READ_TIMEOUT", 5),
"(HTTP_READ_TIMEOUT)\ninternal http server read timeout in seconds")
flag.IntVar(&config.WebSrvWriteTimeout,
"http-write-timeout",
getEnvInt("HTTP_WRITE_TIMEOUT", 2),
"(HTTP_WRITE_TIMEOUT\ninternal http server write timeout in seconds")
flag.IntVar(&config.WebSrvIdleTimeout,
"http-idle-timeout",
getEnvInt("HTTP_IDLE_TIMEOUT", 2),
"(HTTP_IDLE_TIMEOUT)\ninternal http server idle timeout in seconds")
// timezone
flag.StringVar(&tz,
"timezone",
getEnvString("TZ", "America/Chicago"),
"(TZ)\ntimezone")
// read command line options
flag.Parse()
// logging level // print running config
setLogLevel(config.LogLevel) cfg.PrintRunningConfig(cfgInfo)
log.SetOutput(config.Log)
// timezone configuration log.Println("[INFO] initialization complete")
config.TimeZoneUTC, _ = time.LoadLocation("UTC") return cfg
if config.TimeZoneLocal, err = time.LoadLocation(tz); err != nil {
log.Fatalf("[ERROR] Unable to parse timezone string. Please use one of the timezone database values listed here: %s", "https://en.wikipedia.org/wiki/List_of_tz_database_time_zones")
}
// print current configuration
log.Printf("[DEBUG] configuration value set: LOG_LEVEL = %s\n", strconv.Itoa(config.LogLevel))
log.Printf("[DEBUG] configuration value set: HTTP_PORT = %s\n", strconv.Itoa(config.WebSrvPort))
log.Printf("[DEBUG] configuration value set: HTTP_IP = %s\n", config.WebSrvIP)
log.Printf("[DEBUG] configuration value set: HTTP_READ_TIMEOUT = %s\n", strconv.Itoa(config.WebSrvReadTimeout))
log.Printf("[DEBUG] configuration value set: HTTP_WRITE_TIMEOUT = %s\n", strconv.Itoa(config.WebSrvWriteTimeout))
log.Printf("[DEBUG] configuration value set: HTTP_IDLE_TIMEOUT = %s\n", strconv.Itoa(config.WebSrvIdleTimeout))
log.Printf("[DEBUG] configuration value set: TZ = %s\n", tz)
log.Println("[INFO] initialization complete")
*/
} }