Skip to content

Commit 59f9205

Browse files
vivekr-splunkvivekr-splunk
committed
fixed unit test cases
Signed-off-by: Vivek Reddy <[email protected]>
1 parent c6044a1 commit 59f9205

16 files changed

+294
-75
lines changed

‎.github/workflows/build-test-push-workflow.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ jobs:
3636
run: |
3737
make setup/ginkgo
3838
go mod tidy
39-
#- name: Run Unit Tests
40-
# run: |
41-
# echo "commenting for now"
42-
# # make test
43-
#- name: Run Code Coverage
44-
# run: goveralls -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }}
45-
#- name: Upload Coverage artifacts
46-
# uses: actions/[email protected]
47-
# with:
48-
# name: coverage.out
49-
# path: coverage.out
39+
- name: Run Unit Tests
40+
run: |
41+
echo "commenting for now"
42+
# make test
43+
- name: Run Code Coverage
44+
run: goveralls -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }}
45+
- name: Upload Coverage artifacts
46+
uses: actions/[email protected]
47+
with:
48+
name: coverage.out
49+
path: coverage.out
5050
build-operator-image:
5151
runs-on: ubuntu-latest
5252
needs: unit-tests

‎pkg/splunk/common/types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ type MetaObject interface {
3232
schema.ObjectKind
3333
runtime.Object
3434
GetObjectMeta() metav1.Object
35+
GetObjectKind() schema.ObjectKind
3536
}
3637

3738
// The ControllerClient interfaces implements methods of the Kubernetes controller-runtime client

‎pkg/splunk/enterprise/clustermanager_test.go‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ import (
1919
"context"
2020
"errors"
2121
"fmt"
22+
enterpriseApi "github.com/splunk/splunk-operator/api/v4"
2223
"io"
24+
"k8s.io/apimachinery/pkg/runtime/schema"
2325
"os"
2426
"path/filepath"
2527
"runtime/debug"
2628
"strings"
2729
"testing"
2830
"time"
29-
"k8s.io/apimachinery/pkg/runtime/schema"
30-
enterpriseApi "github.com/splunk/splunk-operator/api/v4"
3131

3232
appsv1 "k8s.io/api/apps/v1"
3333
corev1 "k8s.io/api/core/v1"
@@ -74,6 +74,7 @@ func TestApplyClusterManager(t *testing.T) {
7474
updateFuncCalls := []spltest.MockFuncCall{
7575
{MetaName: "*v1.Secret-test-splunk-test-secret"},
7676
{MetaName: "*v1.Secret-test-splunk-test-secret"},
77+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-manager-stack1-configmap"},
7778
{MetaName: "*v1.Service-test-splunk-stack1-cluster-manager-service"},
7879
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-manager"},
7980
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
@@ -98,12 +99,13 @@ func TestApplyClusterManager(t *testing.T) {
9899
}
99100
listmockCall := []spltest.MockFuncCall{
100101
{ListOpts: listOpts}}
101-
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[3], funcCalls[6], funcCalls[8], funcCalls[4]}, "List": {listmockCall[0]}, "Update": {funcCalls[0]}}
102-
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[4]}, "List": {listmockCall[0]}}
102+
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[4], funcCalls[6], funcCalls[9], funcCalls[5]}, "List": {listmockCall[0]}, "Update": {funcCalls[0]}}
103+
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[5]}, "List": {listmockCall[0]}}
103104

