From a809faf9d9aaaa219dcf1f388ae6dc03d69fff18 Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <github@ysh.us>
Date: Mon, 1 Aug 2022 13:59:36 -0400
Subject: [PATCH] Remove error from tenancy.InitFromViper

Signed-off-by: Yuri Shkuro <github@ysh.us>
---
 cmd/collector/app/flags/flags.go | 6 +-----
 cmd/query/app/flags.go           | 6 +-----
 pkg/tenancy/flags.go             | 4 ++--
 pkg/tenancy/flags_test.go        | 3 +--
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/cmd/collector/app/flags/flags.go b/cmd/collector/app/flags/flags.go
index bc614348fbe..e9a2daf3d2c 100644
--- a/cmd/collector/app/flags/flags.go
+++ b/cmd/collector/app/flags/flags.go
@@ -228,11 +228,7 @@ func (opts *GRPCOptions) initFromViper(v *viper.Viper, logger *zap.Logger, cfg s
 	} else {
 		return fmt.Errorf("failed to parse gRPC TLS options: %w", err)
 	}
-	if tenancy, err := tenancy.InitFromViper(v); err == nil {
-		opts.Tenancy = tenancy
-	} else {
-		return fmt.Errorf("failed to parse Tenancy options: %w", err)
-	}
+	opts.Tenancy = tenancy.InitFromViper(v)
 
 	return nil
 }
diff --git a/cmd/query/app/flags.go b/cmd/query/app/flags.go
index 07dd9392a5d..5187335f4a3 100644
--- a/cmd/query/app/flags.go
+++ b/cmd/query/app/flags.go
@@ -125,11 +125,7 @@ func (qOpts *QueryOptions) InitFromViper(v *viper.Viper, logger *zap.Logger) (*Q
 	} else {
 		qOpts.AdditionalHeaders = headers
 	}
-	if tenancy, err := tenancy.InitFromViper(v); err == nil {
-		qOpts.Tenancy = tenancy
-	} else {
-		return qOpts, fmt.Errorf("failed to parse Tenancy options: %w", err)
-	}
+	qOpts.Tenancy = tenancy.InitFromViper(v)
 	return qOpts, nil
 }
 
diff --git a/pkg/tenancy/flags.go b/pkg/tenancy/flags.go
index cd053c757bc..0a050c4a3ef 100644
--- a/pkg/tenancy/flags.go
+++ b/pkg/tenancy/flags.go
@@ -39,7 +39,7 @@ func AddFlags(flags *flag.FlagSet) {
 }
 
 // InitFromViper creates tenancy.Options populated with values retrieved from Viper.
-func InitFromViper(v *viper.Viper) (Options, error) {
+func InitFromViper(v *viper.Viper) Options {
 	var p Options
 	p.Enabled = v.GetBool(flagTenancyEnabled)
 	p.Header = v.GetString(flagTenancyHeader)
@@ -50,5 +50,5 @@ func InitFromViper(v *viper.Viper) (Options, error) {
 		p.Tenants = []string{}
 	}
 
-	return p, nil
+	return p
 }
diff --git a/pkg/tenancy/flags_test.go b/pkg/tenancy/flags_test.go
index ca794264068..c31240f012d 100644
--- a/pkg/tenancy/flags_test.go
+++ b/pkg/tenancy/flags_test.go
@@ -93,8 +93,7 @@ func TestTenancyFlags(t *testing.T) {
 
 			err := command.ParseFlags(test.cmd)
 			require.NoError(t, err)
-			tenancyCfg, err := InitFromViper(v)
-			require.NoError(t, err)
+			tenancyCfg := InitFromViper(v)
 			assert.Equal(t, test.expected, tenancyCfg)
 		})
 	}