From 757b1172ffa9ce817a04638e832e7bdf1907d5fb Mon Sep 17 00:00:00 2001 From: Rohanraj123 Date: Wed, 22 Jan 2025 10:32:21 +0530 Subject: [PATCH] Remove es Signed-off-by: Rohanraj123 --- cmd/jaeger/main.go | 4 +--- internal/storage/elasticsearch/mapping/command.go | 3 ++- .../storage/elasticsearch/mapping/command_test.go | 12 +----------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/cmd/jaeger/main.go b/cmd/jaeger/main.go index dff4550cb43..30a50ebdf54 100644 --- a/cmd/jaeger/main.go +++ b/cmd/jaeger/main.go @@ -8,7 +8,6 @@ import ( "github.com/spf13/viper" - "github.com/jaegertracing/jaeger/cmd/esmapping-generator/app" "github.com/jaegertracing/jaeger/cmd/internal/docs" "github.com/jaegertracing/jaeger/cmd/jaeger/internal" "github.com/jaegertracing/jaeger/internal/storage/elasticsearch/mapping" @@ -18,11 +17,10 @@ import ( func main() { v := viper.New() - options := app.Options{} command := internal.Command() command.AddCommand(version.Command()) command.AddCommand(docs.Command(v)) - command.AddCommand(mapping.Command(options)) + command.AddCommand(mapping.Command()) config.AddFlags( v, command, diff --git a/internal/storage/elasticsearch/mapping/command.go b/internal/storage/elasticsearch/mapping/command.go index 013f85eaa5d..c0f8bcd89bb 100644 --- a/internal/storage/elasticsearch/mapping/command.go +++ b/internal/storage/elasticsearch/mapping/command.go @@ -13,7 +13,8 @@ import ( "github.com/jaegertracing/jaeger/cmd/esmapping-generator/generator" ) -func Command(options app.Options) *cobra.Command { +func Command() *cobra.Command { + options := app.Options{} command := &cobra.Command{ Use: "elasticsearch-mappings", Short: "Jaeger esmapping-generator prints rendered mappings as string", diff --git a/internal/storage/elasticsearch/mapping/command_test.go b/internal/storage/elasticsearch/mapping/command_test.go index 0fb6d010abb..ce45fe2cceb 100644 --- a/internal/storage/elasticsearch/mapping/command_test.go +++ b/internal/storage/elasticsearch/mapping/command_test.go @@ -10,21 +10,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/jaegertracing/jaeger/cmd/esmapping-generator/app" "github.com/jaegertracing/jaeger/pkg/testutils" ) func TestCommandExecute(t *testing.T) { - o := app.Options{ - Mapping: "jaeger-span", - EsVersion: 7, - Shards: 5, - Replicas: 1, - IndexPrefix: "jaeger-index", - UseILM: "false", - ILMPolicyName: "jaeger-ilm-policy", - } - cmd := Command(o) + cmd := Command() // TempFile to capture output tempFile, err := os.CreateTemp("", "command-output-*.txt")