Merge pull request #477 from uselagoon/refactor-mocks

refactor mocks

.github/workflows/coverage.yaml

@@ -16,9 +16,7 @@ jobs:
         go-version: stable
     - name: Calculate coverage
       run: |
-        go test -v -covermode=atomic -coverprofile=cover.out.raw -coverpkg=./... ./...
-        # remove generated code from coverage calculation
-        grep -Ev 'internal/mock|_enumer.go' cover.out.raw > cover.out
+        go test -v -covermode=atomic -coverprofile=cover.out -coverpkg=./... ./...
     - name: Generage coverage badge
       uses: vladopajic/go-test-coverage@c7fe52e0f48e0fbed8c1812824c5346218443c70 # v2.10.2
       with:

.gitignore

@@ -1,4 +1,3 @@
 /dist
 /cover.out
-/cover.out.raw
 /sbom.spdx.json

Makefile

@@ -27,6 +27,5 @@ fuzz: mod-tidy generate
 
 .PHONY: cover
 cover: mod-tidy generate
-	go test -v -covermode=atomic -coverprofile=cover.out.raw -coverpkg=./... ./...
-	grep -Ev 'internal/mock|_enumer.go' cover.out.raw > cover.out
+	go test -v -covermode=atomic -coverprofile=cover.out -coverpkg=./... ./...
 	go tool cover -html=cover.out

internal/lagoon/userrole.go

@@ -1,6 +1,6 @@
 package lagoon
 
-//go:generate enumer -type=UserRole -sql -transform=lower
+//go:generate enumer -type=UserRole -transform=lower
 
 // UserRole is an enum of valid User roles.
 type UserRole int

internal/rbac/usercansshtoenvironment_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/uselagoon/ssh-portal/internal/lagoon"
 	"github.com/uselagoon/ssh-portal/internal/rbac"
-	"github.com/uselagoon/ssh-portal/internal/rbac/mock"
 	"go.uber.org/mock/gomock"
 )
 
@@ -336,12 +335,12 @@ func TestUserCanSSHDefaultRBAC(t *testing.T) {
 			// set up mocks
 			ctrl := gomock.NewController(tt)
 			defer ctrl.Finish()
-			kcService := mock.NewMockKeycloakService(ctrl)
+			kcService := NewMockKeycloakService(ctrl)
 			kcService.EXPECT().
 				UserRolesAndGroups(ctx, tc.userUUID).
 				Return(tc.realmRoles, tc.userGroupPaths, nil).
 				Times(2)
-			ldbService := mock.NewMockLagoonDBService(ctrl)
+			ldbService := NewMockLagoonDBService(ctrl)
 			if !tc.realmRoleShortCircuit {
 				kcService.EXPECT().
 					UserGroupIDRole(ctx, tc.userGroupPaths).

internal/sshserver/sessionhandler_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/gliderlabs/ssh"
-	"github.com/uselagoon/ssh-portal/internal/mock"
 	"github.com/uselagoon/ssh-portal/internal/sshserver"
 	"go.uber.org/mock/gomock"
 )
@@ -45,9 +44,9 @@ func TestExec(t *testing.T) {
 		t.Run(name, func(tt *testing.T) {
 			// set up mocks
 			ctrl := gomock.NewController(tt)
-			k8sService := mock.NewMockK8SAPIService(ctrl)
-			sshSession := mock.NewMockSession(ctrl)
-			sshContext := mock.NewMockContext(ctrl)
+			k8sService := NewMockK8SAPIService(ctrl)
+			sshSession := NewMockSession(ctrl)
+			sshContext := NewMockContext(ctrl)
 			// configure callback
 			callback := sshserver.SessionHandler(
 				log,
@@ -120,9 +119,9 @@ func TestLogs(t *testing.T) {
 		t.Run(name, func(tt *testing.T) {
 			// set up mocks
 			ctrl := gomock.NewController(tt)
-			k8sService := mock.NewMockK8SAPIService(ctrl)
-			sshSession := mock.NewMockSession(ctrl)
-			sshContext := mock.NewMockContext(ctrl)
+			k8sService := NewMockK8SAPIService(ctrl)
+			sshSession := NewMockSession(ctrl)
+			sshContext := NewMockContext(ctrl)
 			// configure callback
 			callback := sshserver.SessionHandler(
 				log,