Skip to content

Commit cfd6ee0

Browse files
frzifusfrzifus
committed
internal/manifests/collector: evaluate returned error value in tests
Signed-off-by: Benedikt Bongartz <[email protected]>
1 parent d912a54 commit cfd6ee0

6 files changed

+136
-65
lines changed

‎internal/manifests/collector/daemonset_test.go

+37-18
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"testing"
1919

2020
"github.com/stretchr/testify/assert"
21+
"github.com/stretchr/testify/require"
2122
appsv1 "k8s.io/api/apps/v1"
2223
v1 "k8s.io/api/core/v1"
2324
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -46,7 +47,8 @@ func TestDaemonSetNewDefault(t *testing.T) {
4647
}
4748

4849
// test
49-
d, _ := DaemonSet(params)
50+
d, err := DaemonSet(params)
51+
require.NoError(t, err)
5052

5153
// verify
5254
assert.Equal(t, "my-instance-collector", d.Name)
@@ -104,7 +106,8 @@ func TestDaemonsetHostNetwork(t *testing.T) {
104106
Log: logger,
105107
}
106108
// test
107-
d1, _ := DaemonSet(params1)
109+
d1, err := DaemonSet(params1)
110+
require.NoError(t, err)
108111
assert.False(t, d1.Spec.Template.Spec.HostNetwork)
109112
assert.Equal(t, d1.Spec.Template.Spec.DNSPolicy, v1.DNSClusterFirst)
110113

@@ -122,7 +125,8 @@ func TestDaemonsetHostNetwork(t *testing.T) {
122125
},
123126
Log: logger,
124127
}
125-
d2, _ := DaemonSet(params2)
128+
d2, err := DaemonSet(params2)
129+
require.NoError(t, err)
126130
assert.True(t, d2.Spec.Template.Spec.HostNetwork)
127131
assert.Equal(t, d2.Spec.Template.Spec.DNSPolicy, v1.DNSClusterFirstWithHostNet)
128132
}
@@ -147,7 +151,8 @@ func TestDaemonsetPodAnnotations(t *testing.T) {
147151
}
148152

149153
// test
150-
ds, _ := DaemonSet(params)
154+
ds, err := DaemonSet(params)
155+
require.NoError(t, err)
151156

152157
// Add sha256 podAnnotation
153158
testPodAnnotationValues["opentelemetry-operator-config/sha256"] = "fbcdae6a02b2115cd5ca4f34298202ab041d1dfe62edebfaadb48b1ee178231d"
@@ -192,7 +197,8 @@ func TestDaemonstPodSecurityContext(t *testing.T) {
192197
Log: logger,
193198
}
194199

195-
d, _ := DaemonSet(params)
200+
d, err := DaemonSet(params)
201+
require.NoError(t, err)
196202

197203
assert.Equal(t, &runAsNonRoot, d.Spec.Template.Spec.SecurityContext.RunAsNonRoot)
198204
assert.Equal(t, &runAsUser, d.Spec.Template.Spec.SecurityContext.RunAsUser)
@@ -221,7 +227,8 @@ func TestDaemonsetFilterLabels(t *testing.T) {
221227
Log: logger,
222228
}
223229

224-
d, _ := DaemonSet(params)
230+
d, err := DaemonSet(params)
231+
require.NoError(t, err)
225232

226233
assert.Len(t, d.ObjectMeta.Labels, 6)
227234
for k := range excludedLabels {
@@ -245,7 +252,8 @@ func TestDaemonSetNodeSelector(t *testing.T) {
245252
Log: logger,
246253
}
247254

248-
d1, _ := DaemonSet(params1)
255+
d1, err := DaemonSet(params1)
256+
require.NoError(t, err)
249257

250258
assert.Empty(t, d1.Spec.Template.Spec.NodeSelector)
251259

@@ -270,7 +278,8 @@ func TestDaemonSetNodeSelector(t *testing.T) {
270278
Log: logger,
271279
}
272280

273-
d2, _ := DaemonSet(params2)
281+
d2, err := DaemonSet(params2)
282+
require.NoError(t, err)
274283
assert.Equal(t, d2.Spec.Template.Spec.NodeSelector, map[string]string{"node-key": "node-value"})
275284
}
276285

@@ -289,7 +298,8 @@ func TestDaemonSetPriorityClassName(t *testing.T) {
289298
Log: logger,
290299
}
291300

292-
d1, _ := DaemonSet(params1)
301+
d1, err := DaemonSet(params1)
302+
require.NoError(t, err)
293303
assert.Empty(t, d1.Spec.Template.Spec.PriorityClassName)
294304

