refactor: change function return types to pointers for KubeEventsManager and ScheduleManager for consistency

Signed-off-by: Evsyukov Denis <denis.evsyukov@flant.com>

Author: Evsyukov Denis

pkg/hook/controller/hook_controller.go

@@ -1,9 +1,8 @@
 package controller
 
 import (
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-
 	"github.com/deckhouse/deckhouse/pkg/log"
+	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
 	bctx "github.com/flant/shell-operator/pkg/hook/binding_context"
 	htypes "github.com/flant/shell-operator/pkg/hook/types"

pkg/hook/controller/kubernetes_bindings_controller.go

@@ -55,8 +55,11 @@ type kubernetesBindingsController struct {
 	BindingMonitorLinks map[string]*KubernetesBindingToMonitorLink
 }
 
+// kubernetesHooksController should implement the KubernetesHooksController
+var _ KubernetesBindingsController = (*kubernetesBindingsController)(nil)
+
 // NewKubernetesBindingsController returns an implementation of KubernetesBindingsController
-var NewKubernetesBindingsController = func(logger *log.Logger) KubernetesBindingsController {
+var NewKubernetesBindingsController = func(logger *log.Logger) *kubernetesBindingsController {
 	return &kubernetesBindingsController{
 		BindingMonitorLinks: make(map[string]*KubernetesBindingToMonitorLink),
 		logger:              logger,

pkg/hook/controller/schedule_bindings_controller.go

@@ -42,8 +42,11 @@ type scheduleBindingsController struct {
 	ScheduleBindings []htypes.ScheduleConfig
 }
 
+// kubernetesHooksController should implement the KubernetesHooksController
+var _ ScheduleBindingsController = (*scheduleBindingsController)(nil)
+
 // NewScheduleBindingsController returns an implementation of ScheduleBindingsController
-var NewScheduleBindingsController = func() ScheduleBindingsController {
+var NewScheduleBindingsController = func() *scheduleBindingsController {
 	return &scheduleBindingsController{
 		ScheduleLinks: make(map[string]*ScheduleBindingToCrontabLink),
 	}

pkg/hook/hook_manager.go

@@ -10,9 +10,8 @@ import (
 	"sort"
 	"strings"
 
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-
 	"github.com/deckhouse/deckhouse/pkg/log"
+	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
 	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/executor"

pkg/kube_events_manager/kube_events_manager.go

@@ -43,8 +43,11 @@ type kubeEventsManager struct {
 	logger *log.Logger
 }
 
+// kubeEventsManager should implement KubeEventsManager.
+var _ KubeEventsManager = (*kubeEventsManager)(nil)
+
 // NewKubeEventsManager returns an implementation of KubeEventsManager.
-func NewKubeEventsManager(ctx context.Context, client *klient.Client, logger *log.Logger) KubeEventsManager {
+func NewKubeEventsManager(ctx context.Context, client *klient.Client, logger *log.Logger) *kubeEventsManager {
 	cctx, cancel := context.WithCancel(ctx)
 	em := &kubeEventsManager{
 		ctx:         cctx,

pkg/kube_events_manager/kube_events_manager_test.go

@@ -6,16 +6,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/version"
 	fakediscovery "k8s.io/client-go/discovery/fake"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
-
 	klient "github.com/flant/kube-client/client"
 	kemtypes "github.com/flant/shell-operator/pkg/kube_events_manager/types"
 )
@@ -72,7 +70,9 @@ func Test_MainKubeEventsManager_Run(t *testing.T) {
 
 	err := mgr.AddMonitor(monitor)
 
-	require.NoError(t, err)
+	if assert.NoError(t, err) {
+		assert.Len(t, mgr.Monitors, 1)
+	}
 }
 
 // FIXME: sometimes fails, skip for now.
@@ -139,6 +139,7 @@ func Test_MainKubeEventsManager_HandleEvents(t *testing.T) {
 
 	// Init() replacement
 	mgr := NewKubeEventsManager(ctx, kubeClient, log.NewNop())
+	mgr.KubeEventCh = make(chan kemtypes.KubeEvent, 10)
 
 	// monitor with 3 namespaces and 4 object names and all event types
 	monitor := &MonitorConfig{

pkg/kube_events_manager/monitor.go

@@ -52,7 +52,9 @@ type monitor struct {
 	logger *log.Logger
 }
 
-func NewMonitor(ctx context.Context, client *klient.Client, mstor metric.Storage, config *MonitorConfig, eventCb func(kemtypes.KubeEvent), logger *log.Logger) Monitor {
+var _ Monitor = (*monitor)(nil)
+
+func NewMonitor(ctx context.Context, client *klient.Client, mstor metric.Storage, config *MonitorConfig, eventCb func(kemtypes.KubeEvent), logger *log.Logger) *monitor {
 	cctx, cancel := context.WithCancel(ctx)
 
 	return &monitor{

pkg/kube_events_manager/monitor_test.go

@@ -6,13 +6,12 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
-
 	"github.com/flant/kube-client/fake"
 	"github.com/flant/kube-client/manifest"
 	kemtypes "github.com/flant/shell-operator/pkg/kube_events_manager/types"

pkg/kube_events_manager/resource_informer.go

@@ -8,14 +8,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/gofrs/uuid/v5"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/deckhouse/deckhouse/pkg/log"
-
 	klient "github.com/flant/kube-client/client"
 	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/filter/jq"
@@ -67,7 +66,7 @@ type resourceInformer struct {
 	logger *log.Logger
 }
 
-// resourceInformer should implement resourceInformer
+// resourceInformer should implement ResourceInformer
 type resourceInformerConfig struct {
 	client  *klient.Client
 	mstor   metric.Storage

pkg/schedule_manager/schedule_manager.go

@@ -11,18 +11,19 @@ import (
 	smtypes "github.com/flant/shell-operator/pkg/schedule_manager/types"
 )
 
-type CronEntry struct {
-	EntryID cron.EntryID
-	Ids     map[string]bool
-}
-
 type ScheduleManager interface {
 	Stop()
 	Start()
 	Add(entry smtypes.ScheduleEntry)
 	Remove(entry smtypes.ScheduleEntry)
 	Ch() chan string
 }
+
+type CronEntry struct {
+	EntryID cron.EntryID
+	Ids     map[string]bool
+}
+
 type scheduleManager struct {
 	ctx        context.Context
 	cancel     context.CancelFunc
@@ -33,7 +34,9 @@ type scheduleManager struct {
 	logger *log.Logger
 }
 
-func NewScheduleManager(ctx context.Context, logger *log.Logger) ScheduleManager {
+var _ ScheduleManager = (*scheduleManager)(nil)
+
+func NewScheduleManager(ctx context.Context, logger *log.Logger) *scheduleManager {
 	cctx, cancel := context.WithCancel(ctx)
 	sm := &scheduleManager{
 		ctx:        cctx,