Skip to content

Commit 7ba6e02

Browse files
tmshorttmshort
committed
Boxcutter Preflight mock cleanup
Signed-off-by: Todd Short <[email protected]>
1 parent bfeb343 commit 7ba6e02

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

‎internal/operator-controller/applier/helm.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ type BundleToHelmChartConverter interface {
3636
}
3737

3838
type HelmReleaseToObjectsConverter struct {
39-
Mock bool
4039
}
4140

4241
type HelmReleaseToObjectsConverterInterface interface {
4342
GetObjectsFromRelease(rel *release.Release) ([]client.Object, error)
4443
}
4544

4645
func (h HelmReleaseToObjectsConverter) GetObjectsFromRelease(rel *release.Release) ([]client.Object, error) {
47-
if rel == nil || h.Mock {
46+
if rel == nil {
4847
return nil, nil
4948
}
5049

‎internal/operator-controller/applier/helm_test.go

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ func (mp *mockPreflight) Upgrade(context.Context, []client.Object) error {
5656
return mp.upgradeErr
5757
}
5858

59+
type mockHelmReleaseToObjectsConverter struct {
60+
}
61+
62+
func (mockHelmReleaseToObjectsConverter) GetObjectsFromRelease(*release.Release) ([]client.Object, error) {
63+
return nil, nil
64+
}
65+
5966
type mockActionGetter struct {
6067
actionClientForErr error
6168
getClientErr error
@@ -251,7 +258,7 @@ func TestApply_Installation(t *testing.T) {
251258
ActionClientGetter: mockAcg,
252259
Preflights: []applier.Preflight{mockPf},
253260
BundleToHelmChartConverter: &convert.BundleToHelmChartConverter{},
254-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
261+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
255262
}
256263

257264
objs, state, err := helmApplier.Apply(context.TODO(), validFS, testCE, testObjectLabels, testStorageLabels)
@@ -269,7 +276,7 @@ func TestApply_Installation(t *testing.T) {
269276
helmApplier := applier.Helm{
270277
ActionClientGetter: mockAcg,
271278
BundleToHelmChartConverter: &convert.BundleToHelmChartConverter{},
272-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
279+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
273280
}
274281

275282
objs, state, err := helmApplier.Apply(context.TODO(), validFS, testCE, testObjectLabels, testStorageLabels)
@@ -290,7 +297,7 @@ func TestApply_Installation(t *testing.T) {
290297
helmApplier := applier.Helm{
291298
ActionClientGetter: mockAcg,
292299
BundleToHelmChartConverter: &convert.BundleToHelmChartConverter{},
293-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
300+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
294301
}
295302

296303
objs, state, err := helmApplier.Apply(context.TODO(), validFS, testCE, testObjectLabels, testStorageLabels)
@@ -335,7 +342,7 @@ func TestApply_InstallationWithPreflightPermissionsEnabled(t *testing.T) {
335342
Preflights: []applier.Preflight{mockPf},
336343
PreAuthorizer: &mockPreAuthorizer{nil, nil},
337344
BundleToHelmChartConverter: &convert.BundleToHelmChartConverter{},
338-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
345+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
339346
}
340347

341348
objs, state, err := helmApplier.Apply(context.TODO(), validFS, testCE, testObjectLabels, testStorageLabels)
@@ -415,7 +422,7 @@ func TestApply_InstallationWithPreflightPermissionsEnabled(t *testing.T) {
415422
ActionClientGetter: mockAcg,
416423
PreAuthorizer: &mockPreAuthorizer{nil, nil},
417424
BundleToHelmChartConverter: &convert.BundleToHelmChartConverter{},
418-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
425+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
419426
}
420427

421428
// Use a ClusterExtension with valid Spec fields.
@@ -472,7 +479,7 @@ func TestApply_Upgrade(t *testing.T) {
472479
ActionClientGetter: mockAcg,
473480
Preflights: []applier.Preflight{mockPf},
474481
BundleToHelmChartConverter: &convert.BundleToHelmChartConverter{},
475-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
482+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
476483
}
477484

478485
objs, state, err := helmApplier.Apply(context.TODO(), validFS, testCE, testObjectLabels, testStorageLabels)
@@ -495,7 +502,7 @@ func TestApply_Upgrade(t *testing.T) {
495502
helmApplier := applier.Helm{
496503
ActionClientGetter: mockAcg, Preflights: []applier.Preflight{mockPf},
497504
BundleToHelmChartConverter: &convert.BundleToHelmChartConverter{},
498-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
505+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
499506
}
500507

501508
objs, state, err := helmApplier.Apply(context.TODO(), validFS, testCE, testObjectLabels, testStorageLabels)
@@ -519,7 +526,7 @@ func TestApply_Upgrade(t *testing.T) {
519526
ActionClientGetter: mockAcg,
520527
Preflights: []applier.Preflight{mockPf},
521528
BundleToHelmChartConverter: &convert.BundleToHelmChartConverter{},
522-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
529+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
523530
}
524531

525532
objs, state, err := helmApplier.Apply(context.TODO(), validFS, testCE, testObjectLabels, testStorageLabels)
@@ -540,7 +547,7 @@ func TestApply_Upgrade(t *testing.T) {
540547
helmApplier := applier.Helm{
541548
ActionClientGetter: mockAcg,
542549
BundleToHelmChartConverter: &convert.BundleToHelmChartConverter{},
543-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
550+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
544551
}
545552

546553
objs, state, err := helmApplier.Apply(context.TODO(), validFS, testCE, testObjectLabels, testStorageLabels)
@@ -571,7 +578,7 @@ func TestApply_InstallationWithSingleOwnNamespaceInstallSupportEnabled(t *testin
571578
return nil, nil
572579
},
573580
},
574-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
581+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
575582
}
576583

577584
testExt := &ocv1.ClusterExtension{
@@ -605,7 +612,7 @@ func TestApply_RegistryV1ToChartConverterIntegration(t *testing.T) {
605612
return nil, nil
606613
},
607614
},
608-
HelmReleaseToObjectsConverter: applier.HelmReleaseToObjectsConverter{Mock: true},
615+
HelmReleaseToObjectsConverter: mockHelmReleaseToObjectsConverter{},
609616
}
610617

611618
_, _, _ = helmApplier.Apply(context.TODO(), validFS, testCE, testObjectLabels, testStorageLabels)

0 commit comments

Comments
 (0)