295305
priorityClassName := "test-class"
@@ -311,7 +321,8 @@ func TestDaemonSetPriorityClassName(t *testing.T) {
311321
Log: logger,
312322
}
313323

314-
d2, _ := DaemonSet(params2)
324+
d2, err := DaemonSet(params2)
325+
require.NoError(t, err)
315326
assert.Equal(t, priorityClassName, d2.Spec.Template.Spec.PriorityClassName)
316327
}
317328

@@ -330,7 +341,8 @@ func TestDaemonSetAffinity(t *testing.T) {
330341
Log: logger,
331342
}
332343

333-
d1, _ := DaemonSet(params1)
344+
d1, err := DaemonSet(params1)
345+
require.NoError(t, err)
334346
assert.Nil(t, d1.Spec.Template.Spec.Affinity)
335347

336348
otelcol2 := v1alpha1.OpenTelemetryCollector{
@@ -350,7 +362,8 @@ func TestDaemonSetAffinity(t *testing.T) {
350362
Log: logger,
351363
}
352364

353-
d2, _ := DaemonSet(params2)
365+
d2, err := DaemonSet(params2)
366+
require.NoError(t, err)
354367
assert.NotNil(t, d2.Spec.Template.Spec.Affinity)
355368
assert.Equal(t, *testAffinityValue, *d2.Spec.Template.Spec.Affinity)
356369
}
@@ -379,7 +392,8 @@ func TestDaemonSetInitContainer(t *testing.T) {
379392
}
380393

381394
// test
382-
d, _ := DaemonSet(params)
395+
d, err := DaemonSet(params)
396+
require.NoError(t, err)
383397
assert.Equal(t, "my-instance-collector", d.Name)
384398
assert.Equal(t, "my-instance-collector", d.Labels["app.kubernetes.io/name"])
385399
assert.Equal(t, "true", d.Annotations["prometheus.io/scrape"])
@@ -412,7 +426,8 @@ func TestDaemonSetAdditionalContainer(t *testing.T) {
412426
}
413427

414428
// test
415-
d, _ := DaemonSet(params)
429+
d, err := DaemonSet(params)
430+
require.NoError(t, err)
416431
assert.Equal(t, "my-instance-collector", d.Name)
417432
assert.Equal(t, "my-instance-collector", d.Labels["app.kubernetes.io/name"])
418433
assert.Equal(t, "true", d.Annotations["prometheus.io/scrape"])
@@ -448,7 +463,8 @@ func TestDaemonSetDefaultUpdateStrategy(t *testing.T) {
448463
}
449464

450465
// test
451-
d, _ := DaemonSet(params)
466+
d, err := DaemonSet(params)
467+
require.NoError(t, err)
452468
assert.Equal(t, "my-instance-collector", d.Name)
453469
assert.Equal(t, "my-instance-collector", d.Labels["app.kubernetes.io/name"])
454470
assert.Equal(t, appsv1.DaemonSetUpdateStrategyType("RollingUpdate"), d.Spec.UpdateStrategy.Type)
@@ -482,7 +498,8 @@ func TestDaemonSetOnDeleteUpdateStrategy(t *testing.T) {
482498
}
483499

484500
// test
485-
d, _ := DaemonSet(params)
501+
d, err := DaemonSet(params)
502+
require.NoError(t, err)
486503
assert.Equal(t, "my-instance-collector", d.Name)
487504
assert.Equal(t, "my-instance-collector", d.Labels["app.kubernetes.io/name"])
488505
assert.Equal(t, appsv1.DaemonSetUpdateStrategyType("OnDelete"), d.Spec.UpdateStrategy.Type)
@@ -502,7 +519,8 @@ func TestDaemonsetShareProcessNamespace(t *testing.T) {
502519
Log: logger,
503520
}
504521
// test
505-
d1, _ := DaemonSet(params1)
522+
d1, err := DaemonSet(params1)
523+
require.NoError(t, err)
506524
assert.False(t, *d1.Spec.Template.Spec.ShareProcessNamespace)
507525

508526
// verify custom
@@ -518,6 +536,7 @@ func TestDaemonsetShareProcessNamespace(t *testing.T) {
518536
},
519537
Log: logger,
520538
}
521-
d2, _ := DaemonSet(params2)
539+
d2, err := DaemonSet(params2)
540+
require.NoError(t, err)
522541
assert.True(t, *d2.Spec.Template.Spec.ShareProcessNamespace)
523542
}

0 commit comments

Comments
 (0)