Move all mocks to internal/mocks

int128 · Nov 10, 2024 · 0680f15 · 0680f15
1 parent 7f274b8
commit 0680f15
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -9,11 +9,12 @@ test:
 generate:
 	$(MAKE) -C tools
 	./tools/bin/wire ./internal/di
-	./tools/bin/mockgen -destination internal/portforwarder/mock_portforwarder/mock_portforwarder.go github.com/int128/kauthproxy/internal/portforwarder Interface
-	./tools/bin/mockgen -destination internal/reverseproxy/mock_reverseproxy/mock_reverseproxy.go github.com/int128/kauthproxy/internal/reverseproxy Interface,Instance
-	./tools/bin/mockgen -destination internal/browser/mock_browser/mock_browser.go github.com/int128/kauthproxy/internal/browser Interface
-	./tools/bin/mockgen -destination internal/resolver/mock_resolver/mock_resolver.go github.com/int128/kauthproxy/internal/resolver FactoryInterface,Interface
-	./tools/bin/mockgen -destination internal/env/mock_env/mock_env.go github.com/int128/kauthproxy/internal/env Interface
+	rm -fr internal/mocks
+	./tools/bin/mockgen -destination internal/mocks/mock_browser/mock.go github.com/int128/kauthproxy/internal/browser Interface
+	./tools/bin/mockgen -destination internal/mocks/mock_env/mock.go github.com/int128/kauthproxy/internal/env Interface
+	./tools/bin/mockgen -destination internal/mocks/mock_portforwarder/mock.go github.com/int128/kauthproxy/internal/portforwarder Interface
+	./tools/bin/mockgen -destination internal/mocks/mock_resolver/mock.go github.com/int128/kauthproxy/internal/resolver FactoryInterface,Interface
+	./tools/bin/mockgen -destination internal/mocks/mock_reverseproxy/mock.go github.com/int128/kauthproxy/internal/reverseproxy Interface,Instance
 
 .PHONY: lint
 lint:

diff --git a/internal/authproxy/auth_proxy_test.go b/internal/authproxy/auth_proxy_test.go
@@ -8,14 +8,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/int128/kauthproxy/internal/browser/mock_browser"
-	"github.com/int128/kauthproxy/internal/env/mock_env"
 	"github.com/int128/kauthproxy/internal/logger/mock_logger"
+	"github.com/int128/kauthproxy/internal/mocks/mock_browser"
+	"github.com/int128/kauthproxy/internal/mocks/mock_env"
+	"github.com/int128/kauthproxy/internal/mocks/mock_portforwarder"
+	"github.com/int128/kauthproxy/internal/mocks/mock_resolver"
+	"github.com/int128/kauthproxy/internal/mocks/mock_reverseproxy"
 	"github.com/int128/kauthproxy/internal/portforwarder"
-	"github.com/int128/kauthproxy/internal/portforwarder/mock_portforwarder"
-	"github.com/int128/kauthproxy/internal/resolver/mock_resolver"
 	"github.com/int128/kauthproxy/internal/reverseproxy"
-	"github.com/int128/kauthproxy/internal/reverseproxy/mock_reverseproxy"
 	"github.com/int128/kauthproxy/internal/transport"
 	"go.uber.org/mock/gomock"
 	corev1 "k8s.io/api/core/v1"

diff --git a/...rnal/browser/mock_browser/mock_browser.go → internal/mocks/mock_browser/mock.go b/...rnal/browser/mock_browser/mock_browser.go → internal/mocks/mock_browser/mock.go
diff --git a/internal/env/mock_env/mock_env.go → internal/mocks/mock_env/mock.go b/internal/env/mock_env/mock_env.go → internal/mocks/mock_env/mock.go
diff --git a/.../mock_portforwarder/mock_portforwarder.go → internal/mocks/mock_portforwarder/mock.go b/.../mock_portforwarder/mock_portforwarder.go → internal/mocks/mock_portforwarder/mock.go
diff --git a/...l/resolver/mock_resolver/mock_resolver.go → internal/mocks/mock_resolver/mock.go b/...l/resolver/mock_resolver/mock_resolver.go → internal/mocks/mock_resolver/mock.go
diff --git a/...xy/mock_reverseproxy/mock_reverseproxy.go → internal/mocks/mock_reverseproxy/mock.go b/...xy/mock_reverseproxy/mock_reverseproxy.go → internal/mocks/mock_reverseproxy/mock.go