Skip to content

Commit

Permalink
Remove es
Browse files Browse the repository at this point in the history
Signed-off-by: Rohanraj123 <[email protected]>
  • Loading branch information
Rohanraj123 committed Jan 22, 2025
1 parent 38c618a commit 757b117
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 15 deletions.
4 changes: 1 addition & 3 deletions cmd/jaeger/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion internal/storage/elasticsearch/mapping/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 1 addition & 11 deletions internal/storage/elasticsearch/mapping/command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 757b117

Please sign in to comment.