From b950c55ae7ed1a07be7de22c1f2d9cc00a6b6df8 Mon Sep 17 00:00:00 2001
From: Sheetal Singala <ssingala@redhat.com>
Date: Fri, 5 Mar 2021 10:26:35 -0500
Subject: [PATCH] Remove unused NewOptionsFromConfig (#2866)

Signed-off-by: sheetalsingala <ssingala@redhat.com>
---
 plugin/storage/cassandra/factory_test.go | 12 ------------
 plugin/storage/cassandra/options.go      | 16 ----------------
 plugin/storage/es/factory_test.go        | 11 -----------
 plugin/storage/es/options.go             | 16 ----------------
 4 files changed, 55 deletions(-)

diff --git a/plugin/storage/cassandra/factory_test.go b/plugin/storage/cassandra/factory_test.go
index 19b523340fb..cc1b2541252 100644
--- a/plugin/storage/cassandra/factory_test.go
+++ b/plugin/storage/cassandra/factory_test.go
@@ -25,7 +25,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
-	cassCfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
 	"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
@@ -193,14 +192,3 @@ func TestInitFromOptions(t *testing.T) {
 	assert.Equal(t, o.GetPrimary(), f.primaryConfig)
 	assert.Equal(t, o.Get(archiveStorageConfig), f.archiveConfig)
 }
-
-func TestNewOptions(t *testing.T) {
-	primaryCfg := cassCfg.Configuration{Keyspace: "primary"}
-	archiveCfg := cassCfg.Configuration{Keyspace: "archive"}
-	o := NewOptionsFromConfig(primaryCfg, archiveCfg)
-	assert.Equal(t, primaryCfg, o.Primary.Configuration)
-	assert.Equal(t, primaryStorageConfig, o.Primary.namespace)
-	assert.Equal(t, 1, len(o.others))
-	assert.Equal(t, archiveCfg, o.others[archiveStorageConfig].Configuration)
-	assert.Equal(t, archiveStorageConfig, o.others[archiveStorageConfig].namespace)
-}
diff --git a/plugin/storage/cassandra/options.go b/plugin/storage/cassandra/options.go
index ce4dd8dcc1a..3bd8f5e5060 100644
--- a/plugin/storage/cassandra/options.go
+++ b/plugin/storage/cassandra/options.go
@@ -111,22 +111,6 @@ func NewOptions(primaryNamespace string, otherNamespaces ...string) *Options {
 	return options
 }
 
-// NewOptionsFromConfig creates Options from primary and archive config
-func NewOptionsFromConfig(primary config.Configuration, archive config.Configuration) *Options {
-	return &Options{
-		Primary: namespaceConfig{
-			namespace:     primaryStorageConfig,
-			Configuration: primary,
-		},
-		others: map[string]*namespaceConfig{
-			archiveStorageConfig: {
-				namespace:     archiveStorageConfig,
-				Configuration: archive,
-			},
-		},
-	}
-}
-
 // AddFlags adds flags for Options
 func (opt *Options) AddFlags(flagSet *flag.FlagSet) {
 	addFlags(flagSet, opt.Primary)
diff --git a/plugin/storage/es/factory_test.go b/plugin/storage/es/factory_test.go
index 1e31df71bb4..728e203d339 100644
--- a/plugin/storage/es/factory_test.go
+++ b/plugin/storage/es/factory_test.go
@@ -218,14 +218,3 @@ func TestInitFromOptions(t *testing.T) {
 	assert.Equal(t, o.GetPrimary(), f.primaryConfig)
 	assert.Equal(t, o.Get(archiveNamespace), f.archiveConfig)
 }
-
-func TestNewOptions(t *testing.T) {
-	primaryCfg := escfg.Configuration{IndexPrefix: "primary"}
-	archiveCfg := escfg.Configuration{IndexPrefix: "archive"}
-	o := NewOptionsFromConfig(primaryCfg, archiveCfg)
-	assert.Equal(t, primaryCfg, o.Primary.Configuration)
-	assert.Equal(t, primaryNamespace, o.Primary.namespace)
-	assert.Equal(t, 1, len(o.others))
-	assert.Equal(t, archiveCfg, o.others[archiveNamespace].Configuration)
-	assert.Equal(t, archiveNamespace, o.others[archiveNamespace].namespace)
-}
diff --git a/plugin/storage/es/options.go b/plugin/storage/es/options.go
index 103fd6d1715..2dd393396ac 100644
--- a/plugin/storage/es/options.go
+++ b/plugin/storage/es/options.go
@@ -117,22 +117,6 @@ func NewOptions(primaryNamespace string, otherNamespaces ...string) *Options {
 	return options
 }
 
-// NewOptionsFromConfig creates Options from primary and archive config
-func NewOptionsFromConfig(primary config.Configuration, archive config.Configuration) *Options {
-	return &Options{
-		Primary: namespaceConfig{
-			namespace:     primaryNamespace,
-			Configuration: primary,
-		},
-		others: map[string]*namespaceConfig{
-			archiveNamespace: {
-				namespace:     archiveNamespace,
-				Configuration: archive,
-			},
-		},
-	}
-}
-
 func (config *namespaceConfig) getTLSFlagsConfig() tlscfg.ClientFlagsConfig {
 	return tlscfg.ClientFlagsConfig{
 		Prefix:         config.namespace,