From b07e309627b023f24ac63e8fc1a04552d4e53a55 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 11 Oct 2021 17:04:02 -0700 Subject: [PATCH] fix: ignore empty values while parsing tlsEnabled value --- internal/config/identity/tls/config.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/config/identity/tls/config.go b/internal/config/identity/tls/config.go index bf2d6ddc6..669ee6dbe 100644 --- a/internal/config/identity/tls/config.go +++ b/internal/config/identity/tls/config.go @@ -85,18 +85,21 @@ func Lookup(kvs config.KVS) (Config, error) { if err := config.CheckValidKeys(config.IdentityTLSSubSys, kvs, DefaultKVS); err != nil { return Config{}, err } - insecureSkipVerify, err := config.ParseBool(env.Get(EnvIdentityTLSSkipVerify, kvs.Get(skipVerify))) + cfg := Config{} + var err error + v := env.Get(EnvIdentityTLSEnabled, "") + if v == "" { + return cfg, nil + } + cfg.Enabled, err = config.ParseBool(v) if err != nil { return Config{}, err } - enabled, err := config.ParseBool(env.Get(EnvIdentityTLSEnabled, "")) + cfg.InsecureSkipVerify, err = config.ParseBool(env.Get(EnvIdentityTLSSkipVerify, kvs.Get(skipVerify))) if err != nil { return Config{}, err } - return Config{ - Enabled: enabled, - InsecureSkipVerify: insecureSkipVerify, - }, nil + return cfg, nil } const (