104105
current := enterpriseApi.ClusterManager{
105106
TypeMeta: metav1.TypeMeta{
106-
Kind: "ClusterManager",
107+
Kind: "ClusterManager",
108+
APIVersion: "enterprise.splunk.com/v4",
107109
},
108110
ObjectMeta: metav1.ObjectMeta{
109111
Name: "stack1",
@@ -115,13 +117,16 @@ func TestApplyClusterManager(t *testing.T) {
115117
},
116118
},
117119
}
118-
var gvk schema.GroupVersionKind
119-
gvk.Kind = "SearchHead"
120-
gvk.Group = "enterprise.splunk.com"
121-
gvk.Version = "v4"
120+
// Define GroupVersionKind
121+
gvk := schema.GroupVersionKind{
122+
Group: "enterprise.splunk.com",
123+
Version: "v4",
124+
Kind: "ClusterManager",
125+
}
122126
current.SetGroupVersionKind(gvk)
123127
revised := current.DeepCopy()
124128
revised.Spec.Image = "splunk/test"
129+
revised.SetGroupVersionKind(gvk)
125130
reconcile := func(c *spltest.MockClient, cr interface{}) error {
126131
_, err := ApplyClusterManager(ctx, c, cr.(*enterpriseApi.ClusterManager))
127132
return err
@@ -499,6 +504,7 @@ func TestApplyClusterManagerWithSmartstore(t *testing.T) {
499504
{MetaName: "*v1.ConfigMap-test-splunk-stack1-clustermanager-smartstore"},
500505
{MetaName: "*v1.Secret-test-splunk-test-secret"},
501506
{MetaName: "*v1.Secret-test-splunk-test-secret"},
507+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-manager-stack1-configmap"},
502508
{MetaName: "*v1.Service-test-splunk-stack1-cluster-manager-service"},
503509
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-manager"},
504510
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
@@ -521,6 +527,7 @@ func TestApplyClusterManagerWithSmartstore(t *testing.T) {
521527
{MetaName: "*v1.ConfigMap-test-splunk-stack1-clustermanager-smartstore"},
522528
{MetaName: "*v1.Secret-test-splunk-test-secret"},
523529
{MetaName: "*v1.Secret-test-splunk-test-secret"},
530+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-manager-stack1-configmap"},
524531
{MetaName: "*v1.Service-test-splunk-stack1-cluster-manager-service"},
525532
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-manager"},
526533
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
@@ -550,8 +557,8 @@ func TestApplyClusterManagerWithSmartstore(t *testing.T) {
550557
{ListOpts: listOpts},
551558
{ListOpts: listOpts1},
552559
}
553-
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[7], funcCalls[10], funcCalls[12]}, "List": {listmockCall[0], listmockCall[0], listmockCall[1]}, "Update": {funcCalls[0], funcCalls[3], funcCalls[13]}}
554-
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[8]}, "List": {listmockCall[0]}}
560+
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[7], funcCalls[8], funcCalls[11], funcCalls[13]}, "List": {listmockCall[0], listmockCall[0], listmockCall[1]}, "Update": {funcCalls[0], funcCalls[3], funcCalls[14]}}
561+
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[9]}, "List": {listmockCall[0]}}
555562

556563
current := enterpriseApi.ClusterManager{
557564
TypeMeta: metav1.TypeMeta{
@@ -943,8 +950,9 @@ func TestApplyClusterManagerDeletion(t *testing.T) {
943950

944951
// Create S3 secret
945952
s3Secret := spltest.GetMockS3SecretKeys("s3-secret")
946-
947953
c.AddObject(&s3Secret)
954+
configmap := spltest.GetMockPerCRConfigMap("splunk-cluster-manager-stack1-configmap")
955+
c.AddObject(&configmap)
948956

949957
// Create namespace scoped secret
950958
_, err := splutil.ApplyNamespaceScopedSecretObject(ctx, c, "test")

‎pkg/splunk/enterprise/clustermaster_test.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ func TestApplyClusterMaster(t *testing.T) {
5656
{MetaName: "*v1.Secret-test-splunk-test-secret"},
5757
{MetaName: "*v1.Secret-test-splunk-test-secret"},
5858
{MetaName: "*v1.Secret-test-splunk-test-secret"},
59+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-master-stack1-configmap"},
5960
{MetaName: "*v1.Service-test-splunk-stack1-indexer-service"},
6061
{MetaName: "*v1." + splcommon.TestStack1ClusterManagerService},
6162
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-master"},
@@ -73,6 +74,7 @@ func TestApplyClusterMaster(t *testing.T) {
7374
updateFuncCalls := []spltest.MockFuncCall{
7475
{MetaName: "*v1.Secret-test-splunk-test-secret"},
7576
{MetaName: "*v1.Secret-test-splunk-test-secret"},
77+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-master-stack1-configmap"},
7678
{MetaName: "*v1.Service-test-splunk-stack1-indexer-service"},
7779
{MetaName: "*v1." + splcommon.TestStack1ClusterManagerService},
7880
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-master"},
@@ -98,8 +100,8 @@ func TestApplyClusterMaster(t *testing.T) {
98100
}
99101
listmockCall := []spltest.MockFuncCall{
100102
{ListOpts: listOpts}}
101-
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[4], funcCalls[7], funcCalls[9], funcCalls[5]}, "List": {listmockCall[0]}, "Update": {funcCalls[0]}}
102-
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[5]}, "List": {listmockCall[0]}}
103+
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[4], funcCalls[5], funcCalls[8], funcCalls[10], funcCalls[6]}, "List": {listmockCall[0]}, "Update": {funcCalls[0]}}
104+
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[6]}, "List": {listmockCall[0]}}
103105

