Fix linters and tests

sapcc · Nov 4, 2022 · 6cf0471 · 6cf0471
1 parent 4ddfb44
commit 6cf0471
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/pkg/client/openstack/kluster/securitygroup.go b/pkg/client/openstack/kluster/securitygroup.go
@@ -6,7 +6,7 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules"
 )
 
-//MatchRule checks if input is matched by rule
+// MatchRule checks if input is matched by rule
 func MatchRule(input rules.SecGroupRule, rule rules.SecGroupRule) bool {
 
 	if input.Direction != rule.Direction {

diff --git a/pkg/controller/flight/controller_test.go b/pkg/controller/flight/controller_test.go
@@ -28,9 +28,9 @@ func (m *MockFlightReconciler) EnsureInstanceSecurityGroupAssignment() []string
 	return args.Get(0).([]string)
 }
 
-func (m *MockFlightReconciler) EnsureKubernikusRulesInSecurityGroup() bool {
+func (m *MockFlightReconciler) EnsureKubernikusRulesInSecurityGroup() (bool, error) {
 	args := m.Called()
-	return args.Bool(0)
+	return args.Bool(0), args.Error(1)
 }
 
 func (m *MockFlightReconciler) DeleteIncompletelySpawnedInstances() []string {
@@ -58,7 +58,7 @@ func TestReconcile(t *testing.T) {
 	kluster.Status.Phase = models.KlusterPhaseRunning
 
 	reconciler := &MockFlightReconciler{}
-	reconciler.On("EnsureKubernikusRulesInSecurityGroup").Return(true)
+	reconciler.On("EnsureKubernikusRulesInSecurityGroup").Return(true, nil)
 	reconciler.On("EnsureInstanceSecurityGroupAssignment").Return([]string{})
 	reconciler.On("DeleteIncompletelySpawnedInstances").Return([]string{})
 	reconciler.On("DeleteErroredInstances").Return([]string{})
@@ -68,7 +68,7 @@ func TestReconcile(t *testing.T) {
 	factory := &MockFlightReconcilerFactory{}
 	factory.On("FlightReconciler", kluster).Return(reconciler, nil)
 
-	controller := &FlightController{factory, nil}
+	controller := &FlightController{factory, nil, nil}
 
 	_, err := controller.Reconcile(kluster)
 	assert.NoError(t, err)

diff --git a/pkg/controller/flight/reconciler_test.go b/pkg/controller/flight/reconciler_test.go
@@ -254,7 +254,8 @@ func TestEnsureKubernikusRulesInSecurityGroup(t *testing.T) {
 		log.NewNopLogger(),
 	}
 
-	ensured := reconciler.EnsureKubernikusRulesInSecurityGroup()
+	updated, err := reconciler.EnsureKubernikusRulesInSecurityGroup()
+	assert.NoError(t, err)
 	client.AssertCalled(t, "EnsureKubernikusRulesInSecurityGroup", kluster)
-	assert.True(t, ensured)
+	assert.True(t, updated)
 }