From 0076f1251cbb8d465b5a03894430b82dbbcaf4f1 Mon Sep 17 00:00:00 2001 From: Joshua Casey Date: Tue, 21 May 2024 10:38:25 -0500 Subject: [PATCH] Move all mock files into internal/mocks and use mock prefix --- internal/clientcertissuer/issuer_test.go | 20 ++++++------- .../kubecertagent/kubecertagent_test.go | 2 +- .../generate.go | 0 .../mockcredentialrequest.go} | 0 .../{issuermocks => mockissuer}/generate.go | 0 .../mockissuer.go} | 0 .../mockkubecertagent}/generate.go | 0 .../mockkubecertagent}/mockdynamiccert.go | 0 .../mockpodcommandexecutor.go | 0 .../registry/credentialrequest/rest_test.go | 28 +++++++++---------- 10 files changed, 25 insertions(+), 25 deletions(-) rename internal/mocks/{credentialrequestmocks => mockcredentialrequest}/generate.go (100%) rename internal/mocks/{credentialrequestmocks/credentialrequestmocks.go => mockcredentialrequest/mockcredentialrequest.go} (100%) rename internal/mocks/{issuermocks => mockissuer}/generate.go (100%) rename internal/mocks/{issuermocks/issuermocks.go => mockissuer/mockissuer.go} (100%) rename internal/{controller/kubecertagent/mocks => mocks/mockkubecertagent}/generate.go (100%) rename internal/{controller/kubecertagent/mocks => mocks/mockkubecertagent}/mockdynamiccert.go (100%) rename internal/{controller/kubecertagent/mocks => mocks/mockkubecertagent}/mockpodcommandexecutor.go (100%) diff --git a/internal/clientcertissuer/issuer_test.go b/internal/clientcertissuer/issuer_test.go index 9063d8b6f..81a615971 100644 --- a/internal/clientcertissuer/issuer_test.go +++ b/internal/clientcertissuer/issuer_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "go.pinniped.dev/internal/mocks/issuermocks" + "go.pinniped.dev/internal/mocks/mockissuer" ) func TestName(t *testing.T) { @@ -30,7 +30,7 @@ func TestName(t *testing.T) { { name: "foo issuer", buildIssuerMocks: func() ClientCertIssuers { - fooClientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + fooClientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) fooClientCertIssuer.EXPECT().Name().Return("foo") return ClientCertIssuers{fooClientCertIssuer} @@ -40,10 +40,10 @@ func TestName(t *testing.T) { { name: "foo and bar issuers", buildIssuerMocks: func() ClientCertIssuers { - fooClientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + fooClientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) fooClientCertIssuer.EXPECT().Name().Return("foo") - barClientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + barClientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) barClientCertIssuer.EXPECT().Name().Return("bar") return ClientCertIssuers{fooClientCertIssuer, barClientCertIssuer} @@ -81,7 +81,7 @@ func TestIssueClientCertPEM(t *testing.T) { { name: "issuers with error", buildIssuerMocks: func() ClientCertIssuers { - errClientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + errClientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) errClientCertIssuer.EXPECT().Name().Return("error cert issuer") errClientCertIssuer.EXPECT(). IssueClientCertPEM("username", []string{"group1", "group2"}, 32*time.Second). @@ -93,7 +93,7 @@ func TestIssueClientCertPEM(t *testing.T) { { name: "valid issuer", buildIssuerMocks: func() ClientCertIssuers { - validClientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + validClientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) validClientCertIssuer.EXPECT(). IssueClientCertPEM("username", []string{"group1", "group2"}, 32*time.Second). Return([]byte("cert"), []byte("key"), nil) @@ -105,13 +105,13 @@ func TestIssueClientCertPEM(t *testing.T) { { name: "fallthrough issuer", buildIssuerMocks: func() ClientCertIssuers { - errClientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + errClientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) errClientCertIssuer.EXPECT().Name().Return("error cert issuer") errClientCertIssuer.EXPECT(). IssueClientCertPEM("username", []string{"group1", "group2"}, 32*time.Second). Return(nil, nil, errors.New("error from wrapped cert issuer")) - validClientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + validClientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) validClientCertIssuer.EXPECT(). IssueClientCertPEM("username", []string{"group1", "group2"}, 32*time.Second). Return([]byte("cert"), []byte("key"), nil) @@ -126,13 +126,13 @@ func TestIssueClientCertPEM(t *testing.T) { { name: "multiple error issuers", buildIssuerMocks: func() ClientCertIssuers { - err1ClientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + err1ClientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) err1ClientCertIssuer.EXPECT().Name().Return("error1 cert issuer") err1ClientCertIssuer.EXPECT(). IssueClientCertPEM("username", []string{"group1", "group2"}, 32*time.Second). Return(nil, nil, errors.New("error1 from wrapped cert issuer")) - err2ClientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + err2ClientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) err2ClientCertIssuer.EXPECT().Name().Return("error2 cert issuer") err2ClientCertIssuer.EXPECT(). IssueClientCertPEM("username", []string{"group1", "group2"}, 32*time.Second). diff --git a/internal/controller/kubecertagent/kubecertagent_test.go b/internal/controller/kubecertagent/kubecertagent_test.go index 400a4694d..d826ba750 100644 --- a/internal/controller/kubecertagent/kubecertagent_test.go +++ b/internal/controller/kubecertagent/kubecertagent_test.go @@ -32,11 +32,11 @@ import ( conciergeconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" conciergefake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" conciergeinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" - "go.pinniped.dev/internal/controller/kubecertagent/mocks" "go.pinniped.dev/internal/controllerinit" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/here" "go.pinniped.dev/internal/kubeclient" + mocks "go.pinniped.dev/internal/mocks/mockkubecertagent" "go.pinniped.dev/internal/plog" "go.pinniped.dev/internal/testutil" "go.pinniped.dev/test/testlib" diff --git a/internal/mocks/credentialrequestmocks/generate.go b/internal/mocks/mockcredentialrequest/generate.go similarity index 100% rename from internal/mocks/credentialrequestmocks/generate.go rename to internal/mocks/mockcredentialrequest/generate.go diff --git a/internal/mocks/credentialrequestmocks/credentialrequestmocks.go b/internal/mocks/mockcredentialrequest/mockcredentialrequest.go similarity index 100% rename from internal/mocks/credentialrequestmocks/credentialrequestmocks.go rename to internal/mocks/mockcredentialrequest/mockcredentialrequest.go diff --git a/internal/mocks/issuermocks/generate.go b/internal/mocks/mockissuer/generate.go similarity index 100% rename from internal/mocks/issuermocks/generate.go rename to internal/mocks/mockissuer/generate.go diff --git a/internal/mocks/issuermocks/issuermocks.go b/internal/mocks/mockissuer/mockissuer.go similarity index 100% rename from internal/mocks/issuermocks/issuermocks.go rename to internal/mocks/mockissuer/mockissuer.go diff --git a/internal/controller/kubecertagent/mocks/generate.go b/internal/mocks/mockkubecertagent/generate.go similarity index 100% rename from internal/controller/kubecertagent/mocks/generate.go rename to internal/mocks/mockkubecertagent/generate.go diff --git a/internal/controller/kubecertagent/mocks/mockdynamiccert.go b/internal/mocks/mockkubecertagent/mockdynamiccert.go similarity index 100% rename from internal/controller/kubecertagent/mocks/mockdynamiccert.go rename to internal/mocks/mockkubecertagent/mockdynamiccert.go diff --git a/internal/controller/kubecertagent/mocks/mockpodcommandexecutor.go b/internal/mocks/mockkubecertagent/mockpodcommandexecutor.go similarity index 100% rename from internal/controller/kubecertagent/mocks/mockpodcommandexecutor.go rename to internal/mocks/mockkubecertagent/mockpodcommandexecutor.go diff --git a/internal/registry/credentialrequest/rest_test.go b/internal/registry/credentialrequest/rest_test.go index dffa0b69b..5054c5cc9 100644 --- a/internal/registry/credentialrequest/rest_test.go +++ b/internal/registry/credentialrequest/rest_test.go @@ -26,8 +26,8 @@ import ( loginapi "go.pinniped.dev/generated/latest/apis/concierge/login" "go.pinniped.dev/internal/clientcertissuer" - "go.pinniped.dev/internal/mocks/credentialrequestmocks" - "go.pinniped.dev/internal/mocks/issuermocks" + "go.pinniped.dev/internal/mocks/mockcredentialrequest" + "go.pinniped.dev/internal/mocks/mockissuer" "go.pinniped.dev/internal/testutil" ) @@ -89,14 +89,14 @@ func TestCreate(t *testing.T) { it("CreateSucceedsWhenGivenATokenAndTheWebhookAuthenticatesTheToken", func() { req := validCredentialRequest() - requestAuthenticator := credentialrequestmocks.NewMockTokenCredentialRequestAuthenticator(ctrl) + requestAuthenticator := mockcredentialrequest.NewMockTokenCredentialRequestAuthenticator(ctrl) requestAuthenticator.EXPECT().AuthenticateTokenCredentialRequest(gomock.Any(), req). Return(&user.DefaultInfo{ Name: "test-user", Groups: []string{"test-group-1", "test-group-2"}, }, nil) - clientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + clientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) clientCertIssuer.EXPECT().IssueClientCertPEM( "test-user", []string{"test-group-1", "test-group-2"}, @@ -130,14 +130,14 @@ func TestCreate(t *testing.T) { it("CreateFailsWithValidTokenWhenCertIssuerFails", func() { req := validCredentialRequest() - requestAuthenticator := credentialrequestmocks.NewMockTokenCredentialRequestAuthenticator(ctrl) + requestAuthenticator := mockcredentialrequest.NewMockTokenCredentialRequestAuthenticator(ctrl) requestAuthenticator.EXPECT().AuthenticateTokenCredentialRequest(gomock.Any(), req). Return(&user.DefaultInfo{ Name: "test-user", Groups: []string{"test-group-1", "test-group-2"}, }, nil) - clientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + clientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) clientCertIssuer.EXPECT(). IssueClientCertPEM(gomock.Any(), gomock.Any(), gomock.Any()). Return(nil, nil, fmt.Errorf("some certificate authority error")) @@ -152,7 +152,7 @@ func TestCreate(t *testing.T) { it("CreateSucceedsWithAnUnauthenticatedStatusWhenGivenATokenAndTheWebhookReturnsNilUser", func() { req := validCredentialRequest() - requestAuthenticator := credentialrequestmocks.NewMockTokenCredentialRequestAuthenticator(ctrl) + requestAuthenticator := mockcredentialrequest.NewMockTokenCredentialRequestAuthenticator(ctrl) requestAuthenticator.EXPECT().AuthenticateTokenCredentialRequest(gomock.Any(), req).Return(nil, nil) storage := NewREST(requestAuthenticator, nil, schema.GroupResource{}) @@ -166,7 +166,7 @@ func TestCreate(t *testing.T) { it("CreateSucceedsWithAnUnauthenticatedStatusWhenWebhookFails", func() { req := validCredentialRequest() - requestAuthenticator := credentialrequestmocks.NewMockTokenCredentialRequestAuthenticator(ctrl) + requestAuthenticator := mockcredentialrequest.NewMockTokenCredentialRequestAuthenticator(ctrl) requestAuthenticator.EXPECT().AuthenticateTokenCredentialRequest(gomock.Any(), req). Return(nil, errors.New("some webhook error")) @@ -181,7 +181,7 @@ func TestCreate(t *testing.T) { it("CreateSucceedsWithAnUnauthenticatedStatusWhenWebhookReturnsAnEmptyUsername", func() { req := validCredentialRequest() - requestAuthenticator := credentialrequestmocks.NewMockTokenCredentialRequestAuthenticator(ctrl) + requestAuthenticator := mockcredentialrequest.NewMockTokenCredentialRequestAuthenticator(ctrl) requestAuthenticator.EXPECT().AuthenticateTokenCredentialRequest(gomock.Any(), req). Return(&user.DefaultInfo{Name: ""}, nil) @@ -196,7 +196,7 @@ func TestCreate(t *testing.T) { it("CreateSucceedsWithAnUnauthenticatedStatusWhenWebhookReturnsAUserWithUID", func() { req := validCredentialRequest() - requestAuthenticator := credentialrequestmocks.NewMockTokenCredentialRequestAuthenticator(ctrl) + requestAuthenticator := mockcredentialrequest.NewMockTokenCredentialRequestAuthenticator(ctrl) requestAuthenticator.EXPECT().AuthenticateTokenCredentialRequest(gomock.Any(), req). Return(&user.DefaultInfo{ Name: "test-user", @@ -215,7 +215,7 @@ func TestCreate(t *testing.T) { it("CreateSucceedsWithAnUnauthenticatedStatusWhenWebhookReturnsAUserWithExtra", func() { req := validCredentialRequest() - requestAuthenticator := credentialrequestmocks.NewMockTokenCredentialRequestAuthenticator(ctrl) + requestAuthenticator := mockcredentialrequest.NewMockTokenCredentialRequestAuthenticator(ctrl) requestAuthenticator.EXPECT().AuthenticateTokenCredentialRequest(gomock.Any(), req). Return(&user.DefaultInfo{ Name: "test-user", @@ -271,7 +271,7 @@ func TestCreate(t *testing.T) { it("CreateDoesNotAllowValidationFunctionToMutateRequest", func() { req := validCredentialRequest() - requestAuthenticator := credentialrequestmocks.NewMockTokenCredentialRequestAuthenticator(ctrl) + requestAuthenticator := mockcredentialrequest.NewMockTokenCredentialRequestAuthenticator(ctrl) requestAuthenticator.EXPECT().AuthenticateTokenCredentialRequest(gomock.Any(), req.DeepCopy()). Return(&user.DefaultInfo{Name: "test-user"}, nil) @@ -292,7 +292,7 @@ func TestCreate(t *testing.T) { it("CreateDoesNotAllowValidationFunctionToSeeTheActualRequestToken", func() { req := validCredentialRequest() - requestAuthenticator := credentialrequestmocks.NewMockTokenCredentialRequestAuthenticator(ctrl) + requestAuthenticator := mockcredentialrequest.NewMockTokenCredentialRequestAuthenticator(ctrl) requestAuthenticator.EXPECT().AuthenticateTokenCredentialRequest(gomock.Any(), req.DeepCopy()). Return(&user.DefaultInfo{Name: "test-user"}, nil) @@ -398,7 +398,7 @@ func requireSuccessfulResponseWithAuthenticationFailureMessage(t *testing.T, err } func successfulIssuer(ctrl *gomock.Controller) clientcertissuer.ClientCertIssuer { - clientCertIssuer := issuermocks.NewMockClientCertIssuer(ctrl) + clientCertIssuer := mockissuer.NewMockClientCertIssuer(ctrl) clientCertIssuer.EXPECT(). IssueClientCertPEM(gomock.Any(), gomock.Any(), gomock.Any()). Return([]byte("test-cert"), []byte("test-key"), nil)