104106
current := enterpriseApiV3.ClusterMaster{
105107
TypeMeta: metav1.TypeMeta{
@@ -203,6 +205,7 @@ func TestApplyClusterMasterWithSmartstore(t *testing.T) {
203205
{MetaName: "*v1." + splcommon.TestStack1ClusterManagerConfigMapSmartStore},
204206
{MetaName: "*v1.Secret-test-splunk-test-secret"},
205207
{MetaName: "*v1.Secret-test-splunk-test-secret"},
208+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-master-stack1-configmap"},
206209
{MetaName: "*v1.Service-test-splunk-stack1-indexer-service"},
207210
{MetaName: "*v1.Service-test-splunk-stack1-cluster-master-service"},
208211
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-master"},
@@ -226,6 +229,7 @@ func TestApplyClusterMasterWithSmartstore(t *testing.T) {
226229
{MetaName: "*v1." + splcommon.TestStack1ClusterManagerConfigMapSmartStore},
227230
{MetaName: "*v1.Secret-test-splunk-test-secret"},
228231
{MetaName: "*v1.Secret-test-splunk-test-secret"},
232+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-master-stack1-configmap"},
229233
{MetaName: "*v1.Service-test-splunk-stack1-indexer-service"},
230234
{MetaName: "*v1.Service-test-splunk-stack1-cluster-master-service"},
231235
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-master"},
@@ -251,8 +255,8 @@ func TestApplyClusterMasterWithSmartstore(t *testing.T) {
251255
}
252256
listmockCall := []spltest.MockFuncCall{
253257
{ListOpts: listOpts}}
254-
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[7], funcCalls[8], funcCalls[11], funcCalls[13]}, "List": {listmockCall[0], listmockCall[0]}, "Update": {funcCalls[0], funcCalls[3], funcCalls[14]}}
255-
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[9]}, "List": {listmockCall[0]}}
258+
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[7], funcCalls[8], funcCalls[9], funcCalls[12], funcCalls[14]}, "List": {listmockCall[0], listmockCall[0]}, "Update": {funcCalls[0], funcCalls[3], funcCalls[15]}}
259+
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[10]}, "List": {listmockCall[0]}}
256260

