From 7033240000735e47d4b77c0981e04d6c24bc49e6 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 18 Feb 2024 10:55:15 +0100 Subject: [PATCH] internal/config/cli.go: Rename Config.ReadCliFlags to ovverideCliFlags and make it a function instead of method. --- internal/config/builder.go | 2 +- internal/config/cli.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/config/builder.go b/internal/config/builder.go index 0090cc2..b9c0e75 100644 --- a/internal/config/builder.go +++ b/internal/config/builder.go @@ -93,7 +93,7 @@ func (b *Builder) Build() (*Config, error) { // Call custom handler. if b.flags != nil { - if err := conf.ReadCliFlags(b.flags); err != nil { + if err := overrideCliFlags(&conf, b.flags); err != nil { return nil, err } } diff --git a/internal/config/cli.go b/internal/config/cli.go index d5bb6ed..b56f6a0 100644 --- a/internal/config/cli.go +++ b/internal/config/cli.go @@ -6,8 +6,7 @@ import ( "github.com/spf13/pflag" ) -// Read cli flag values into the config -func (cfg *Config) ReadCliFlags(flags *pflag.FlagSet) error { +func overrideCliFlags(cfg *Config, flags *pflag.FlagSet) error { logFile, _ := flags.GetString("log") if len(logFile) > 0 { cfg.Log.Directory = path.Dir(logFile)