chore: Convert Istio status checker mocks into stubs (#1473)

kyma-project · Sep 24, 2024 · 01c6d4d · 01c6d4d
1 parent 3abdc16
commit 01c6d4d
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 147 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -10,15 +10,13 @@ packages:
     interfaces:
       DaemonSetAnnotator:
       FlowHealthProber:
-      IstioStatusChecker:
       OverridesHandler:
       ErrorToMessageConverter:
   github.com/kyma-project/telemetry-manager/internal/reconciler/tracepipeline:
     interfaces:
       FlowHealthProber:
       GatewayApplierDeleter:
       GatewayConfigBuilder:
-      IstioStatusChecker:
       OverridesHandler:
       PipelineLock:
       ErrorToMessageConverter:
@@ -29,7 +27,6 @@ packages:
       FlowHealthProber:
       GatewayApplierDeleter:
       GatewayConfigBuilder:
-      IstioStatusChecker:
       OverridesHandler:
       PipelineLock:
       ErrorToMessageConverter:

diff --git a/internal/reconciler/logpipeline/mocks/istio_status_checker.go b/internal/reconciler/logpipeline/mocks/istio_status_checker.go
diff --git a/internal/reconciler/logpipeline/reconciler_test.go b/internal/reconciler/logpipeline/reconciler_test.go
@@ -45,8 +45,7 @@ func TestReconcile(t *testing.T) {
 	overridesHandlerStub := &mocks.OverridesHandler{}
 	overridesHandlerStub.On("LoadOverrides", context.Background()).Return(&overrides.Config{}, nil)
 
-	istioStatusCheckerStub := &mocks.IstioStatusChecker{}
-	istioStatusCheckerStub.On("IsIstioActive", mock.Anything).Return(false)
+	istioStatusCheckerStub := &stubs.IstioStatusChecker{IsActive: false}
 
 	testConfig := Config{
 		DaemonSet:             types.NamespacedName{Name: "test-telemetry-fluent-bit", Namespace: "default"},

diff --git a/internal/reconciler/logpipeline/stubs/istio_status_checker.go b/internal/reconciler/logpipeline/stubs/istio_status_checker.go
@@ -0,0 +1,13 @@
+package stubs
+
+import (
+	"context"
+)
+
+type IstioStatusChecker struct {
+	IsActive bool
+}
+
+func (i *IstioStatusChecker) IsIstioActive(ctx context.Context) bool {
+	return i.IsActive
+}
diff --git a/internal/reconciler/metricpipeline/mocks/istio_status_checker.go b/internal/reconciler/metricpipeline/mocks/istio_status_checker.go
diff --git a/internal/reconciler/metricpipeline/reconciler_test.go b/internal/reconciler/metricpipeline/reconciler_test.go
@@ -45,8 +45,7 @@ func TestReconcile(t *testing.T) {
 	overridesHandlerStub := &mocks.OverridesHandler{}
 	overridesHandlerStub.On("LoadOverrides", context.Background()).Return(&overrides.Config{}, nil)
 
-	istioStatusCheckerStub := &mocks.IstioStatusChecker{}
-	istioStatusCheckerStub.On("IsIstioActive", mock.Anything).Return(false)
+	istioStatusCheckerStub := &stubs.IstioStatusChecker{IsActive: false}
 
 	testConfig := Config{
 		Gateway: otelcollector.GatewayConfig{

diff --git a/internal/reconciler/metricpipeline/stubs/istio_status_checker.go b/internal/reconciler/metricpipeline/stubs/istio_status_checker.go
@@ -0,0 +1,13 @@
+package stubs
+
+import (
+	"context"
+)
+
+type IstioStatusChecker struct {
+	IsActive bool
+}
+
+func (i *IstioStatusChecker) IsIstioActive(ctx context.Context) bool {
+	return i.IsActive
+}
diff --git a/internal/reconciler/tracepipeline/mocks/istio_status_checker.go b/internal/reconciler/tracepipeline/mocks/istio_status_checker.go
diff --git a/internal/reconciler/tracepipeline/reconciler_test.go b/internal/reconciler/tracepipeline/reconciler_test.go
@@ -44,8 +44,7 @@ func TestReconcile(t *testing.T) {
 	overridesHandlerStub := &mocks.OverridesHandler{}
 	overridesHandlerStub.On("LoadOverrides", context.Background()).Return(&overrides.Config{}, nil)
 
-	istioStatusCheckerStub := &mocks.IstioStatusChecker{}
-	istioStatusCheckerStub.On("IsIstioActive", mock.Anything).Return(false)
+	istioStatusCheckerStub := &stubs.IstioStatusChecker{IsActive: false}
 
 	testConfig := Config{Gateway: otelcollector.GatewayConfig{
 		Config: otelcollector.Config{

diff --git a/internal/reconciler/tracepipeline/stubs/istio_status_checker.go b/internal/reconciler/tracepipeline/stubs/istio_status_checker.go
@@ -0,0 +1,13 @@
+package stubs
+
+import (
+	"context"
+)
+
+type IstioStatusChecker struct {
+	IsActive bool
+}
+
+func (i *IstioStatusChecker) IsIstioActive(ctx context.Context) bool {
+	return i.IsActive
+}