[refactor] Consolidate esmapping-generator code

Signed-off-by: Yuri Shkuro <[email protected]>
jaegertracing · Feb 2, 2025 · a414830 · a414830
1 parent d3ceb01
commit a414830
Show file tree

Hide file tree

Showing 12 changed files with 278 additions and 351 deletions.
diff --git a/cmd/esmapping-generator/app/renderer/render.go b/cmd/esmapping-generator/app/renderer/render.go
diff --git a/cmd/esmapping-generator/app/renderer/render_test.go b/cmd/esmapping-generator/app/renderer/render_test.go
diff --git a/cmd/esmapping-generator/generator/esmapping_generator.go b/cmd/esmapping-generator/generator/esmapping_generator.go
diff --git a/cmd/esmapping-generator/generator/esmapping_generator_test.go b/cmd/esmapping-generator/generator/esmapping_generator_test.go
diff --git a/cmd/esmapping-generator/main.go b/cmd/esmapping-generator/main.go
@@ -7,12 +7,12 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/jaegertracing/jaeger/internal/storage/elasticsearch/mapping"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/mappings"
 	"github.com/jaegertracing/jaeger/pkg/version"
 )
 
 func main() {
-	esmappingsCmd := mapping.Command()
+	esmappingsCmd := mappings.Command()
 	esmappingsCmd.AddCommand(version.Command())
 
 	if err := esmappingsCmd.Execute(); err != nil {

diff --git a/cmd/jaeger/main.go b/cmd/jaeger/main.go
@@ -13,7 +13,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/internal/docs"
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal"
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/features"
-	"github.com/jaegertracing/jaeger/internal/storage/elasticsearch/mapping"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/mappings"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/version"
 )
@@ -24,7 +24,7 @@ func main() {
 	command.AddCommand(version.Command())
 	command.AddCommand(docs.Command(v))
 	command.AddCommand(featuresCommand())
-	command.AddCommand(mapping.Command())
+	command.AddCommand(mappings.Command())
 	config.AddFlags(
 		v,
 		command,

diff --git a/internal/storage/elasticsearch/mapping/command.go b/internal/storage/elasticsearch/mapping/command.go
diff --git a/internal/storage/elasticsearch/mapping/command_test.go b/internal/storage/elasticsearch/mapping/command_test.go