fix(server): standardizing datastore resource names (#2796)

* Standardizing datastore resource names

* Fix datastore test package names

* Move datastore to upper package

* Moving correct folder to root folder

* Rollback unwanted changes in OpenAPI files

* Rolling back one more change

cli/go.mod

@@ -11,7 +11,6 @@ require (
 	github.com/kubeshop/tracetest/server v0.0.0-20230512142545-cb5e526e06f9
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pterm/pterm v0.12.55
-	github.com/segmentio/analytics-go/v3 v3.2.1
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.15.0
@@ -25,7 +24,6 @@ require (
 	atomicgo.dev/cursor v0.1.1 // indirect
 	atomicgo.dev/keyboard v0.2.9 // indirect
 	github.com/benbjohnson/clock v1.3.0 // indirect
-	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

cli/go.sum

@@ -61,8 +61,6 @@ github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkU
 github.com/aws/aws-sdk-go v1.44.196 h1:e3h9M7fpnRHwHOohYmYjgVbcCBvkxKwZiT7fGrxRn28=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/brianvoe/gofakeit/v6 v6.17.0 h1:obbQTJeHfktJtiZzq0Q1bEpsNUs+yHrYlPVWt7BtmJ4=
 github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -292,7 +290,6 @@ github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBO
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/segmentio/analytics-go/v3 v3.2.1 h1:G+f90zxtc1p9G+WigVyTR0xNfOghOGs/PYAlljLOyeg=
-github.com/segmentio/analytics-go/v3 v3.2.1/go.mod h1:p8owAF8X+5o27jmvUognuXxdtqvSGtD0ZrfY2kcS9bE=
 github.com/segmentio/backo-go v1.0.1 h1:68RQccglxZeyURy93ASB/2kc9QudzgIDexJ927N++y4=
 github.com/segmentio/backo-go v1.0.1/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=

server/app/app.go

@@ -16,6 +16,7 @@ import (
 	"github.com/kubeshop/tracetest/server/assertions/comparator"
 	"github.com/kubeshop/tracetest/server/config"
 	"github.com/kubeshop/tracetest/server/config/demoresource"
+	datastore "github.com/kubeshop/tracetest/server/datastore"
 	"github.com/kubeshop/tracetest/server/environment"
 	"github.com/kubeshop/tracetest/server/executor"
 	"github.com/kubeshop/tracetest/server/executor/pollingprofile"
@@ -33,7 +34,6 @@ import (
 	"github.com/kubeshop/tracetest/server/testdb"
 	"github.com/kubeshop/tracetest/server/tests"
 	"github.com/kubeshop/tracetest/server/tracedb"
-	"github.com/kubeshop/tracetest/server/tracedb/datastoreresource"
 	"github.com/kubeshop/tracetest/server/traces"
 	"github.com/kubeshop/tracetest/server/tracing"
 	"go.opentelemetry.io/otel/trace"
@@ -194,7 +194,7 @@ func (app *App) Start(opts ...appOption) error {
 	triggerRegistry := getTriggerRegistry(tracer, applicationTracer)
 
 	pollingProfileRepo := pollingprofile.NewRepository(db)
-	dataStoreRepo := datastoreresource.NewRepository(db)
+	dataStoreRepo := datastore.NewRepository(db)
 	environmentRepo := environment.NewRepository(db)
 	linterRepo := linterResource.NewRepository(db)
 
@@ -339,7 +339,7 @@ func registerSPAHandler(router *mux.Router, cfg httpServerConfig, analyticsEnabl
 		)
 }
 
-func registerOtlpServer(app *App, testDB model.Repository, eventEmitter executor.EventEmitter, dsRepo *datastoreresource.Repository) {
+func registerOtlpServer(app *App, testDB model.Repository, eventEmitter executor.EventEmitter, dsRepo *datastore.Repository) {
 	ingester := otlp.NewIngester(testDB, eventEmitter, dsRepo)
 	grpcOtlpServer := otlp.NewGrpcServer(":4317", ingester)
 	httpOtlpServer := otlp.NewHttpServer(":4318", ingester)
@@ -427,12 +427,12 @@ func registerDemosResource(repository *demoresource.Repository, router *mux.Rout
 	provisioner.AddResourceProvisioner(manager)
 }
 
-func registerDataStoreResource(repository *datastoreresource.Repository, router *mux.Router, db *sql.DB, provisioner *provisioning.Provisioner, tracer trace.Tracer) {
-	manager := resourcemanager.New[datastoreresource.DataStore](
-		datastoreresource.ResourceName,
-		datastoreresource.ResourceNamePlural,
+func registerDataStoreResource(repository *datastore.Repository, router *mux.Router, db *sql.DB, provisioner *provisioning.Provisioner, tracer trace.Tracer) {
+	manager := resourcemanager.New[datastore.DataStore](
+		datastore.ResourceName,
+		datastore.ResourceNamePlural,
 		repository,
-		resourcemanager.WithOperations(datastoreresource.Operations...),
+		resourcemanager.WithOperations(datastore.Operations...),
 		resourcemanager.WithTracer(tracer),
 	)
 	manager.RegisterRoutes(router)

server/app/facade.go

@@ -3,6 +3,7 @@ package app
 import (
 	"context"
 
+	"github.com/kubeshop/tracetest/server/datastore"
 	"github.com/kubeshop/tracetest/server/environment"
 	"github.com/kubeshop/tracetest/server/executor"
 	"github.com/kubeshop/tracetest/server/executor/pollingprofile"
@@ -13,7 +14,6 @@ import (
 	"github.com/kubeshop/tracetest/server/subscription"
 	"github.com/kubeshop/tracetest/server/tests"
 	"github.com/kubeshop/tracetest/server/tracedb"
-	"github.com/kubeshop/tracetest/server/tracedb/datastoreresource"
 	"go.opentelemetry.io/otel/trace"
 )
 
@@ -52,7 +52,7 @@ func (rf runnerFacade) RunAssertions(ctx context.Context, request executor.Asser
 
 func newRunnerFacades(
 	ppRepo *pollingprofile.Repository,
-	dsRepo *datastoreresource.Repository,
+	dsRepo *datastore.Repository,
 	lintRepo *linterResource.Repository,
 	testDB model.Repository,
 	transactions *tests.TransactionsRepository,

server/tracedb/datastoreresource/resource_types.go → server/datastore/datastore_entities.go

@@ -1,4 +1,4 @@
-package datastoreresource
+package datastore
 
 import (
 	"encoding/json"

server/tracedb/datastoreresource/repository.go → server/datastore/datastore_repository.go

@@ -1,4 +1,4 @@
-package datastoreresource
+package datastore
 
 import (
 	"context"

server/tracedb/datastoreresource/repository_test.go → server/datastore/datastore_repository_test.go

@@ -1,15 +1,15 @@
-package datastoreresource_test
+package datastore_test
 
 import (
 	"context"
 	"database/sql"
 	"testing"
 
 	"github.com/gorilla/mux"
+	datastore "github.com/kubeshop/tracetest/server/datastore"
 	"github.com/kubeshop/tracetest/server/pkg/id"
 	"github.com/kubeshop/tracetest/server/resourcemanager"
 	rmtests "github.com/kubeshop/tracetest/server/resourcemanager/testutil"
-	datastore "github.com/kubeshop/tracetest/server/tracedb/datastoreresource"
 	"github.com/stretchr/testify/require"
 )
 

server/tracedb/datastoreresource/main_test.go → server/datastore/main_test.go

@@ -1,4 +1,4 @@
-package datastoreresource_test
+package datastore_test
 
 import (
 	"os"

server/executor/default_poller_executor.go

@@ -5,22 +5,22 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/kubeshop/tracetest/server/datastore"
 	"github.com/kubeshop/tracetest/server/model"
 	"github.com/kubeshop/tracetest/server/model/events"
 	"github.com/kubeshop/tracetest/server/resourcemanager"
 	"github.com/kubeshop/tracetest/server/tracedb"
-	"github.com/kubeshop/tracetest/server/tracedb/datastoreresource"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 )
 
-type traceDBFactoryFn func(ds datastoreresource.DataStore) (tracedb.TraceDB, error)
+type traceDBFactoryFn func(ds datastore.DataStore) (tracedb.TraceDB, error)
 
 type DefaultPollerExecutor struct {
 	ppGetter     PollingProfileGetter
 	updater      RunUpdater
 	newTraceDBFn traceDBFactoryFn
-	dsRepo       resourcemanager.Current[datastoreresource.DataStore]
+	dsRepo       resourcemanager.Current[datastore.DataStore]
 	eventEmitter EventEmitter
 }
 
@@ -66,7 +66,7 @@ func NewPollerExecutor(
 	tracer trace.Tracer,
 	updater RunUpdater,
 	newTraceDBFn traceDBFactoryFn,
-	dsRepo resourcemanager.Current[datastoreresource.DataStore],
+	dsRepo resourcemanager.Current[datastore.DataStore],
 	eventEmitter EventEmitter,
 ) PollerExecutor {
 

server/executor/poller_executor_test.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/kubeshop/tracetest/server/config"
+	"github.com/kubeshop/tracetest/server/datastore"
 	"github.com/kubeshop/tracetest/server/executor"
 	"github.com/kubeshop/tracetest/server/executor/pollingprofile"
 	"github.com/kubeshop/tracetest/server/model"
@@ -14,7 +15,6 @@ import (
 	"github.com/kubeshop/tracetest/server/testdb"
 	"github.com/kubeshop/tracetest/server/tracedb"
 	"github.com/kubeshop/tracetest/server/tracedb/connection"
-	"github.com/kubeshop/tracetest/server/tracedb/datastoreresource"
 	"github.com/kubeshop/tracetest/server/tracing"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -547,8 +547,8 @@ func getRunRepositoryMock(t *testing.T) model.Repository {
 // DataStoreRepository
 type dataStoreRepositoryMock struct{}
 
-func (m *dataStoreRepositoryMock) Current(ctx context.Context) (datastoreresource.DataStore, error) {
-	return datastoreresource.DataStore{Type: datastoreresource.DataStoreTypeOTLP}, nil
+func (m *dataStoreRepositoryMock) Current(ctx context.Context) (datastore.DataStore, error) {
+	return datastore.DataStore{Type: datastore.DataStoreTypeOTLP}, nil
 }
 
 func getDataStoreRepositoryMock(t *testing.T) *dataStoreRepositoryMock {
@@ -610,10 +610,10 @@ type traceDBState struct {
 	currentIteration int
 }
 
-func getTraceDBMockFactory(t *testing.T, tracePerIteration []model.Trace, state *traceDBState) func(datastoreresource.DataStore) (tracedb.TraceDB, error) {
+func getTraceDBMockFactory(t *testing.T, tracePerIteration []model.Trace, state *traceDBState) func(datastore.DataStore) (tracedb.TraceDB, error) {
 	t.Helper()
 
-	return func(ds datastoreresource.DataStore) (tracedb.TraceDB, error) {
+	return func(ds datastore.DataStore) (tracedb.TraceDB, error) {
 		return &traceDBMock{
 			tracePerIteration: tracePerIteration,
 			state:             state,

server/executor/runner.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/kubeshop/tracetest/server/analytics"
+	"github.com/kubeshop/tracetest/server/datastore"
 	"github.com/kubeshop/tracetest/server/environment"
 	"github.com/kubeshop/tracetest/server/executor/trigger"
 	"github.com/kubeshop/tracetest/server/expression"
@@ -17,7 +18,6 @@ import (
 	"github.com/kubeshop/tracetest/server/resourcemanager"
 	"github.com/kubeshop/tracetest/server/subscription"
 	"github.com/kubeshop/tracetest/server/tracedb"
-	"github.com/kubeshop/tracetest/server/tracedb/datastoreresource"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"
@@ -45,7 +45,7 @@ func NewPersistentRunner(
 	tracer trace.Tracer,
 	subscriptionManager *subscription.Manager,
 	newTraceDBFn traceDBFactoryFn,
-	dsRepo resourcemanager.Current[datastoreresource.DataStore],
+	dsRepo resourcemanager.Current[datastore.DataStore],
 	eventEmitter EventEmitter,
 	ppGetter PollingProfileGetter,
 ) PersistentRunner {
@@ -73,7 +73,7 @@ type persistentRunner struct {
 	tracer              trace.Tracer
 	subscriptionManager *subscription.Manager
 	newTraceDBFn        traceDBFactoryFn
-	dsRepo              resourcemanager.Current[datastoreresource.DataStore]
+	dsRepo              resourcemanager.Current[datastore.DataStore]
 	eventEmitter        EventEmitter
 	ppGetter            PollingProfileGetter
 

server/http/controller.go

@@ -9,6 +9,7 @@ import (
 	"strconv"
 
 	"github.com/kubeshop/tracetest/server/assertions/selectors"
+	"github.com/kubeshop/tracetest/server/datastore"
 	"github.com/kubeshop/tracetest/server/environment"
 	"github.com/kubeshop/tracetest/server/executor"
 	"github.com/kubeshop/tracetest/server/executor/trigger"
@@ -24,7 +25,6 @@ import (
 	"github.com/kubeshop/tracetest/server/testdb"
 	"github.com/kubeshop/tracetest/server/tests"
 	"github.com/kubeshop/tracetest/server/tracedb"
-	"github.com/kubeshop/tracetest/server/tracedb/datastoreresource"
 	"go.opentelemetry.io/otel/trace"
 )
 
@@ -33,7 +33,7 @@ var IDGen = id.NewRandGenerator()
 type controller struct {
 	tracer          trace.Tracer
 	runner          runner
-	newTraceDBFn    func(ds datastoreresource.DataStore) (tracedb.TraceDB, error)
+	newTraceDBFn    func(ds datastore.DataStore) (tracedb.TraceDB, error)
 	mappers         mappings.Mappings
 	triggerRegistry *trigger.Registry
 	version         string
@@ -73,7 +73,7 @@ type environmentGetter interface {
 func NewController(
 	testDB model.Repository,
 	transactions transactionsRepository,
-	newTraceDBFn func(ds datastoreresource.DataStore) (tracedb.TraceDB, error),
+	newTraceDBFn func(ds datastore.DataStore) (tracedb.TraceDB, error),
 	runner runner,
 	mappers mappings.Mappings,
 	envGetter environmentGetter,