tests: add mocks for KongService SDK

.mockery.yaml

@@ -3,12 +3,13 @@ inpackage: True
 disable-version-string: True
 with-expecter: True
 
-filename: "{{.InterfaceName | lower}}_mock_test.go"
-dir: "{{.InterfaceDir}}"
-mockname: "Mock{{.InterfaceName}}"
-outpkg: "{{.PackageName}}"
+filename: "{{ trimSuffix .InterfaceFile \".go\" | base | lower }}_mock_test.go"
+dir: "{{ .InterfaceDir }}"
+mockname: "Mock{{ .InterfaceName }}"
+outpkg: "{{ .PackageName }}"
 
 packages:
   github.com/kong/gateway-operator/controller/konnect/ops:
     interfaces:
       ControlPlaneSDK:
+      ServicesSDK:

controller/konnect/ops/ops.go

@@ -148,7 +148,7 @@ func Update[
 	case *konnectv1alpha1.KonnectControlPlane:
 		return ctrl.Result{}, updateControlPlane(ctx, sdk.ControlPlanes, ent)
 	case *configurationv1alpha1.KongService:
-		return ctrl.Result{}, updateService(ctx, sdk.Services, cl, ent)
+		return ctrl.Result{}, updateService(ctx, sdk.Services, ent)
 	case *configurationv1alpha1.KongRoute:
 		return ctrl.Result{}, updateRoute(ctx, sdk.Routes, cl, ent)
 	case *configurationv1.KongConsumer:

controller/konnect/ops/ops_controlplane_test.go

@@ -53,7 +53,7 @@ func TestCreateControlPlane(t *testing.T) {
 				return sdk, cp
 			},
 			assertions: func(t *testing.T, cp *konnectv1alpha1.KonnectControlPlane) {
-				assert.Equal(t, "12345", cp.Status.GetKonnectID())
+				assert.Equal(t, "12345", cp.GetKonnectStatus().GetKonnectID())
 				cond, ok := k8sutils.GetCondition(conditions.KonnectEntityProgrammedConditionType, cp)
 				require.True(t, ok, "Programmed condition not set on KonnectControlPlane")
 				assert.Equal(t, metav1.ConditionTrue, cond.Status)
@@ -97,7 +97,7 @@ func TestCreateControlPlane(t *testing.T) {
 				assert.Equal(t, metav1.ConditionFalse, cond.Status)
 				assert.Equal(t, "FailedToCreate", cond.Reason)
 				assert.Equal(t, cp.GetGeneration(), cond.ObservedGeneration)
-				assert.Equal(t, "failed to create KonnectControlPlane default/cp-1: {\"status\":400,\"title\":\"\",\"instance\":\"\",\"detail\":\"bad request\",\"invalid_parameters\":null}", cond.Message)
+				assert.Equal(t, `failed to create KonnectControlPlane default/cp-1: {"status":400,"title":"","instance":"","detail":"bad request","invalid_parameters":null}`, cond.Message)
 			},
 			expectedErr: true,
 		},
@@ -197,7 +197,7 @@ func TestDeleteControlPlane(t *testing.T) {
 			expectedErr: true,
 		},
 		{
-			name: "not found error is ignore and considered a success when trying to delete",
+			name: "not found error is ignored and considered a success when trying to delete",
 			mockCPPair: func() (*MockControlPlaneSDK, *konnectv1alpha1.KonnectControlPlane) {
 				sdk := &MockControlPlaneSDK{}
 				cp := &konnectv1alpha1.KonnectControlPlane{
@@ -358,7 +358,7 @@ func TestUpdateControlPlane(t *testing.T) {
 				assert.Equal(t, metav1.ConditionFalse, cond.Status)
 				assert.Equal(t, "FailedToUpdate", cond.Reason)
 				assert.Equal(t, cp.GetGeneration(), cond.ObservedGeneration)
-				assert.Equal(t, "failed to update KonnectControlPlane default/cp-1: {\"status\":400,\"title\":\"\",\"instance\":\"\",\"detail\":\"bad request\",\"invalid_parameters\":null}", cond.Message)
+				assert.Equal(t, `failed to update KonnectControlPlane default/cp-1: {"status":400,"title":"","instance":"","detail":"bad request","invalid_parameters":null}`, cond.Message)
 			},
 			expectedErr: true,
 		},