Move mocks to mock pkg (#680)

auth0 · Mar 17, 2023 · 200ea69 · 200ea69
1 parent 5fb7796
commit 200ea69
Show file tree

Hide file tree

Showing 16 changed files with 196 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@
 NAME := auth0-cli
 GO_PKG := github.com/auth0/$(NAME)
 GO_BIN ?= $(shell go env GOPATH)/bin
-GO_PACKAGES := $(shell go list ./... | grep -v vendor)
+GO_PACKAGES := $(shell go list ./... | grep -vE "vendor|tools|mock")
 
 ## Configuration for build-info
 BUILD_DIR ?= $(CURDIR)/out

diff --git a/internal/auth0/action.go b/internal/auth0/action.go
@@ -1,4 +1,4 @@
-//go:generate mockgen -source=action.go -destination=action_mock.go -package=auth0
+//go:generate mockgen -source=action.go -destination=mock/action_mock.go -package=mock
 
 package auth0
 

diff --git a/internal/auth0/branding_prompt.go b/internal/auth0/branding_prompt.go
@@ -1,4 +1,4 @@
-//go:generate mockgen -source=branding_prompt.go -destination=branding_prompt_mock.go -package=auth0
+//go:generate mockgen -source=branding_prompt.go -destination=mock/branding_prompt_mock.go -package=mock
 
 package auth0
 

diff --git a/internal/auth0/client.go b/internal/auth0/client.go
@@ -1,4 +1,4 @@
-//go:generate mockgen -source=client.go -destination=client_mock.go -package=auth0
+//go:generate mockgen -source=client.go -destination=mock/client_mock.go -package=mock
 
 package auth0
 

diff --git a/internal/auth0/log.go b/internal/auth0/log.go
@@ -1,11 +1,11 @@
-//go:generate mockgen -source=log.go -destination=log_mock.go -package=auth0
+//go:generate mockgen -source=log.go -destination=mock/log_mock.go -package=mock
 
 package auth0
 
 import "github.com/auth0/go-auth0/management"
 
 type LogAPI interface {
-	// Retrieves the data related to the log entry identified by id. This returns a
+	// Read the data related to the log entry identified by id. This returns a
 	// single log entry representation as specified in the schema.
 	Read(id string, opts ...management.RequestOption) (l *management.Log, err error)
 

diff --git a/internal/auth0/mock/action_mock.go b/internal/auth0/mock/action_mock.go
diff --git a/internal/auth0/branding_prompt_mock.go → internal/auth0/mock/branding_prompt_mock.go b/internal/auth0/branding_prompt_mock.go → internal/auth0/mock/branding_prompt_mock.go
diff --git a/internal/auth0/client_mock.go → internal/auth0/mock/client_mock.go b/internal/auth0/client_mock.go → internal/auth0/mock/client_mock.go
diff --git a/internal/auth0/log_mock.go → internal/auth0/mock/log_mock.go b/internal/auth0/log_mock.go → internal/auth0/mock/log_mock.go
diff --git a/internal/auth0/resource_server_mock.go → internal/auth0/mock/resource_server_mock.go b/internal/auth0/resource_server_mock.go → internal/auth0/mock/resource_server_mock.go
diff --git a/internal/auth0/rule_mock.go → internal/auth0/mock/rule_mock.go b/internal/auth0/rule_mock.go → internal/auth0/mock/rule_mock.go
diff --git a/internal/auth0/resource_server.go b/internal/auth0/resource_server.go
@@ -1,4 +1,4 @@
-//go:generate mockgen -source=resource_server.go -destination=resource_server_mock.go -package=auth0
+//go:generate mockgen -source=resource_server.go -destination=mock/resource_server_mock.go -package=mock
 
 package auth0
 

diff --git a/internal/auth0/rule.go b/internal/auth0/rule.go
@@ -1,4 +1,4 @@
-//go:generate mockgen -source=rule.go -destination=rule_mock.go -package=auth0
+//go:generate mockgen -source=rule.go -destination=mock/rule_mock.go -package=mock
 
 package auth0
 

diff --git a/internal/cli/actions_test.go b/internal/cli/actions_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/auth0/auth0-cli/internal/auth0"
+	"github.com/auth0/auth0-cli/internal/auth0/mock"
 	"github.com/auth0/auth0-cli/internal/display"
 )
 
@@ -20,7 +21,7 @@ func TestActionsDeployCmd(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
 
-		actionAPI := auth0.NewMockActionAPI(ctrl)
+		actionAPI := mock.NewMockActionAPI(ctrl)
 		actionAPI.EXPECT().
 			Deploy(actionID).
 			Return(nil, nil)
@@ -77,7 +78,7 @@ func TestActionsDeployCmd(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
 
-		actionAPI := auth0.NewMockActionAPI(ctrl)
+		actionAPI := mock.NewMockActionAPI(ctrl)
 		actionAPI.EXPECT().
 			Deploy(actionID).
 			Return(nil, fmt.Errorf("400 Bad Request"))
@@ -103,7 +104,7 @@ func TestActionsDeployCmd(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
 
-		actionAPI := auth0.NewMockActionAPI(ctrl)
+		actionAPI := mock.NewMockActionAPI(ctrl)
 		actionAPI.EXPECT().
 			Deploy(actionID).
 			Return(nil, nil)

diff --git a/internal/cli/apps_test.go b/internal/cli/apps_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/golang/mock/gomock"
 
 	"github.com/auth0/auth0-cli/internal/auth0"
+	"github.com/auth0/auth0-cli/internal/auth0/mock"
 	"github.com/auth0/auth0-cli/internal/display"
 )
 
@@ -50,7 +51,7 @@ func TestAppsListCmd(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
-			clientAPI := auth0.NewMockClientAPI(ctrl)
+			clientAPI := mock.NewMockClientAPI(ctrl)
 			clientAPI.EXPECT().
 				List(gomock.Any()).
 				Return(&management.ClientList{

diff --git a/internal/cli/prompts_custom_text_test.go b/internal/cli/prompts_custom_text_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/auth0/auth0-cli/internal/auth0"
+	"github.com/auth0/auth0-cli/internal/auth0/mock"
 	"github.com/auth0/auth0-cli/internal/display"
 )
 
@@ -54,7 +55,7 @@ func TestBrandingTextsShowCmd(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
-			brandingTextsAPI := auth0.NewMockPromptAPI(ctrl)
+			brandingTextsAPI := mock.NewMockPromptAPI(ctrl)
 			brandingTextsAPI.EXPECT().
 				CustomText(test.inputPrompt, test.inputLanguage).
 				Return(test.returnedCustomText, test.returnedError)