From 0680f1568efbb23e29ed128d37895648438724f0 Mon Sep 17 00:00:00 2001 From: Hidetake Iwata Date: Sun, 10 Nov 2024 20:52:28 +0900 Subject: [PATCH] Move all mocks to internal/mocks --- Makefile | 11 ++++++----- internal/authproxy/auth_proxy_test.go | 10 +++++----- .../mock_browser.go => mocks/mock_browser/mock.go} | 2 +- .../mock_env/mock_env.go => mocks/mock_env/mock.go} | 2 +- .../mock_portforwarder/mock.go} | 2 +- .../mock_resolver.go => mocks/mock_resolver/mock.go} | 2 +- .../mock_reverseproxy/mock.go} | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) rename internal/{browser/mock_browser/mock_browser.go => mocks/mock_browser/mock.go} (91%) rename internal/{env/mock_env/mock_env.go => mocks/mock_env/mock.go} (93%) rename internal/{portforwarder/mock_portforwarder/mock_portforwarder.go => mocks/mock_portforwarder/mock.go} (91%) rename internal/{resolver/mock_resolver/mock_resolver.go => mocks/mock_resolver/mock.go} (96%) rename internal/{reverseproxy/mock_reverseproxy/mock_reverseproxy.go => mocks/mock_reverseproxy/mock.go} (95%) diff --git a/Makefile b/Makefile index 01fcba3..6e24b22 100644 --- 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 index ac5c4e6..602d3fe 100644 --- 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/internal/browser/mock_browser/mock_browser.go b/internal/mocks/mock_browser/mock.go similarity index 91% rename from internal/browser/mock_browser/mock_browser.go rename to internal/mocks/mock_browser/mock.go index 4f0faf1..1b479b1 100644 --- a/internal/browser/mock_browser/mock_browser.go +++ b/internal/mocks/mock_browser/mock.go @@ -3,7 +3,7 @@ // // Generated by this command: // -// mockgen -destination internal/browser/mock_browser/mock_browser.go github.com/int128/kauthproxy/internal/browser Interface +// mockgen -destination internal/mocks/mock_browser/mock.go github.com/int128/kauthproxy/internal/browser Interface // // Package mock_browser is a generated GoMock package. diff --git a/internal/env/mock_env/mock_env.go b/internal/mocks/mock_env/mock.go similarity index 93% rename from internal/env/mock_env/mock_env.go rename to internal/mocks/mock_env/mock.go index 9068af3..50cafb7 100644 --- a/internal/env/mock_env/mock_env.go +++ b/internal/mocks/mock_env/mock.go @@ -3,7 +3,7 @@ // // Generated by this command: // -// mockgen -destination internal/env/mock_env/mock_env.go github.com/int128/kauthproxy/internal/env Interface +// mockgen -destination internal/mocks/mock_env/mock.go github.com/int128/kauthproxy/internal/env Interface // // Package mock_env is a generated GoMock package. diff --git a/internal/portforwarder/mock_portforwarder/mock_portforwarder.go b/internal/mocks/mock_portforwarder/mock.go similarity index 91% rename from internal/portforwarder/mock_portforwarder/mock_portforwarder.go rename to internal/mocks/mock_portforwarder/mock.go index 3135e06..a046412 100644 --- a/internal/portforwarder/mock_portforwarder/mock_portforwarder.go +++ b/internal/mocks/mock_portforwarder/mock.go @@ -3,7 +3,7 @@ // // Generated by this command: // -// mockgen -destination internal/portforwarder/mock_portforwarder/mock_portforwarder.go github.com/int128/kauthproxy/internal/portforwarder Interface +// mockgen -destination internal/mocks/mock_portforwarder/mock.go github.com/int128/kauthproxy/internal/portforwarder Interface // // Package mock_portforwarder is a generated GoMock package. diff --git a/internal/resolver/mock_resolver/mock_resolver.go b/internal/mocks/mock_resolver/mock.go similarity index 96% rename from internal/resolver/mock_resolver/mock_resolver.go rename to internal/mocks/mock_resolver/mock.go index 27dc3f9..f3cee62 100644 --- a/internal/resolver/mock_resolver/mock_resolver.go +++ b/internal/mocks/mock_resolver/mock.go @@ -3,7 +3,7 @@ // // Generated by this command: // -// mockgen -destination internal/resolver/mock_resolver/mock_resolver.go github.com/int128/kauthproxy/internal/resolver FactoryInterface,Interface +// mockgen -destination internal/mocks/mock_resolver/mock.go github.com/int128/kauthproxy/internal/resolver FactoryInterface,Interface // // Package mock_resolver is a generated GoMock package. diff --git a/internal/reverseproxy/mock_reverseproxy/mock_reverseproxy.go b/internal/mocks/mock_reverseproxy/mock.go similarity index 95% rename from internal/reverseproxy/mock_reverseproxy/mock_reverseproxy.go rename to internal/mocks/mock_reverseproxy/mock.go index d8fdbc0..efdc319 100644 --- a/internal/reverseproxy/mock_reverseproxy/mock_reverseproxy.go +++ b/internal/mocks/mock_reverseproxy/mock.go @@ -3,7 +3,7 @@ // // Generated by this command: // -// mockgen -destination internal/reverseproxy/mock_reverseproxy/mock_reverseproxy.go github.com/int128/kauthproxy/internal/reverseproxy Interface,Instance +// mockgen -destination internal/mocks/mock_reverseproxy/mock.go github.com/int128/kauthproxy/internal/reverseproxy Interface,Instance // // Package mock_reverseproxy is a generated GoMock package.