From 1ee0d291ca41ae1d4b11ecaeef8986b6a71f3622 Mon Sep 17 00:00:00 2001 From: sneak Date: Fri, 7 Aug 2026 16:59:56 +0000 Subject: [PATCH] Fix noinlineerr findings: internal/config (refs #61) --- internal/config/config.go | 9 ++++++--- internal/config/config_test.go | 4 +++- internal/config/size.go | 8 ++++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index cabf735..3462bab 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -174,7 +174,8 @@ func Load(path string) (*Config, error) { return nil, fmt.Errorf("failed to marshal config data: %w", err) } - if err := yaml.Unmarshal(yamlBytes, cfg); err != nil { + err = yaml.Unmarshal(yamlBytes, cfg) + if err != nil { return nil, fmt.Errorf("failed to parse config: %w", err) } @@ -221,7 +222,8 @@ func Load(path string) (*Config, error) { } // Check config file permissions (warn if world or group readable) - if info, err := os.Stat(path); err == nil { + info, err := os.Stat(path) + if err == nil { mode := info.Mode().Perm() if mode&0044 != 0 { // group or world readable log.Warn("Config file has insecure permissions (contains S3 credentials)", @@ -231,7 +233,8 @@ func Load(path string) (*Config, error) { } } - if err := cfg.Validate(); err != nil { + err = cfg.Validate() + if err != nil { return nil, fmt.Errorf("invalid config: %w", err) } diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 08d3bce..4761e0a 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -15,7 +15,9 @@ const ( func TestMain(m *testing.M) { // Set up test environment testConfigPath := filepath.Join("..", "..", "test", "config.yaml") - if absPath, err := filepath.Abs(testConfigPath); err == nil { + + absPath, err := filepath.Abs(testConfigPath) + if err == nil { _ = os.Setenv("VAULTIK_CONFIG", absPath) } diff --git a/internal/config/size.go b/internal/config/size.go index 58dbf73..281e57d 100644 --- a/internal/config/size.go +++ b/internal/config/size.go @@ -18,7 +18,9 @@ type Size int64 func (s *Size) UnmarshalYAML(unmarshal func(any) error) error { // Try to unmarshal as int64 first var intVal int64 - if err := unmarshal(&intVal); err == nil { + + err := unmarshal(&intVal) + if err == nil { *s = Size(intVal) return nil @@ -26,7 +28,9 @@ func (s *Size) UnmarshalYAML(unmarshal func(any) error) error { // Try to unmarshal as string var strVal string - if err := unmarshal(&strVal); err != nil { + + err = unmarshal(&strVal) + if err != nil { return errors.New("size must be a number or string") }