257261
current := enterpriseApiV3.ClusterMaster{
258262
TypeMeta: metav1.TypeMeta{
@@ -636,8 +640,9 @@ func TestApplyCLusterMasterDeletion(t *testing.T) {
636640

637641
// Create S3 secret
638642
s3Secret := spltest.GetMockS3SecretKeys("s3-secret")
639-
640643
c.AddObject(&s3Secret)
644+
configmap := spltest.GetMockPerCRConfigMap("splunk-cluster-master-stack1-configmap")
645+
c.AddObject(&configmap)
641646

642647
// Create namespace scoped secret
643648
_, err := splutil.ApplyNamespaceScopedSecretObject(ctx, c, "test")

‎pkg/splunk/enterprise/finalizers_test.go‎

Lines changed: 100 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,48 +139,105 @@ func splunkDeletionTester(t *testing.T, cr splcommon.MetaObject, delete func(spl
139139

140140
switch cr.GetObjectKind().GroupVersionKind().Kind {
141141
case "Standalone":
142-
mockCalls["Get"] = append(mockCalls["Get"], []spltest.MockFuncCall{
143-
//{MetaName: "*v1.ConfigMap-test-splunk-standalone-stack1-configmap"},
142+
mockCalls["Get"] = []spltest.MockFuncCall{
143+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
144+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
145+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
146+
{MetaName: "*v1.ConfigMap-test-splunk-standalone-stack1-configmap"},
144147
{MetaName: "*v1.Secret-test-splunk-test-secret"},
145148
{MetaName: "*v1.StatefulSet-test-splunk-stack1-standalone"},
146149
{MetaName: "*v4.Standalone-test-stack1"},
147150
{MetaName: "*v4.Standalone-test-stack1"},
148-
}...)
151+
}
152+
mockCalls["Create"] = []spltest.MockFuncCall{
153+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
154+
{MetaName: "*v1.ConfigMap-test-splunk-standalone-stack1-configmap"},
155+
}
149156

150157
case "LicenseMaster":
151-
mockCalls["Get"] = append(mockCalls["Get"], []spltest.MockFuncCall{
158+
mockCalls["Get"] = []spltest.MockFuncCall{
159+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
160+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
161+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
162+
{MetaName: "*v1.ConfigMap-test-splunk-license-master-stack1-configmap"},
163+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
152164
{MetaName: "*v1.StatefulSet-test-splunk-stack1-license-master"},
153165
{MetaName: "*v3.LicenseMaster-test-stack1"},
154166
{MetaName: "*v3.LicenseMaster-test-stack1"},
155-
}...)
167+
}
168+
mockCalls["Create"] = []spltest.MockFuncCall{
169+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
170+
{MetaName: "*v1.ConfigMap-test-splunk-license-master-stack1-configmap"},
171+
}
156172

157173
case "LicenseManager":
158-
mockCalls["Get"] = append(mockCalls["Get"], []spltest.MockFuncCall{
174+
mockCalls["Get"] = []spltest.MockFuncCall{
175+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
176+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
177+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
178+
{MetaName: "*v1.ConfigMap-test-splunk-license-manager-stack1-configmap"},
179+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
159180
{MetaName: "*v1.StatefulSet-test-splunk-stack1-license-manager"},
160181
{MetaName: "*v4.LicenseManager-test-stack1"},
161182
{MetaName: "*v4.LicenseManager-test-stack1"},
162-
}...)
183+
}
184+
mockCalls["Create"] = []spltest.MockFuncCall{
185+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
186+
{MetaName: "*v1.ConfigMap-test-splunk-license-manager-stack1-configmap"},
187+
}
163188

164189
case "SearchHeadCluster":
165-
mockCalls["Get"] = append(mockCalls["Get"], []spltest.MockFuncCall{
190+
mockCalls["Get"] = []spltest.MockFuncCall{
191+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
192+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
193+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
194+
{MetaName: "*v1.ConfigMap-test-splunk-search-head-stack1-configmap"},
195+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
166196
{MetaName: "*v1.StatefulSet-test-splunk-stack1-search-head"},
167197
{MetaName: "*v4.SearchHeadCluster-test-stack1"},
168198
{MetaName: "*v4.SearchHeadCluster-test-stack1"},
169-
}...)
199+
}
200+
mockCalls["Create"] = []spltest.MockFuncCall{
201+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
202+
{MetaName: "*v1.ConfigMap-test-splunk-search-head-stack1-configmap"},
203+
}
170204

171205
case "ClusterMaster":
172-
mockCalls["Get"] = append(mockCalls["Get"], []spltest.MockFuncCall{
206+
mockCalls["Get"] = []spltest.MockFuncCall{
207+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
208+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
209+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
210+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-master-stack1-configmap"},
211+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
173212
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-master"},
174213
{MetaName: "*v3.ClusterMaster-test-stack1"},
175214
{MetaName: "*v3.ClusterMaster-test-stack1"},
176-
}...)
215+
}
216+
mockCalls["Create"] = []spltest.MockFuncCall{
217+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
218+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-master-stack1-configmap"},
219+
}
220+
case "IndexerCluster":
221+
mockCalls["Create"] = []spltest.MockFuncCall{
222+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
223+
{MetaName: "*v1.ConfigMap-test-splunk-indexer-stack1-configmap"},
224+
}
177225

178226
case "ClusterManager":
179-
mockCalls["Get"] = append(mockCalls["Get"], []spltest.MockFuncCall{
227+
mockCalls["Get"] = []spltest.MockFuncCall{
228+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
229+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
230+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
231+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-manager-stack1-configmap"},
232+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
180233
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-manager"},
181234
{MetaName: "*v4.ClusterManager-test-stack1"},
182235
{MetaName: "*v4.ClusterManager-test-stack1"},
183-
}...)
236+
}
237+
mockCalls["Create"] = []spltest.MockFuncCall{
238+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
239+
{MetaName: "*v1.ConfigMap-test-splunk-cluster-manager-stack1-configmap"},
240+
}
184241

185242
listOptsTest := []client.ListOption{
186243
client.InNamespace(cr.GetNamespace()),
@@ -194,8 +251,18 @@ func splunkDeletionTester(t *testing.T, cr splcommon.MetaObject, delete func(spl
194251
}...)
195252
mockCalls["List"][0], mockCalls["List"][len(mockCalls["List"])-1] = mockCalls["List"][len(mockCalls["List"])-1], mockCalls["List"][0]
196253
case "MonitoringConsole":
197-
mockCalls["Get"] = append(mockCalls["Get"], spltest.MockFuncCall{MetaName: "*v4.MonitoringConsole-test-stack1"})
198-
mockCalls["Get"] = append(mockCalls["Get"], spltest.MockFuncCall{MetaName: "*v4.MonitoringConsole-test-stack1"})
254+
mockCalls["Get"] = []spltest.MockFuncCall{
255+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
256+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
257+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
258+
{MetaName: "*v1.ConfigMap-test-splunk-monitoring-console-stack1-configmap"},
259+
{MetaName: "*v4.MonitoringConsole-test-stack1"},
260+
{MetaName: "*v4.MonitoringConsole-test-stack1"},
261+
}
262+
mockCalls["Create"] = []spltest.MockFuncCall{
263+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
264+
{MetaName: "*v1.ConfigMap-test-splunk-monitoring-console-stack1-configmap"},
265+
}
199266
}
200267
} else {
201268
mockCalls["Update"] = []spltest.MockFuncCall{
@@ -222,6 +289,24 @@ func splunkDeletionTester(t *testing.T, cr splcommon.MetaObject, delete func(spl
222289
{MetaName: "*v4.IndexerCluster-test-stack1"},
223290
{MetaName: "*v4.IndexerCluster-test-stack1"},
224291
}
292+
switch cr.GetObjectKind().GroupVersionKind().Kind {
293+
case "IndexerCluster":
294+
mockCalls["Create"] = []spltest.MockFuncCall{
295+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
296+
{MetaName: "*v1.ConfigMap-test-splunk-indexer-stack1-configmap"},
297+
}
298+
mockCalls["Get"] = []spltest.MockFuncCall{
299+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
300+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
301+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
302+
{MetaName: "*v1.ConfigMap-test-splunk-indexer-stack1-configmap"},
303+
{MetaName: "*v4.ClusterManager-test-manager1"},
304+
{MetaName: "*v1.Secret-test-splunk-test-secret"},
305+
{MetaName: "*v1.StatefulSet-test-splunk-stack1-indexer"},
306+
{MetaName: "*v4.IndexerCluster-test-stack1"},
307+
{MetaName: "*v4.IndexerCluster-test-stack1"},
308+
}
309+
}
225310
}
226311
}
227312

‎pkg/splunk/enterprise/indexercluster_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ func TestApplyIndexerCluster(t *testing.T) {
152152
{MetaName: "*v1.Secret-test-splunk-test-secret"},
153153
{MetaName: "*v1.Secret-test-splunk-test-secret"},
154154
{MetaName: "*v1.Secret-test-splunk-test-secret"},
155+
{MetaName: "*v1.ConfigMap-test-splunk-indexer-stack1-configmap"},
155156
{MetaName: "*v4.ClusterManager-test-manager1"},
156157
{MetaName: "*v1.Service-test-splunk-stack1-indexer-headless"},
157158
{MetaName: "*v1.Service-test-splunk-stack1-indexer-service"},
@@ -167,6 +168,7 @@ func TestApplyIndexerCluster(t *testing.T) {
167168
updateFuncCalls := []spltest.MockFuncCall{
168169
{MetaName: "*v1.Secret-test-splunk-test-secret"},
169170
{MetaName: "*v1.Secret-test-splunk-test-secret"},
171+
{MetaName: "*v1.ConfigMap-test-splunk-indexer-stack1-configmap"},
170172
{MetaName: "*v4.ClusterManager-test-manager1"},
171173
{MetaName: "*v1.Service-test-splunk-stack1-indexer-headless"},
172174
{MetaName: "*v1.Service-test-splunk-stack1-indexer-service"},
@@ -194,7 +196,7 @@ func TestApplyIndexerCluster(t *testing.T) {
194196
{ListOpts: listOpts},
195197
{ListOpts: listOpts1},
196198
}
197-
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[4], funcCalls[5], funcCalls[8], funcCalls[10]}, "Update": {funcCalls[0]}, "List": {listmockCall[0], listmockCall[1]}}
199+
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[5], funcCalls[6], funcCalls[9], funcCalls[11]}, "Update": {funcCalls[0]}, "List": {listmockCall[0], listmockCall[1]}}
198200
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "List": {listmockCall[0], listmockCall[1]}}
199201

200202
current := enterpriseApi.IndexerCluster{

0 commit comments

Comments
 (0)