Renamed temp ng-store variables to store

compose/service/attachment.go

@@ -61,7 +61,7 @@ func Attachment(store objstore.Store) AttachmentService {
 	return (&attachment{
 		objects: store,
 		ac:      DefaultAccessControl,
-		store:   DefaultNgStore,
+		store:   DefaultStore,
 	}).With(context.Background())
 }
 

compose/service/chart.go

@@ -53,7 +53,7 @@ func (svc chart) With(ctx context.Context) ChartService {
 		ctx:       ctx,
 		actionlog: DefaultActionlog,
 		ac:        svc.ac,
-		store:     DefaultNgStore,
+		store:     DefaultStore,
 	}
 }
 

compose/service/module.go

@@ -64,7 +64,7 @@ func (svc module) With(ctx context.Context) ModuleService {
 		actionlog: DefaultActionlog,
 		ac:        svc.ac,
 		eventbus:  svc.eventbus,
-		store:     DefaultNgStore,
+		store:     DefaultStore,
 	}
 }
 

compose/service/namespace.go

@@ -60,7 +60,7 @@ func (svc namespace) With(ctx context.Context) NamespaceService {
 		actionlog: DefaultActionlog,
 		ac:        svc.ac,
 		eventbus:  svc.eventbus,
-		store:     DefaultNgStore,
+		store:     DefaultStore,
 	}
 }
 

compose/service/page.go

@@ -52,7 +52,7 @@ func Page() PageService {
 	return (&page{
 		ac:       DefaultAccessControl,
 		eventbus: eventbus.Service(),
-		store:    DefaultNgStore,
+		store:    DefaultStore,
 	}).With(context.Background())
 }
 

compose/service/record.go

@@ -136,7 +136,7 @@ func Record() RecordService {
 		ac:            DefaultAccessControl,
 		eventbus:      eventbus.Service(),
 		optEmitEvents: true,
-		store:         DefaultNgStore,
+		store:         DefaultStore,
 	}).With(context.Background())
 }
 

compose/service/service.go

@@ -14,7 +14,7 @@ import (
 	"github.com/cortezaproject/corteza-server/pkg/objstore/plain"
 	"github.com/cortezaproject/corteza-server/pkg/options"
 	"github.com/cortezaproject/corteza-server/pkg/permissions"
-	ngStore "github.com/cortezaproject/corteza-server/store"
+	"github.com/cortezaproject/corteza-server/store"
 	systemService "github.com/cortezaproject/corteza-server/system/service"
 	"go.uber.org/zap"
 	"strconv"
@@ -41,10 +41,10 @@ type (
 var (
 	DefaultObjectStore objstore.Store
 
-	// DefaultNgStore is an interface to storage backend(s)
+	// DefaultStore is an interface to storage backend(s)
 	// ng (next-gen) is a temporary prefix
 	// so that we can differentiate between it and the file-only store
-	DefaultNgStore ngStore.Storer
+	DefaultStore store.Storer
 
 	DefaultLogger *zap.Logger
 
@@ -75,12 +75,12 @@ var (
 )
 
 // Initializes compose-only services
-func Initialize(ctx context.Context, log *zap.Logger, s ngStore.Storer, c Config) (err error) {
+func Initialize(ctx context.Context, log *zap.Logger, s store.Storer, c Config) (err error) {
 	var (
 		hcd = healthcheck.Defaults()
 	)
 
-	DefaultNgStore = s
+	DefaultStore = s
 
 	DefaultLogger = log.Named("service")
 
@@ -95,7 +95,7 @@ func Initialize(ctx context.Context, log *zap.Logger, s ngStore.Storer, c Config
 			tee = log
 		}
 
-		DefaultActionlog = actionlog.NewService(DefaultNgStore, log, tee, policy)
+		DefaultActionlog = actionlog.NewService(DefaultStore, log, tee, policy)
 	}
 
 	if DefaultPermissions == nil {