Removed pkg/discovery

It moves discovery types to discovery/ on root.

server/app/boot_levels.go

@@ -350,7 +350,7 @@ func (app *CortezaApp) InitServices(ctx context.Context) (err error) {
 			log = app.Log
 		}
 
-		//Initialize RBAC subsystem
+		// Initialize RBAC subsystem
 		ac := rbac.NewService(log, app.Store)
 
 		// and (re)load rules from the storage backend
@@ -452,7 +452,7 @@ func (app *CortezaApp) InitServices(ctx context.Context) (err error) {
 
 	// Initializing discovery
 	if app.Opt.Discovery.Enabled {
-		err = discoveryService.Initialize(ctx, app.Opt.Discovery, app.Store)
+		err = discoveryService.Initialize(ctx, app.Log, app.Opt.Discovery, app.Store)
 		if err != nil {
 			return fmt.Errorf("could not initialize discovery services: %w", err)
 		}

server/app/resources.cue

@@ -328,7 +328,7 @@ resources: { [key=_]: {"handle": key, "component": "system", "platform": "cortez
 	"resource-activity": {
 		package: {
 			ident: "discovery"
-			import: "github.com/cortezaproject/corteza/server/pkg/discovery/types"
+			import: "github.com/cortezaproject/corteza/server/discovery/types"
 		}
 
 		ident: "resourceActivity"

server/compose/service/service.go

@@ -6,14 +6,13 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/cortezaproject/corteza/server/pkg/dal"
-	"github.com/cortezaproject/corteza/server/pkg/discovery"
-
 	automationService "github.com/cortezaproject/corteza/server/automation/service"
 	"github.com/cortezaproject/corteza/server/compose/automation"
 	"github.com/cortezaproject/corteza/server/compose/types"
+	discoveryService "github.com/cortezaproject/corteza/server/discovery/service"
 	"github.com/cortezaproject/corteza/server/pkg/actionlog"
 	"github.com/cortezaproject/corteza/server/pkg/corredor"
+	"github.com/cortezaproject/corteza/server/pkg/dal"
 	"github.com/cortezaproject/corteza/server/pkg/eventbus"
 	"github.com/cortezaproject/corteza/server/pkg/filter"
 	"github.com/cortezaproject/corteza/server/pkg/healthcheck"
@@ -122,8 +121,8 @@ func Initialize(ctx context.Context, log *zap.Logger, s store.Storer, c Config)
 			l = zap.NewNop()
 		}
 
-		DefaultResourceActivityLog := discovery.Service(l, c.Discovery, DefaultStore, eventbus.Service())
-		err = DefaultResourceActivityLog.InitResourceActivityLog(ctx, []string{
+		DefaultResourceActivity := discoveryService.ResourceActivity(l, c.Discovery, DefaultStore, eventbus.Service())
+		err = DefaultResourceActivity.InitResourceActivityLog(ctx, []string{
 			(types.Namespace{}).LabelResourceKind(),
 			(types.Module{}).LabelResourceKind(),
 			"compose:record",

server/compose/types/module.go

@@ -5,8 +5,6 @@ import (
 	"encoding/json"
 	"time"
 
-	discovery "github.com/cortezaproject/corteza/server/discovery/types"
-
 	"github.com/cortezaproject/corteza/server/pkg/sql"
 	"github.com/jmoiron/sqlx/types"
 
@@ -55,8 +53,7 @@ type (
 		// Record data privacy settings
 		Privacy ModuleConfigDataPrivacy `json:"privacy"`
 
-		// @todo we need to transfer this from meta!!
-		Discovery discovery.ModuleMeta `json:"discovery"`
+		Discovery ModuleConfigDiscovery `json:"discovery"`
 
 		RecordRevisions ModuleConfigRecordRevisions `json:"recordRevisions"`
 
@@ -101,6 +98,19 @@ type (
 		Rules DeDupRuleSet `json:"rules,omitempty"`
 	}
 
+	ModuleConfigDiscovery struct {
+		Public    DiscoveryResult `json:"public"`
+		Private   DiscoveryResult `json:"private"`
+		Protected DiscoveryResult `json:"protected"`
+	}
+
+	DiscoveryResult struct {
+		Result []struct {
+			Lang   string   `json:"lang"`
+			Fields []string `json:"fields"`
+		} `json:"result"`
+	}
+
 	ModuleFilter struct {
 		ModuleID    []uint64 `json:"moduleID"`
 		NamespaceID uint64   `json:"namespaceID,string"`

server/compose/types/module_field_options.go

@@ -4,7 +4,6 @@ import (
 	"database/sql/driver"
 	"encoding/json"
 	"fmt"
-	discovery "github.com/cortezaproject/corteza/server/discovery/types"
 	"github.com/cortezaproject/corteza/server/pkg/sql"
 	"github.com/spf13/cast"
 	"strconv"
@@ -14,9 +13,6 @@ type (
 	ModuleFieldOptions map[string]interface{}
 
 	ModuleFieldOptionIndex struct {
-		// index values in this field for public, protected or private  searches
-		Access discovery.Access `json:"access"`
-
 		// Applicable to ref field kinds where we use nested/object type
 		// and we want to control how deep do we want to follow the references
 		NestingDepth map[string]bool `json:"nestingDepth,omitempty"`

server/discovery/rest/internal/feed/resource.go

@@ -3,7 +3,7 @@ package feed
 import (
 	"context"
 	"github.com/cortezaproject/corteza/server/discovery/service"
-	"github.com/cortezaproject/corteza/server/pkg/discovery/types"
+	"github.com/cortezaproject/corteza/server/discovery/types"
 	"github.com/cortezaproject/corteza/server/pkg/errors"
 	"github.com/cortezaproject/corteza/server/pkg/filter"
 	"github.com/cortezaproject/corteza/server/pkg/options"

server/discovery/service/resource_activity_log.go

@@ -2,14 +2,35 @@ package service
 
 import (
 	"context"
+	"fmt"
+	"github.com/cortezaproject/corteza/server/pkg/eventbus"
+	"github.com/cortezaproject/corteza/server/pkg/id"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"go.uber.org/zap"
+	"sync"
+	"time"
 
-	"github.com/cortezaproject/corteza/server/pkg/discovery/types"
+	"github.com/cortezaproject/corteza/server/discovery/types"
 	"github.com/cortezaproject/corteza/server/store"
 )
 
 type (
 	resourceActivity struct {
+		// log for repository errors
+		log *zap.Logger
+		opt options.DiscoveryOpt
+		mux sync.RWMutex
+
+		// where the activity log records are kept
+		// store resourceActivityLogStore
 		store store.Storer
+
+		eventbus eventbusRegistry
+		decoder  types.ResDecoder
+	}
+
+	eventbusRegistry interface {
+		Register(eventbus.HandlerFn, ...eventbus.HandlerRegOp) uintptr
 	}
 
 	ResourceActivityService interface {
@@ -17,13 +38,82 @@ type (
 	}
 )
 
-func ResourceActivity() *resourceActivity {
+func ResourceActivity(log *zap.Logger, opt options.DiscoveryOpt, s store.Storer, eb eventbusRegistry) *resourceActivity {
 	return &resourceActivity{
-		store: DefaultStore,
+		log:      log.Named("resource-activity"),
+		opt:      opt,
+		store:    s,
+		eventbus: eb,
 	}
 }
 
-func (svc resourceActivity) Find(ctx context.Context, filter types.ResourceActivityFilter) (aa types.ResourceActivitySet, f types.ResourceActivityFilter, err error) {
+func (svc *resourceActivity) logger(a *types.ResourceActivity) {
+	zlf := []zap.Field{
+		zap.Uint8("recordID", uint8(a.ResourceID)),
+		zap.String("ResourceType", a.ResourceType),
+		zap.String("ResourceAction", a.ResourceAction),
+		zap.Time("timestamp", a.Timestamp),
+	}
+
+	svc.log.
+		With(zlf...).
+		// Skipping 3 callers (the most common stack)
+		//   discovery.service.log()
+		//   discovery.service.Record()
+		//   (generated service function)
+		//
+		// One exception, access control, that calls Record fn directly,
+		// without going through generated discovery helpers
+		WithOptions(zap.AddCallerSkip(3)).
+		// This is debug logger, and we log all recordings as debug
+		Debug(fmt.Sprintf("%s of %s", a.ResourceAction, a.ResourceType))
+}
+
+func (svc *resourceActivity) InitResourceActivityLog(ctx context.Context, resourceType []string) (err error) {
+	eventType := []string{
+		string(types.AfterCreate),
+		string(types.AfterUpdate),
+		string(types.AfterDelete),
+	}
+
+	svc.mux.RLock()
+	defer svc.mux.RUnlock()
+
+	svc.eventbus.Register(
+		func(_ context.Context, ev eventbus.Event) error {
+			var a *types.ResourceActivity
+			dec, is := ev.(types.ResDecoder)
+			if is {
+				svc.log.Debug("resource changed",
+					zap.String("eventType", ev.EventType()),
+					zap.String("resourceType", ev.ResourceType()),
+				)
+
+				a, err = types.CastToResourceActivity(dec)
+				if err != nil {
+					svc.log.With(zap.Error(err)).Error("could not cast event to activity")
+					return err
+				}
+
+				err = svc.store.CreateResourceActivity(ctx, a)
+				if err != nil {
+					svc.log.With(zap.Error(err)).Error("could not record activity event")
+					return err
+				}
+
+				return nil
+			}
+
+			return nil
+		},
+		eventbus.For(resourceType...),
+		eventbus.On(eventType...),
+	)
+
+	return
+}
+
+func (svc *resourceActivity) Find(ctx context.Context, filter types.ResourceActivityFilter) (aa types.ResourceActivitySet, f types.ResourceActivityFilter, err error) {
 	err = func() error {
 		aa, f, err = store.SearchResourceActivitys(ctx, svc.store, filter)
 		if err != nil {
@@ -35,3 +125,33 @@ func (svc resourceActivity) Find(ctx context.Context, filter types.ResourceActiv
 
 	return aa, f, err
 }
+
+func (svc *resourceActivity) Record(ctx context.Context, a *types.ResourceActivity) {
+	if a == nil {
+		// nothing to record
+		return
+	}
+
+	a = enrich(ctx, a)
+	a.ID = id.Next()
+
+	svc.logger(a)
+
+	// We want to prevent any abrupt cancellation
+	// (e.g. canceled request) that would cause
+	// discovery to fail...
+	ctx = context.Background()
+
+	if err := svc.store.CreateResourceActivity(ctx, a); err != nil {
+		svc.log.With(zap.Error(err)).Error("could not record activity event")
+	}
+}
+
+// enrich activity with additional info (timestamp, ...)
+func enrich(_ context.Context, a *types.ResourceActivity) *types.ResourceActivity {
+	if a.Timestamp.IsZero() {
+		a.Timestamp = time.Now()
+	}
+
+	return a
+}

server/discovery/service/service.go

@@ -2,8 +2,10 @@ package service
 
 import (
 	"context"
+	"github.com/cortezaproject/corteza/server/pkg/eventbus"
 	"github.com/cortezaproject/corteza/server/pkg/options"
 	"github.com/cortezaproject/corteza/server/store"
+	"go.uber.org/zap"
 )
 
 var (
@@ -18,15 +20,14 @@ var (
 )
 
 // Initialize discovery service
-func Initialize(_ context.Context, opt options.DiscoveryOpt, s store.Storer) (err error) {
-	// @todo maybe move pkg/discovery her or other way around
+func Initialize(_ context.Context, log *zap.Logger, opt options.DiscoveryOpt, s store.Storer) (err error) {
 	DefaultOption = opt
 
 	// we're doing conversion to avoid having
 	// store interface exposed or generated inside app package
 	DefaultStore = s
 
-	DefaultResourceActivity = ResourceActivity()
+	DefaultResourceActivity = ResourceActivity(log, opt, s, eventbus.Service())
 
 	return
 }

server/discovery/types/type_set.gen.go

@@ -6,7 +6,7 @@ package types
 // the code is regenerated.
 //
 // Definitions file that controls how this file is generated:
-// pkg/discovery/types/types.yaml
+// discovery/types/types.yaml
 
 type (
 

server/discovery/types/type_set.gen_test.go

@@ -6,7 +6,7 @@ package types
 // the code is regenerated.
 //
 // Definitions file that controls how this file is generated:
-// pkg/discovery/types/types.yaml
+// discovery/types/types.yaml
 
 import (
 	"fmt"

server/pkg/discovery/service.go

@@ -1,146 +0,0 @@
-package discovery
-
-import (
-	"context"
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/cortezaproject/corteza/server/pkg/discovery/types"
-	"github.com/cortezaproject/corteza/server/pkg/eventbus"
-	"github.com/cortezaproject/corteza/server/pkg/id"
-	"github.com/cortezaproject/corteza/server/pkg/options"
-
-	"go.uber.org/zap"
-)
-
-type (
-	service struct {
-		// logger for repository errors
-		logger *zap.Logger
-		opt    options.DiscoveryOpt
-		mux    sync.RWMutex
-
-		// where the activity log records are kept
-		store resourceActivityLogStore
-
-		eventbus eventbusRegistry
-		decoder  types.ResDecoder
-	}
-
-	resourceActivityLogStore interface {
-		CreateResourceActivity(ctx context.Context, rr ...*types.ResourceActivity) error
-	}
-
-	eventbusRegistry interface {
-		Register(eventbus.HandlerFn, ...eventbus.HandlerRegOp) uintptr
-	}
-)
-
-// Service initializes activity log service
-func Service(logger *zap.Logger, opt options.DiscoveryOpt, s resourceActivityLogStore, eb eventbusRegistry) (svc *service) {
-	svc = &service{
-		logger:   logger.Named("discovery"),
-		opt:      opt,
-		store:    s,
-		eventbus: eb,
-	}
-
-	return
-}
-
-func (svc *service) log(a *types.ResourceActivity) {
-	zlf := []zap.Field{
-		zap.Uint8("recordID", uint8(a.ResourceID)),
-		zap.String("ResourceType", a.ResourceType),
-		zap.String("ResourceAction", a.ResourceAction),
-		zap.Time("timestamp", a.Timestamp),
-	}
-
-	svc.logger.
-		With(zlf...).
-		// Skipping 3 callers (the most common stack)
-		//   discovery.service.log()
-		//   discovery.service.Record()
-		//   (generated service function)
-		//
-		// One exception, access control, that calls Record fn directly,
-		// without going through generated discovery helpers
-		WithOptions(zap.AddCallerSkip(3)).
-		// This is debug logger, and we log all recordings as debug
-		Debug(fmt.Sprintf("%s of %s", a.ResourceAction, a.ResourceType))
-}
-
-func (svc *service) InitResourceActivityLog(ctx context.Context, resourceType []string) (err error) {
-	eventType := []string{
-		string(types.AfterCreate),
-		string(types.AfterUpdate),
-		string(types.AfterDelete),
-	}
-
-	svc.mux.RLock()
-	defer svc.mux.RUnlock()
-
-	svc.eventbus.Register(
-		func(_ context.Context, ev eventbus.Event) error {
-			var a *types.ResourceActivity
-			dec, is := ev.(types.ResDecoder)
-			if is {
-				svc.logger.Debug("resource changed",
-					zap.String("eventType", ev.EventType()),
-					zap.String("resourceType", ev.ResourceType()),
-				)
-
-				a, err = types.CastToResourceActivity(dec)
-				if err != nil {
-					svc.logger.With(zap.Error(err)).Error("could not cast event to activity")
-					return err
-				}
-
-				err = svc.store.CreateResourceActivity(ctx, a)
-				if err != nil {
-					svc.logger.With(zap.Error(err)).Error("could not record activity event")
-					return err
-				}
-
-				return nil
-			}
-
-			return nil
-		},
-		eventbus.For(resourceType...),
-		eventbus.On(eventType...),
-	)
-
-	return
-}
-
-func (svc *service) Record(ctx context.Context, a *types.ResourceActivity) {
-	if a == nil {
-		// nothing to record
-		return
-	}
-
-	a = enrich(ctx, a)
-	a.ID = id.Next()
-
-	svc.log(a)
-
-	// We want to prevent any abrupt cancellation
-	// (e.g. canceled request) that would cause
-	// discovery to fail...
-	ctx = context.Background()
-
-	if err := svc.store.CreateResourceActivity(ctx, a); err != nil {
-		svc.logger.With(zap.Error(err)).Error("could not record activity event")
-	}
-}
-
-// enrich activity with additional info (timestamp, ...)
-func enrich(_ context.Context, a *types.ResourceActivity) *types.ResourceActivity {
-	if a.Timestamp.IsZero() {
-		a.Timestamp = time.Now()
-	}
-
-	return a
-}

server/pkg/locale/embeded.go

@@ -1,6 +1,6 @@
 package locale
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 // This helps us import translations into corteza-server as a module
 // dependency
 
@@ -9,7 +9,6 @@ import (
 	"io/fs"
 )
 
-//go:embed src/*
 var languages embed.FS
 
 // LoadEmbedded returns embedded translation files

server/store/adapters/rdbms/aux_types.gen.go

@@ -9,9 +9,9 @@ package rdbms
 import (
 	automationType "github.com/cortezaproject/corteza/server/automation/types"
 	composeType "github.com/cortezaproject/corteza/server/compose/types"
+	discoveryType "github.com/cortezaproject/corteza/server/discovery/types"
 	federationType "github.com/cortezaproject/corteza/server/federation/types"
 	actionlogType "github.com/cortezaproject/corteza/server/pkg/actionlog"
-	discoveryType "github.com/cortezaproject/corteza/server/pkg/discovery/types"
 	"github.com/cortezaproject/corteza/server/pkg/expr"
 	flagType "github.com/cortezaproject/corteza/server/pkg/flag/types"
 	labelsType "github.com/cortezaproject/corteza/server/pkg/label/types"

server/store/adapters/rdbms/filter.go

@@ -10,9 +10,9 @@ import (
 
 	automationType "github.com/cortezaproject/corteza/server/automation/types"
 	composeType "github.com/cortezaproject/corteza/server/compose/types"
+	discoveryType "github.com/cortezaproject/corteza/server/discovery/types"
 	"github.com/cortezaproject/corteza/server/federation/types"
 	"github.com/cortezaproject/corteza/server/pkg/actionlog"
-	discoveryType "github.com/cortezaproject/corteza/server/pkg/discovery/types"
 	"github.com/cortezaproject/corteza/server/pkg/filter"
 	labelsType "github.com/cortezaproject/corteza/server/pkg/label/types"
 	systemType "github.com/cortezaproject/corteza/server/system/types"

server/store/adapters/rdbms/filters.gen.go

@@ -9,9 +9,9 @@ package rdbms
 import (
 	automationType "github.com/cortezaproject/corteza/server/automation/types"
 	composeType "github.com/cortezaproject/corteza/server/compose/types"
+	discoveryType "github.com/cortezaproject/corteza/server/discovery/types"
 	federationType "github.com/cortezaproject/corteza/server/federation/types"
 	actionlogType "github.com/cortezaproject/corteza/server/pkg/actionlog"
-	discoveryType "github.com/cortezaproject/corteza/server/pkg/discovery/types"
 	flagType "github.com/cortezaproject/corteza/server/pkg/flag/types"
 	labelsType "github.com/cortezaproject/corteza/server/pkg/label/types"
 	rbacType "github.com/cortezaproject/corteza/server/pkg/rbac"

server/store/adapters/rdbms/queries.gen.go

@@ -9,9 +9,9 @@ package rdbms
 import (
 	automationType "github.com/cortezaproject/corteza/server/automation/types"
 	composeType "github.com/cortezaproject/corteza/server/compose/types"
+	discoveryType "github.com/cortezaproject/corteza/server/discovery/types"
 	federationType "github.com/cortezaproject/corteza/server/federation/types"
 	actionlogType "github.com/cortezaproject/corteza/server/pkg/actionlog"
-	discoveryType "github.com/cortezaproject/corteza/server/pkg/discovery/types"
 	flagType "github.com/cortezaproject/corteza/server/pkg/flag/types"
 	labelsType "github.com/cortezaproject/corteza/server/pkg/label/types"
 	rbacType "github.com/cortezaproject/corteza/server/pkg/rbac"

server/store/adapters/rdbms/rdbms.gen.go

@@ -14,9 +14,9 @@ import (
 
 	automationType "github.com/cortezaproject/corteza/server/automation/types"
 	composeType "github.com/cortezaproject/corteza/server/compose/types"
+	discoveryType "github.com/cortezaproject/corteza/server/discovery/types"
 	federationType "github.com/cortezaproject/corteza/server/federation/types"
 	actionlogType "github.com/cortezaproject/corteza/server/pkg/actionlog"
-	discoveryType "github.com/cortezaproject/corteza/server/pkg/discovery/types"
 	"github.com/cortezaproject/corteza/server/pkg/errors"
 	"github.com/cortezaproject/corteza/server/pkg/filter"
 	flagType "github.com/cortezaproject/corteza/server/pkg/flag/types"
@@ -578,13 +578,13 @@ func (s *Store) SearchApigwFilters(ctx context.Context, f systemType.ApigwFilter
 // fetchFullPageOfApigwFilters collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfApigwFilters(
@@ -1176,13 +1176,13 @@ func (s *Store) SearchApigwRoutes(ctx context.Context, f systemType.ApigwRouteFi
 // fetchFullPageOfApigwRoutes collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfApigwRoutes(
@@ -1419,7 +1419,7 @@ func (s *Store) QueryApigwRoutes(
 
 // LookupApigwRouteByID searches for route by ID
 //
-// It returns route even if deleted or suspended
+// # It returns route even if deleted or suspended
 //
 // This function is auto-generated
 func (s *Store) LookupApigwRouteByID(ctx context.Context, id uint64) (_ *systemType.ApigwRoute, err error) {
@@ -1461,7 +1461,7 @@ func (s *Store) LookupApigwRouteByID(ctx context.Context, id uint64) (_ *systemT
 
 // LookupApigwRouteByEndpoint searches for route by endpoint
 //
-// It returns route even if deleted or suspended
+// # It returns route even if deleted or suspended
 //
 // This function is auto-generated
 func (s *Store) LookupApigwRouteByEndpoint(ctx context.Context, endpoint string) (_ *systemType.ApigwRoute, err error) {
@@ -1778,13 +1778,13 @@ func (s *Store) SearchApplications(ctx context.Context, f systemType.Application
 // fetchFullPageOfApplications collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfApplications(
@@ -2021,7 +2021,7 @@ func (s *Store) QueryApplications(
 
 // LookupApplicationByID searches for role by ID
 //
-// It returns role even if deleted or suspended
+// # It returns role even if deleted or suspended
 //
 // This function is auto-generated
 func (s *Store) LookupApplicationByID(ctx context.Context, id uint64) (_ *systemType.Application, err error) {
@@ -2335,13 +2335,13 @@ func (s *Store) SearchAttachments(ctx context.Context, f systemType.AttachmentFi
 // fetchFullPageOfAttachments collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfAttachments(
@@ -2887,13 +2887,13 @@ func (s *Store) SearchAuthClients(ctx context.Context, f systemType.AuthClientFi
 // fetchFullPageOfAuthClients collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfAuthClients(
@@ -3130,7 +3130,7 @@ func (s *Store) QueryAuthClients(
 
 // LookupAuthClientByID 	searches for auth client by ID
 //
-// 	It returns auth clint even if deleted
+//	It returns auth clint even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupAuthClientByID(ctx context.Context, id uint64) (_ *systemType.AuthClient, err error) {
@@ -3172,7 +3172,7 @@ func (s *Store) LookupAuthClientByID(ctx context.Context, id uint64) (_ *systemT
 
 // LookupAuthClientByHandle searches for auth client by ID
 //
-// It returns auth clint even if deleted
+// # It returns auth clint even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupAuthClientByHandle(ctx context.Context, handle string) (_ *systemType.AuthClient, err error) {
@@ -4626,13 +4626,13 @@ func (s *Store) SearchAutomationSessions(ctx context.Context, f automationType.S
 // fetchFullPageOfAutomationSessions collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfAutomationSessions(
@@ -4869,7 +4869,7 @@ func (s *Store) QueryAutomationSessions(
 
 // LookupAutomationSessionByID searches for session by ID
 //
-// It returns session even if deleted
+// # It returns session even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupAutomationSessionByID(ctx context.Context, id uint64) (_ *automationType.Session, err error) {
@@ -5193,13 +5193,13 @@ func (s *Store) SearchAutomationTriggers(ctx context.Context, f automationType.T
 // fetchFullPageOfAutomationTriggers collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfAutomationTriggers(
@@ -5436,7 +5436,7 @@ func (s *Store) QueryAutomationTriggers(
 
 // LookupAutomationTriggerByID searches for trigger by ID
 //
-// It returns trigger even if deleted
+// # It returns trigger even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupAutomationTriggerByID(ctx context.Context, id uint64) (_ *automationType.Trigger, err error) {
@@ -5756,13 +5756,13 @@ func (s *Store) SearchAutomationWorkflows(ctx context.Context, f automationType.
 // fetchFullPageOfAutomationWorkflows collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfAutomationWorkflows(
@@ -5999,7 +5999,7 @@ func (s *Store) QueryAutomationWorkflows(
 
 // LookupAutomationWorkflowByID searches for workflow by ID
 //
-// It returns workflow even if deleted
+// # It returns workflow even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupAutomationWorkflowByID(ctx context.Context, id uint64) (_ *automationType.Workflow, err error) {
@@ -6041,7 +6041,7 @@ func (s *Store) LookupAutomationWorkflowByID(ctx context.Context, id uint64) (_
 
 // LookupAutomationWorkflowByHandle searches for workflow by their handle
 //
-// It returns only valid workflows
+// # It returns only valid workflows
 //
 // This function is auto-generated
 func (s *Store) LookupAutomationWorkflowByHandle(ctx context.Context, handle string) (_ *automationType.Workflow, err error) {
@@ -6381,13 +6381,13 @@ func (s *Store) SearchComposeAttachments(ctx context.Context, f composeType.Atta
 // fetchFullPageOfComposeAttachments collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfComposeAttachments(
@@ -6937,13 +6937,13 @@ func (s *Store) SearchComposeCharts(ctx context.Context, f composeType.ChartFilt
 // fetchFullPageOfComposeCharts collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfComposeCharts(
@@ -7180,7 +7180,7 @@ func (s *Store) QueryComposeCharts(
 
 // LookupComposeChartByID searches for compose chart by ID
 //
-// It returns compose chart even if deleted
+// # It returns compose chart even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupComposeChartByID(ctx context.Context, id uint64) (_ *composeType.Chart, err error) {
@@ -7534,13 +7534,13 @@ func (s *Store) SearchComposeModules(ctx context.Context, f composeType.ModuleFi
 // fetchFullPageOfComposeModules collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfComposeModules(
@@ -7861,7 +7861,7 @@ func (s *Store) LookupComposeModuleByNamespaceIDName(ctx context.Context, namesp
 
 // LookupComposeModuleByID searches for compose module by ID
 //
-// It returns compose module even if deleted
+// # It returns compose module even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupComposeModuleByID(ctx context.Context, id uint64) (_ *composeType.Module, err error) {
@@ -8620,13 +8620,13 @@ func (s *Store) SearchComposeNamespaces(ctx context.Context, f composeType.Names
 // fetchFullPageOfComposeNamespaces collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfComposeNamespaces(
@@ -8904,7 +8904,7 @@ func (s *Store) LookupComposeNamespaceBySlug(ctx context.Context, slug string) (
 
 // LookupComposeNamespaceByID searches for compose namespace by ID
 //
-// It returns compose namespace even if deleted
+// # It returns compose namespace even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupComposeNamespaceByID(ctx context.Context, id uint64) (_ *composeType.Namespace, err error) {
@@ -9242,13 +9242,13 @@ func (s *Store) SearchComposePages(ctx context.Context, f composeType.PageFilter
 // fetchFullPageOfComposePages collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfComposePages(
@@ -9569,7 +9569,7 @@ func (s *Store) LookupComposePageByNamespaceIDModuleID(ctx context.Context, name
 
 // LookupComposePageByID searches for compose page by ID
 //
-// It returns compose page even if deleted
+// # It returns compose page even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupComposePageByID(ctx context.Context, id uint64) (_ *composeType.Page, err error) {
@@ -9914,7 +9914,7 @@ func (s *Store) QueryCredentials(
 
 // LookupCredentialByID searches for credentials by ID
 //
-// It returns credentials even if deleted
+// # It returns credentials even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupCredentialByID(ctx context.Context, id uint64) (_ *systemType.Credential, err error) {
@@ -10227,13 +10227,13 @@ func (s *Store) SearchDalConnections(ctx context.Context, f systemType.DalConnec
 // fetchFullPageOfDalConnections collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfDalConnections(
@@ -10470,7 +10470,7 @@ func (s *Store) QueryDalConnections(
 
 // LookupDalConnectionByID searches for connection by ID
 //
-// It returns connection even if deleted or suspended
+// # It returns connection even if deleted or suspended
 //
 // This function is auto-generated
 func (s *Store) LookupDalConnectionByID(ctx context.Context, id uint64) (_ *systemType.DalConnection, err error) {
@@ -10852,13 +10852,13 @@ func (s *Store) SearchDalSensitivityLevels(ctx context.Context, f systemType.Dal
 // fetchFullPageOfDalSensitivityLevels collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfDalSensitivityLevels(
@@ -11095,7 +11095,7 @@ func (s *Store) QueryDalSensitivityLevels(
 
 // LookupDalSensitivityLevelByID searches for user by ID
 //
-// It returns user even if deleted or suspended
+// # It returns user even if deleted or suspended
 //
 // This function is auto-generated
 func (s *Store) LookupDalSensitivityLevelByID(ctx context.Context, id uint64) (_ *systemType.DalSensitivityLevel, err error) {
@@ -11407,13 +11407,13 @@ func (s *Store) SearchDataPrivacyRequests(ctx context.Context, f systemType.Data
 // fetchFullPageOfDataPrivacyRequests collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfDataPrivacyRequests(
@@ -11650,7 +11650,7 @@ func (s *Store) QueryDataPrivacyRequests(
 
 // LookupDataPrivacyRequestByID searches for data privacy request by ID
 //
-// It returns data privacy request even if deleted
+// # It returns data privacy request even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupDataPrivacyRequestByID(ctx context.Context, id uint64) (_ *systemType.DataPrivacyRequest, err error) {
@@ -11969,13 +11969,13 @@ func (s *Store) SearchDataPrivacyRequestComments(ctx context.Context, f systemTy
 // fetchFullPageOfDataPrivacyRequestComments collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfDataPrivacyRequestComments(
@@ -12475,13 +12475,13 @@ func (s *Store) SearchFederationExposedModules(ctx context.Context, f federation
 // fetchFullPageOfFederationExposedModules collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfFederationExposedModules(
@@ -12718,7 +12718,7 @@ func (s *Store) QueryFederationExposedModules(
 
 // LookupFederationExposedModuleByID searches for federation module by ID
 //
-// It returns federation module
+// # It returns federation module
 //
 // This function is auto-generated
 func (s *Store) LookupFederationExposedModuleByID(ctx context.Context, id uint64) (_ *federationType.ExposedModule, err error) {
@@ -13025,13 +13025,13 @@ func (s *Store) SearchFederationModuleMappings(ctx context.Context, f federation
 // fetchFullPageOfFederationModuleMappings collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfFederationModuleMappings(
@@ -13268,7 +13268,7 @@ func (s *Store) QueryFederationModuleMappings(
 
 // LookupFederationModuleMappingByFederationModuleIDComposeModuleIDComposeNamespaceID searches for module mapping by federation module id and compose module id
 //
-// It returns module mapping
+// # It returns module mapping
 //
 // This function is auto-generated
 func (s *Store) LookupFederationModuleMappingByFederationModuleIDComposeModuleIDComposeNamespaceID(ctx context.Context, federationModuleID uint64, composeModuleID uint64, composeNamespaceID uint64) (_ *federationType.ModuleMapping, err error) {
@@ -13312,7 +13312,7 @@ func (s *Store) LookupFederationModuleMappingByFederationModuleIDComposeModuleID
 
 // LookupFederationModuleMappingByFederationModuleID searches for module mapping by federation module id
 //
-// It returns module mapping
+// # It returns module mapping
 //
 // This function is auto-generated
 func (s *Store) LookupFederationModuleMappingByFederationModuleID(ctx context.Context, federationModuleID uint64) (_ *federationType.ModuleMapping, err error) {
@@ -13613,13 +13613,13 @@ func (s *Store) SearchFederationNodes(ctx context.Context, f federationType.Node
 // fetchFullPageOfFederationNodes collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfFederationNodes(
@@ -13856,7 +13856,7 @@ func (s *Store) QueryFederationNodes(
 
 // LookupFederationNodeByID searches for federation node by ID
 //
-// It returns federation node
+// # It returns federation node
 //
 // This function is auto-generated
 func (s *Store) LookupFederationNodeByID(ctx context.Context, id uint64) (_ *federationType.Node, err error) {
@@ -14259,13 +14259,13 @@ func (s *Store) SearchFederationNodeSyncs(ctx context.Context, f federationType.
 // fetchFullPageOfFederationNodeSyncs collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfFederationNodeSyncs(
@@ -14502,7 +14502,7 @@ func (s *Store) QueryFederationNodeSyncs(
 
 // LookupFederationNodeSyncByNodeID searches for sync activity by node ID
 //
-// It returns sync activity
+// # It returns sync activity
 //
 // This function is auto-generated
 func (s *Store) LookupFederationNodeSyncByNodeID(ctx context.Context, nodeID uint64) (_ *federationType.NodeSync, err error) {
@@ -14544,7 +14544,7 @@ func (s *Store) LookupFederationNodeSyncByNodeID(ctx context.Context, nodeID uin
 
 // LookupFederationNodeSyncByNodeIDModuleIDSyncTypeSyncStatus searches for activity by node, type and status
 //
-// It returns sync activity
+// # It returns sync activity
 //
 // This function is auto-generated
 func (s *Store) LookupFederationNodeSyncByNodeIDModuleIDSyncTypeSyncStatus(ctx context.Context, nodeID uint64, moduleID uint64, syncType string, syncStatus string) (_ *federationType.NodeSync, err error) {
@@ -14857,13 +14857,13 @@ func (s *Store) SearchFederationSharedModules(ctx context.Context, f federationT
 // fetchFullPageOfFederationSharedModules collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfFederationSharedModules(
@@ -15100,7 +15100,7 @@ func (s *Store) QueryFederationSharedModules(
 
 // LookupFederationSharedModuleByID searches for shared federation module by ID
 //
-// It returns shared federation module
+// # It returns shared federation module
 //
 // This function is auto-generated
 func (s *Store) LookupFederationSharedModuleByID(ctx context.Context, id uint64) (_ *federationType.SharedModule, err error) {
@@ -16107,13 +16107,13 @@ func (s *Store) SearchQueues(ctx context.Context, f systemType.QueueFilter) (set
 // fetchFullPageOfQueues collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfQueues(
@@ -16699,13 +16699,13 @@ func (s *Store) SearchQueueMessages(ctx context.Context, f systemType.QueueMessa
 // fetchFullPageOfQueueMessages collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfQueueMessages(
@@ -17486,13 +17486,13 @@ func (s *Store) SearchReminders(ctx context.Context, f systemType.ReminderFilter
 // fetchFullPageOfReminders collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfReminders(
@@ -18047,13 +18047,13 @@ func (s *Store) SearchReports(ctx context.Context, f systemType.ReportFilter) (s
 // fetchFullPageOfReports collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfReports(
@@ -18290,7 +18290,7 @@ func (s *Store) QueryReports(
 
 // LookupReportByID searches for report by ID
 //
-// It returns report even if deleted
+// # It returns report even if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupReportByID(ctx context.Context, id uint64) (_ *systemType.Report, err error) {
@@ -18332,7 +18332,7 @@ func (s *Store) LookupReportByID(ctx context.Context, id uint64) (_ *systemType.
 
 // LookupReportByHandle searches for report by handle
 //
-// It returns report if deleted
+// # It returns report if deleted
 //
 // This function is auto-generated
 func (s *Store) LookupReportByHandle(ctx context.Context, handle string) (_ *systemType.Report, err error) {
@@ -18949,13 +18949,13 @@ func (s *Store) SearchResourceTranslations(ctx context.Context, f systemType.Res
 // fetchFullPageOfResourceTranslations collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfResourceTranslations(
@@ -19484,13 +19484,13 @@ func (s *Store) SearchRoles(ctx context.Context, f systemType.RoleFilter) (set s
 // fetchFullPageOfRoles collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfRoles(
@@ -19727,7 +19727,7 @@ func (s *Store) QueryRoles(
 
 // LookupRoleByID searches for role by ID
 //
-// It returns role even if deleted or suspended
+// # It returns role even if deleted or suspended
 //
 // This function is auto-generated
 func (s *Store) LookupRoleByID(ctx context.Context, id uint64) (_ *systemType.Role, err error) {
@@ -20803,13 +20803,13 @@ func (s *Store) SearchTemplates(ctx context.Context, f systemType.TemplateFilter
 // fetchFullPageOfTemplates collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfTemplates(
@@ -21438,13 +21438,13 @@ func (s *Store) SearchUsers(ctx context.Context, f systemType.UserFilter) (set s
 // fetchFullPageOfUsers collects all requested results.
 //
 // Function applies:
-//  - cursor conditions (where ...)
-//  - limit
+//   - cursor conditions (where ...)
+//   - limit
 //
 // Main responsibility of this function is to perform additional sequential queries in case when not enough results
 // are collected due to failed check on a specific row (by check fn).
 //
-// Function then moves cursor to the last item fetched
+// # Function then moves cursor to the last item fetched
 //
 // This function is auto-generated
 func (s *Store) fetchFullPageOfUsers(
@@ -21681,7 +21681,7 @@ func (s *Store) QueryUsers(
 
 // LookupUserByID searches for user by ID
 //
-// It returns user even if deleted or suspended
+// # It returns user even if deleted or suspended
 //
 // This function is auto-generated
 func (s *Store) LookupUserByID(ctx context.Context, id uint64) (_ *systemType.User, err error) {

server/store/interfaces.gen.go

@@ -10,10 +10,10 @@ import (
 	"context"
 	automationType "github.com/cortezaproject/corteza/server/automation/types"
 	composeType "github.com/cortezaproject/corteza/server/compose/types"
+	discoveryType "github.com/cortezaproject/corteza/server/discovery/types"
 	federationType "github.com/cortezaproject/corteza/server/federation/types"
 	actionlogType "github.com/cortezaproject/corteza/server/pkg/actionlog"
 	"github.com/cortezaproject/corteza/server/pkg/dal"
-	discoveryType "github.com/cortezaproject/corteza/server/pkg/discovery/types"
 	flagType "github.com/cortezaproject/corteza/server/pkg/flag/types"
 	labelsType "github.com/cortezaproject/corteza/server/pkg/label/types"
 	"github.com/cortezaproject/corteza/server/pkg/locale"
@@ -801,7 +801,7 @@ func TruncateApigwRoutes(ctx context.Context, s ApigwRoutes) error {
 
 // LookupApigwRouteByID searches for route by ID
 //
-// It returns route even if deleted or suspended
+// # It returns route even if deleted or suspended
 //
 // This function is auto-generated
 func LookupApigwRouteByID(ctx context.Context, s ApigwRoutes, id uint64) (*systemType.ApigwRoute, error) {
@@ -810,7 +810,7 @@ func LookupApigwRouteByID(ctx context.Context, s ApigwRoutes, id uint64) (*syste
 
 // LookupApigwRouteByEndpoint searches for route by endpoint
 //
-// It returns route even if deleted or suspended
+// # It returns route even if deleted or suspended
 //
 // This function is auto-generated
 func LookupApigwRouteByEndpoint(ctx context.Context, s ApigwRoutes, endpoint string) (*systemType.ApigwRoute, error) {
@@ -868,7 +868,7 @@ func TruncateApplications(ctx context.Context, s Applications) error {
 
 // LookupApplicationByID searches for role by ID
 //
-// It returns role even if deleted or suspended
+// # It returns role even if deleted or suspended
 //
 // This function is auto-generated
 func LookupApplicationByID(ctx context.Context, s Applications, id uint64) (*systemType.Application, error) {
@@ -996,7 +996,7 @@ func TruncateAuthClients(ctx context.Context, s AuthClients) error {
 
 // LookupAuthClientByID 	searches for auth client by ID
 //
-// 	It returns auth clint even if deleted
+//	It returns auth clint even if deleted
 //
 // This function is auto-generated
 func LookupAuthClientByID(ctx context.Context, s AuthClients, id uint64) (*systemType.AuthClient, error) {
@@ -1005,7 +1005,7 @@ func LookupAuthClientByID(ctx context.Context, s AuthClients, id uint64) (*syste
 
 // LookupAuthClientByHandle searches for auth client by ID
 //
-// It returns auth clint even if deleted
+// # It returns auth clint even if deleted
 //
 // This function is auto-generated
 func LookupAuthClientByHandle(ctx context.Context, s AuthClients, handle string) (*systemType.AuthClient, error) {
@@ -1301,7 +1301,7 @@ func TruncateAutomationSessions(ctx context.Context, s AutomationSessions) error
 
 // LookupAutomationSessionByID searches for session by ID
 //
-// It returns session even if deleted
+// # It returns session even if deleted
 //
 // This function is auto-generated
 func LookupAutomationSessionByID(ctx context.Context, s AutomationSessions, id uint64) (*automationType.Session, error) {
@@ -1359,7 +1359,7 @@ func TruncateAutomationTriggers(ctx context.Context, s AutomationTriggers) error
 
 // LookupAutomationTriggerByID searches for trigger by ID
 //
-// It returns trigger even if deleted
+// # It returns trigger even if deleted
 //
 // This function is auto-generated
 func LookupAutomationTriggerByID(ctx context.Context, s AutomationTriggers, id uint64) (*automationType.Trigger, error) {
@@ -1417,7 +1417,7 @@ func TruncateAutomationWorkflows(ctx context.Context, s AutomationWorkflows) err
 
 // LookupAutomationWorkflowByID searches for workflow by ID
 //
-// It returns workflow even if deleted
+// # It returns workflow even if deleted
 //
 // This function is auto-generated
 func LookupAutomationWorkflowByID(ctx context.Context, s AutomationWorkflows, id uint64) (*automationType.Workflow, error) {
@@ -1426,7 +1426,7 @@ func LookupAutomationWorkflowByID(ctx context.Context, s AutomationWorkflows, id
 
 // LookupAutomationWorkflowByHandle searches for workflow by their handle
 //
-// It returns only valid workflows
+// # It returns only valid workflows
 //
 // This function is auto-generated
 func LookupAutomationWorkflowByHandle(ctx context.Context, s AutomationWorkflows, handle string) (*automationType.Workflow, error) {
@@ -1540,7 +1540,7 @@ func TruncateComposeCharts(ctx context.Context, s ComposeCharts) error {
 
 // LookupComposeChartByID searches for compose chart by ID
 //
-// It returns compose chart even if deleted
+// # It returns compose chart even if deleted
 //
 // This function is auto-generated
 func LookupComposeChartByID(ctx context.Context, s ComposeCharts, id uint64) (*composeType.Chart, error) {
@@ -1619,7 +1619,7 @@ func LookupComposeModuleByNamespaceIDName(ctx context.Context, s ComposeModules,
 
 // LookupComposeModuleByID searches for compose module by ID
 //
-// It returns compose module even if deleted
+// # It returns compose module even if deleted
 //
 // This function is auto-generated
 func LookupComposeModuleByID(ctx context.Context, s ComposeModules, id uint64) (*composeType.Module, error) {
@@ -1747,7 +1747,7 @@ func LookupComposeNamespaceBySlug(ctx context.Context, s ComposeNamespaces, slug
 
 // LookupComposeNamespaceByID searches for compose namespace by ID
 //
-// It returns compose namespace even if deleted
+// # It returns compose namespace even if deleted
 //
 // This function is auto-generated
 func LookupComposeNamespaceByID(ctx context.Context, s ComposeNamespaces, id uint64) (*composeType.Namespace, error) {
@@ -1819,7 +1819,7 @@ func LookupComposePageByNamespaceIDModuleID(ctx context.Context, s ComposePages,
 
 // LookupComposePageByID searches for compose page by ID
 //
-// It returns compose page even if deleted
+// # It returns compose page even if deleted
 //
 // This function is auto-generated
 func LookupComposePageByID(ctx context.Context, s ComposePages, id uint64) (*composeType.Page, error) {
@@ -1884,7 +1884,7 @@ func TruncateCredentials(ctx context.Context, s Credentials) error {
 
 // LookupCredentialByID searches for credentials by ID
 //
-// It returns credentials even if deleted
+// # It returns credentials even if deleted
 //
 // This function is auto-generated
 func LookupCredentialByID(ctx context.Context, s Credentials, id uint64) (*systemType.Credential, error) {
@@ -1942,7 +1942,7 @@ func TruncateDalConnections(ctx context.Context, s DalConnections) error {
 
 // LookupDalConnectionByID searches for connection by ID
 //
-// It returns connection even if deleted or suspended
+// # It returns connection even if deleted or suspended
 //
 // This function is auto-generated
 func LookupDalConnectionByID(ctx context.Context, s DalConnections, id uint64) (*systemType.DalConnection, error) {
@@ -2009,7 +2009,7 @@ func TruncateDalSensitivityLevels(ctx context.Context, s DalSensitivityLevels) e
 
 // LookupDalSensitivityLevelByID searches for user by ID
 //
-// It returns user even if deleted or suspended
+// # It returns user even if deleted or suspended
 //
 // This function is auto-generated
 func LookupDalSensitivityLevelByID(ctx context.Context, s DalSensitivityLevels, id uint64) (*systemType.DalSensitivityLevel, error) {
@@ -2067,7 +2067,7 @@ func TruncateDataPrivacyRequests(ctx context.Context, s DataPrivacyRequests) err
 
 // LookupDataPrivacyRequestByID searches for data privacy request by ID
 //
-// It returns data privacy request even if deleted
+// # It returns data privacy request even if deleted
 //
 // This function is auto-generated
 func LookupDataPrivacyRequestByID(ctx context.Context, s DataPrivacyRequests, id uint64) (*systemType.DataPrivacyRequest, error) {
@@ -2174,7 +2174,7 @@ func TruncateFederationExposedModules(ctx context.Context, s FederationExposedMo
 
 // LookupFederationExposedModuleByID searches for federation module by ID
 //
-// It returns federation module
+// # It returns federation module
 //
 // This function is auto-generated
 func LookupFederationExposedModuleByID(ctx context.Context, s FederationExposedModules, id uint64) (*federationType.ExposedModule, error) {
@@ -2225,7 +2225,7 @@ func TruncateFederationModuleMappings(ctx context.Context, s FederationModuleMap
 
 // LookupFederationModuleMappingByFederationModuleIDComposeModuleIDComposeNamespaceID searches for module mapping by federation module id and compose module id
 //
-// It returns module mapping
+// # It returns module mapping
 //
 // This function is auto-generated
 func LookupFederationModuleMappingByFederationModuleIDComposeModuleIDComposeNamespaceID(ctx context.Context, s FederationModuleMappings, federationModuleID uint64, composeModuleID uint64, composeNamespaceID uint64) (*federationType.ModuleMapping, error) {
@@ -2234,7 +2234,7 @@ func LookupFederationModuleMappingByFederationModuleIDComposeModuleIDComposeName
 
 // LookupFederationModuleMappingByFederationModuleID searches for module mapping by federation module id
 //
-// It returns module mapping
+// # It returns module mapping
 //
 // This function is auto-generated
 func LookupFederationModuleMappingByFederationModuleID(ctx context.Context, s FederationModuleMappings, federationModuleID uint64) (*federationType.ModuleMapping, error) {
@@ -2292,7 +2292,7 @@ func TruncateFederationNodes(ctx context.Context, s FederationNodes) error {
 
 // LookupFederationNodeByID searches for federation node by ID
 //
-// It returns federation node
+// # It returns federation node
 //
 // This function is auto-generated
 func LookupFederationNodeByID(ctx context.Context, s FederationNodes, id uint64) (*federationType.Node, error) {
@@ -2364,7 +2364,7 @@ func TruncateFederationNodeSyncs(ctx context.Context, s FederationNodeSyncs) err
 
 // LookupFederationNodeSyncByNodeID searches for sync activity by node ID
 //
-// It returns sync activity
+// # It returns sync activity
 //
 // This function is auto-generated
 func LookupFederationNodeSyncByNodeID(ctx context.Context, s FederationNodeSyncs, nodeID uint64) (*federationType.NodeSync, error) {
@@ -2373,7 +2373,7 @@ func LookupFederationNodeSyncByNodeID(ctx context.Context, s FederationNodeSyncs
 
 // LookupFederationNodeSyncByNodeIDModuleIDSyncTypeSyncStatus searches for activity by node, type and status
 //
-// It returns sync activity
+// # It returns sync activity
 //
 // This function is auto-generated
 func LookupFederationNodeSyncByNodeIDModuleIDSyncTypeSyncStatus(ctx context.Context, s FederationNodeSyncs, nodeID uint64, moduleID uint64, syncType string, syncStatus string) (*federationType.NodeSync, error) {
@@ -2431,7 +2431,7 @@ func TruncateFederationSharedModules(ctx context.Context, s FederationSharedModu
 
 // LookupFederationSharedModuleByID searches for shared federation module by ID
 //
-// It returns shared federation module
+// # It returns shared federation module
 //
 // This function is auto-generated
 func LookupFederationSharedModuleByID(ctx context.Context, s FederationSharedModules, id uint64) (*federationType.SharedModule, error) {
@@ -2832,7 +2832,7 @@ func TruncateReports(ctx context.Context, s Reports) error {
 
 // LookupReportByID searches for report by ID
 //
-// It returns report even if deleted
+// # It returns report even if deleted
 //
 // This function is auto-generated
 func LookupReportByID(ctx context.Context, s Reports, id uint64) (*systemType.Report, error) {
@@ -2841,7 +2841,7 @@ func LookupReportByID(ctx context.Context, s Reports, id uint64) (*systemType.Re
 
 // LookupReportByHandle searches for report by handle
 //
-// It returns report if deleted
+// # It returns report if deleted
 //
 // This function is auto-generated
 func LookupReportByHandle(ctx context.Context, s Reports, handle string) (*systemType.Report, error) {
@@ -3012,7 +3012,7 @@ func TruncateRoles(ctx context.Context, s Roles) error {
 
 // LookupRoleByID searches for role by ID
 //
-// It returns role even if deleted or suspended
+// # It returns role even if deleted or suspended
 //
 // This function is auto-generated
 func LookupRoleByID(ctx context.Context, s Roles, id uint64) (*systemType.Role, error) {
@@ -3274,7 +3274,7 @@ func TruncateUsers(ctx context.Context, s Users) error {
 
 // LookupUserByID searches for user by ID
 //
-// It returns user even if deleted or suspended
+// # It returns user even if deleted or suspended
 //
 // This function is auto-generated
 func LookupUserByID(ctx context.Context, s Users, id uint64) (*systemType.User, error) {

server/system/model/corteza.gen.go

@@ -7,9 +7,9 @@ package model
 //
 
 import (
+	discoverytype "github.com/cortezaproject/corteza/server/discovery/types"
 	actionlogtype "github.com/cortezaproject/corteza/server/pkg/actionlog"
 	"github.com/cortezaproject/corteza/server/pkg/dal"
-	discoverytype "github.com/cortezaproject/corteza/server/pkg/discovery/types"
 	flagtype "github.com/cortezaproject/corteza/server/pkg/flag/types"
 	labelstype "github.com/cortezaproject/corteza/server/pkg/label/types"
 	rbactype "github.com/cortezaproject/corteza/server/pkg/rbac"

server/system/service/service.go

@@ -5,12 +5,10 @@ import (
 	"errors"
 	"time"
 
-	"github.com/cortezaproject/corteza/server/pkg/dal"
-	"github.com/cortezaproject/corteza/server/pkg/discovery"
-	"github.com/cortezaproject/corteza/server/pkg/valuestore"
-
 	automationService "github.com/cortezaproject/corteza/server/automation/service"
+	discoveryService "github.com/cortezaproject/corteza/server/discovery/service"
 	"github.com/cortezaproject/corteza/server/pkg/actionlog"
+	"github.com/cortezaproject/corteza/server/pkg/dal"
 	"github.com/cortezaproject/corteza/server/pkg/eventbus"
 	"github.com/cortezaproject/corteza/server/pkg/healthcheck"
 	"github.com/cortezaproject/corteza/server/pkg/id"
@@ -20,6 +18,7 @@ import (
 	"github.com/cortezaproject/corteza/server/pkg/objstore/plain"
 	"github.com/cortezaproject/corteza/server/pkg/options"
 	"github.com/cortezaproject/corteza/server/pkg/rbac"
+	"github.com/cortezaproject/corteza/server/pkg/valuestore"
 	"github.com/cortezaproject/corteza/server/store"
 	"github.com/cortezaproject/corteza/server/system/automation"
 	"github.com/cortezaproject/corteza/server/system/types"
@@ -141,9 +140,9 @@ func Initialize(ctx context.Context, log *zap.Logger, s store.Storer, ws websock
 			l = zap.NewNop()
 		}
 
-		DefaultResourceActivityLog := discovery.Service(l, c.Discovery, DefaultStore, eventbus.Service())
-		err = DefaultResourceActivityLog.InitResourceActivityLog(ctx, []string{
-			//(types.User{}).RbacResource(), // @todo user?? suppose to be system:user
+		DefaultResourceActivity := discoveryService.ResourceActivity(l, c.Discovery, DefaultStore, eventbus.Service())
+		err = DefaultResourceActivity.InitResourceActivityLog(ctx, []string{
+			// (types.User{}).RbacResource(), // @todo user?? suppose to be system:user
 			"system:user",
 		})
 		if err != nil {

server/tests/system/resource_activity_log_test.go

@@ -2,7 +2,7 @@ package system
 
 import (
 	"context"
-	discoveryType "github.com/cortezaproject/corteza/server/pkg/discovery/types"
+	discoveryType "github.com/cortezaproject/corteza/server/discovery/types"
 	"github.com/cortezaproject/corteza/server/pkg/id"
 	"github.com/cortezaproject/corteza/server/store"
 	"github.com/cortezaproject/corteza/server/system/service"