Add mockery test case to token reconciler

controllers/pkg/.mockery.yaml

@@ -0,0 +1,6 @@
+packages:
+  github.com/nephio-project/nephio/controllers/pkg/giteaclient:
+    interfaces:
+      GiteaClient:
+        config:
+          dir: "{{.InterfaceDir}}"

controllers/pkg/giteaclient/giteaclient.go

@@ -40,6 +40,7 @@ type GiteaClient interface {
 	GetRepo(userName string, repoCRName string) (*gitea.Repository, *gitea.Response, error)
 	CreateRepo(createRepoOption gitea.CreateRepoOption) (*gitea.Repository, *gitea.Response, error)
 	EditRepo(userName string, repoCRName string, editRepoOption gitea.EditRepoOption) (*gitea.Repository, *gitea.Response, error)
+	DeleteAccessToken(value interface{}) (*gitea.Response, error)
 }
 
 var lock = &sync.Mutex{}
@@ -166,3 +167,7 @@ func (r *gc) CreateRepo(createRepoOption gitea.CreateRepoOption) (*gitea.Reposit
 func (r *gc) EditRepo(userName string, repoCRName string, editRepoOption gitea.EditRepoOption) (*gitea.Repository, *gitea.Response, error) {
 	return r.giteaClient.EditRepo(userName, repoCRName, editRepoOption)
 }
+
+func (r *gc) DeleteAccessToken(value interface{}) (*gitea.Response, error) {
+	return r.giteaClient.DeleteAccessToken(value)
+}

controllers/pkg/reconcilers/repository/reconciler_test.go

@@ -49,6 +49,7 @@ type repoTest struct {
 	wantErr bool
 }
 
+
 func TestUpsertRepo(t *testing.T) {
 	dummyString := "Dummy String"
 	dummyBool := true

controllers/pkg/reconcilers/token/reconciler.go

@@ -118,7 +118,7 @@ func (r *reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		// Delete the token from the git server
 		// when successful remove the finalizer
 		if cr.Spec.Lifecycle.DeletionPolicy == commonv1alpha1.DeletionDelete {
-			if err := r.deleteToken(ctx, giteaClient, cr); err != nil {
+			if err := r.deleteToken(ctx, r.giteaClient, cr); err != nil {
 				return ctrl.Result{Requeue: true}, errors.Wrap(r.Status().Update(ctx, cr), errUpdateStatus)
 			}
 		}
@@ -219,7 +219,7 @@ func (r *reconciler) createToken(ctx context.Context, giteaClient *gitea.Client,
 	return nil
 }
 
-func (r *reconciler) deleteToken(ctx context.Context, giteaClient *gitea.Client, cr *infrav1alpha1.Token) error {
+func (r *reconciler) deleteToken(ctx context.Context, giteaClient giteaclient.GiteaClient, cr *infrav1alpha1.Token) error {
 	_, err := giteaClient.DeleteAccessToken(cr.GetTokenName())
 	if err != nil {
 		log.FromContext(ctx).Error(err, "cannot delete token")

controllers/pkg/reconcilers/token/reconciler_test.go

@@ -0,0 +1,98 @@
+// Copyright 2023 The Nephio Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package token
+
+import (
+	"context"
+	"fmt"
+	"github.com/go-logr/logr"
+	"github.com/nephio-project/nephio/controllers/pkg/giteaclient"
+	"github.com/nephio-project/nephio/controllers/pkg/resource"
+	"github.com/stretchr/testify/mock"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"testing"
+	infrav1alpha1 "github.com/nephio-project/api/infra/v1alpha1"
+)
+
+func TestDeleteToken(t *testing.T) {
+	type mockHelper struct {
+		methodName string
+		argType    []string
+		retArgList []interface{}
+	}
+	type fields struct {
+		APIPatchingApplicator resource.APIPatchingApplicator
+		giteaClient           giteaclient.GiteaClient
+		finalizer             *resource.APIFinalizer
+		l                     logr.Logger
+	}
+	type args struct {
+		ctx         context.Context
+		giteaClient giteaclient.GiteaClient
+		cr          *infrav1alpha1.Token
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		mocks   []mockHelper
+		wantErr bool
+	}{
+		{
+			name:   "Delete Access token reports error",
+			fields: fields{resource.NewAPIPatchingApplicator(nil), nil, nil, log.FromContext(nil)},
+			args:   args{nil, nil, &infrav1alpha1.Token{}},
+			mocks: []mockHelper{
+				{"DeleteAccessToken", []string{"string"}, []interface{}{nil, fmt.Errorf("\"username\" not set: only BasicAuth allowed")}},
+			},
+			wantErr: true,
+		},
+		{
+			name:   "Delete Access token success",
+			fields: fields{resource.NewAPIPatchingApplicator(nil), nil, nil, log.FromContext(nil)},
+			args:   args{nil, nil, &infrav1alpha1.Token{}},
+			mocks: []mockHelper{
+				{"DeleteAccessToken", []string{"string"}, []interface{}{nil, nil}},
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			r := &reconciler{
+				APIPatchingApplicator: tt.fields.APIPatchingApplicator,
+				giteaClient:           tt.fields.giteaClient,
+				finalizer:             tt.fields.finalizer,
+			}
+			// The below block being setup and processing of mocks before invoking the function to be tested
+			mockGClient := new(giteaclient.MockGiteaClient)
+			tt.args.giteaClient = mockGClient
+			tt.fields.giteaClient = mockGClient
+			for counter := range tt.mocks {
+				call := mockGClient.Mock.On(tt.mocks[counter].methodName)
+				for _, arg := range tt.mocks[counter].argType {
+					call.Arguments = append(call.Arguments, mock.AnythingOfType(arg))
+				}
+				for _, ret := range tt.mocks[counter].retArgList {
+					call.ReturnArguments = append(call.ReturnArguments, ret)
+				}
+			}
+
+			if err := r.deleteToken(tt.args.ctx, tt.args.giteaClient, tt.args.cr); (err != nil) != tt.wantErr {
+				t.Errorf("deleteToken() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

default-go-test.mk

@@ -14,10 +14,13 @@
 
 
 GO_VERSION ?= 1.20.2
+MOCKERY_VERSION=2.37.1
 TEST_COVERAGE_FILE=lcov.info
 TEST_COVERAGE_HTML_FILE=coverage_unit.html
 TEST_COVERAGE_FUNC_FILE=func_coverage.out
 GIT_ROOT_DIR ?= $(dir $(lastword $(MAKEFILE_LIST)))
+OS_ARCH ?= $(shell uname -m)
+OS ?= $(shell uname)
 include $(GIT_ROOT_DIR)/detect-container-runtime.mk
 
 .PHONY: unit
@@ -36,6 +39,22 @@ else
 		go tool cover -func=${TEST_COVERAGE_FILE} -o ${TEST_COVERAGE_FUNC_FILE}
 endif
 
+.PHONY: install-mockery
+install-mockery: ## install mockery
+ifeq ($(CONTAINER_RUNNABLE), 0)
+		$(CONTAINER_RUNTIME) pull docker.io/vektra/mockery:v${MOCKERY_VERSION}
+else
+		wget -qO- https://github.com/vektra/mockery/releases/download/v${MOCKERY_VERSION}/mockery_${MOCKERY_VERSION}_${OS}_${OS_ARCH}.tar.gz | sudo tar -xvzf - -C /usr/local/bin
+endif
+
+.PHONY: generate-mocks
+generate-mocks:
+ifeq ($(CONTAINER_RUNNABLE), 0)
+		$(CONTAINER_RUNTIME) run --security-opt label=disable -v ${PWD}:/src -w /src docker.io/vektra/mockery:v${MOCKERY_VERSION}
+else
+		mockery
+endif
+
 .PHONY: unit-clean
 unit-clean: ## Clean up the artifacts created by the unit tests
 ifeq ($(CONTAINER_RUNNABLE), 0)