From 5aff8cd4591ccc3ec753aea7298001d121646669 Mon Sep 17 00:00:00 2001 From: Ludovic Pourrat Date: Wed, 11 Oct 2023 15:47:43 +0200 Subject: [PATCH] Providing Kong admin token via file #4789 Feedback from PR review. --- internal/manager/config.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/internal/manager/config.go b/internal/manager/config.go index 60bf8c658e..e1e4a0bf96 100644 --- a/internal/manager/config.go +++ b/internal/manager/config.go @@ -287,15 +287,14 @@ func (c *Config) FlagSet() *pflag.FlagSet { return flagSet } +// Resolve the Config item(s) value from file, when provided. func (c *Config) Resolve() error { - if c.KongAdminToken == "" { - if c.KongAdminTokenPath != "" { - token, err := os.ReadFile(c.KongAdminTokenPath) - if err != nil { - return fmt.Errorf("failed to read --kong-admin-token-file from path '%s': %w", c.KongAdminTokenPath, err) - } - c.KongAdminToken = string(token) + if c.KongAdminTokenPath != "" { + token, err := os.ReadFile(c.KongAdminTokenPath) + if err != nil { + return fmt.Errorf("failed to read --kong-admin-token-file from path '%s': %w", c.KongAdminTokenPath, err) } + c.KongAdminToken = string(token) } return nil }