From 2f9df8c8e2f29354e94ab39a485c1d57a64d19d0 Mon Sep 17 00:00:00 2001 From: Joshua Casey Date: Tue, 21 May 2024 10:43:52 -0500 Subject: [PATCH] Add module generate command and update all generated files --- hack/module.sh | 3 +++ internal/mocks/mockcredentialrequest/generate.go | 4 ++-- .../mocks/mockcredentialrequest/mockcredentialrequest.go | 6 +++--- internal/mocks/mockissuer/generate.go | 4 ++-- internal/mocks/mockissuer/mockissuer.go | 6 +++--- internal/mocks/mockkubecertagent/generate.go | 4 ++-- internal/mocks/mockkubecertagent/mockdynamiccert.go | 2 +- internal/mocks/mockkubecertagent/mockpodcommandexecutor.go | 5 ++--- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/hack/module.sh b/hack/module.sh index 17f83976b..647ccb1e1 100755 --- a/hack/module.sh +++ b/hack/module.sh @@ -50,6 +50,9 @@ function main() { KUBE_PANIC_WATCH_DECODE_ERROR=${kube_panic_watch_decode_error} \ go test -short -race ./... ;; + 'generate') + go generate ./internal/mocks/... + ;; *) usage ;; diff --git a/internal/mocks/mockcredentialrequest/generate.go b/internal/mocks/mockcredentialrequest/generate.go index ef425dfb1..9663ed8e9 100644 --- a/internal/mocks/mockcredentialrequest/generate.go +++ b/internal/mocks/mockcredentialrequest/generate.go @@ -1,6 +1,6 @@ // Copyright 2020-2024 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package credentialrequestmocks +package mockcredentialrequest -//go:generate go run -v go.uber.org/mock/mockgen -destination=credentialrequestmocks.go -package=credentialrequestmocks -copyright_file=../../../hack/header.txt go.pinniped.dev/internal/registry/credentialrequest TokenCredentialRequestAuthenticator +//go:generate go run -v go.uber.org/mock/mockgen -destination=mockcredentialrequest.go -package=mockcredentialrequest -copyright_file=../../../hack/header.txt go.pinniped.dev/internal/registry/credentialrequest TokenCredentialRequestAuthenticator diff --git a/internal/mocks/mockcredentialrequest/mockcredentialrequest.go b/internal/mocks/mockcredentialrequest/mockcredentialrequest.go index 041a897fa..93c3cad48 100644 --- a/internal/mocks/mockcredentialrequest/mockcredentialrequest.go +++ b/internal/mocks/mockcredentialrequest/mockcredentialrequest.go @@ -7,11 +7,11 @@ // // Generated by this command: // -// mockgen -destination=credentialrequestmocks.go -package=credentialrequestmocks -copyright_file=../../../hack/header.txt go.pinniped.dev/internal/registry/credentialrequest TokenCredentialRequestAuthenticator +// mockgen -destination=mockcredentialrequest.go -package=mockcredentialrequest -copyright_file=../../../hack/header.txt go.pinniped.dev/internal/registry/credentialrequest TokenCredentialRequestAuthenticator // -// Package credentialrequestmocks is a generated GoMock package. -package credentialrequestmocks +// Package mockcredentialrequest is a generated GoMock package. +package mockcredentialrequest import ( context "context" diff --git a/internal/mocks/mockissuer/generate.go b/internal/mocks/mockissuer/generate.go index 7296a44d6..d1b8594a9 100644 --- a/internal/mocks/mockissuer/generate.go +++ b/internal/mocks/mockissuer/generate.go @@ -1,6 +1,6 @@ // Copyright 2020-2024 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package issuermocks +package mockissuer -//go:generate go run -v go.uber.org/mock/mockgen -destination=issuermocks.go -package=issuermocks -copyright_file=../../../hack/header.txt go.pinniped.dev/internal/clientcertissuer ClientCertIssuer +//go:generate go run -v go.uber.org/mock/mockgen -destination=mockissuer.go -package=mockissuer -copyright_file=../../../hack/header.txt go.pinniped.dev/internal/clientcertissuer ClientCertIssuer diff --git a/internal/mocks/mockissuer/mockissuer.go b/internal/mocks/mockissuer/mockissuer.go index 35f979bc9..35a061778 100644 --- a/internal/mocks/mockissuer/mockissuer.go +++ b/internal/mocks/mockissuer/mockissuer.go @@ -7,11 +7,11 @@ // // Generated by this command: // -// mockgen -destination=issuermocks.go -package=issuermocks -copyright_file=../../../hack/header.txt go.pinniped.dev/internal/clientcertissuer ClientCertIssuer +// mockgen -destination=mockissuer.go -package=mockissuer -copyright_file=../../../hack/header.txt go.pinniped.dev/internal/clientcertissuer ClientCertIssuer // -// Package issuermocks is a generated GoMock package. -package issuermocks +// Package mockissuer is a generated GoMock package. +package mockissuer import ( reflect "reflect" diff --git a/internal/mocks/mockkubecertagent/generate.go b/internal/mocks/mockkubecertagent/generate.go index 488abb703..c48ccd5b4 100644 --- a/internal/mocks/mockkubecertagent/generate.go +++ b/internal/mocks/mockkubecertagent/generate.go @@ -3,5 +3,5 @@ package mocks -//go:generate go run -v go.uber.org/mock/mockgen -destination=mockpodcommandexecutor.go -package=mocks -copyright_file=../../../../hack/header.txt go.pinniped.dev/internal/controller/kubecertagent PodCommandExecutor -//go:generate go run -v go.uber.org/mock/mockgen -destination=mockdynamiccert.go -package=mocks -copyright_file=../../../../hack/header.txt -mock_names Private=MockDynamicCertPrivate go.pinniped.dev/internal/dynamiccert Private +//go:generate go run -v go.uber.org/mock/mockgen -destination=mockpodcommandexecutor.go -package=mocks -copyright_file=../../../hack/header.txt go.pinniped.dev/internal/controller/kubecertagent PodCommandExecutor +//go:generate go run -v go.uber.org/mock/mockgen -destination=mockdynamiccert.go -package=mocks -copyright_file=../../../hack/header.txt -mock_names Private=MockDynamicCertPrivate go.pinniped.dev/internal/dynamiccert Private diff --git a/internal/mocks/mockkubecertagent/mockdynamiccert.go b/internal/mocks/mockkubecertagent/mockdynamiccert.go index 83429341f..08af407c4 100644 --- a/internal/mocks/mockkubecertagent/mockdynamiccert.go +++ b/internal/mocks/mockkubecertagent/mockdynamiccert.go @@ -7,7 +7,7 @@ // // Generated by this command: // -// mockgen -destination=mockdynamiccert.go -package=mocks -copyright_file=../../../../hack/header.txt -mock_names Private=MockDynamicCertPrivate go.pinniped.dev/internal/dynamiccert Private +// mockgen -destination=mockdynamiccert.go -package=mocks -copyright_file=../../../hack/header.txt -mock_names Private=MockDynamicCertPrivate go.pinniped.dev/internal/dynamiccert Private // // Package mocks is a generated GoMock package. diff --git a/internal/mocks/mockkubecertagent/mockpodcommandexecutor.go b/internal/mocks/mockkubecertagent/mockpodcommandexecutor.go index ef6379620..87746b0b3 100644 --- a/internal/mocks/mockkubecertagent/mockpodcommandexecutor.go +++ b/internal/mocks/mockkubecertagent/mockpodcommandexecutor.go @@ -7,7 +7,7 @@ // // Generated by this command: // -// mockgen -destination=mockpodcommandexecutor.go -package=mocks -copyright_file=../../../../hack/header.txt go.pinniped.dev/internal/controller/kubecertagent PodCommandExecutor +// mockgen -destination=mockpodcommandexecutor.go -package=mocks -copyright_file=../../../hack/header.txt go.pinniped.dev/internal/controller/kubecertagent PodCommandExecutor // // Package mocks is a generated GoMock package. @@ -16,7 +16,6 @@ package mocks import ( context "context" reflect "reflect" - "slices" gomock "go.uber.org/mock/gomock" ) @@ -60,6 +59,6 @@ func (m *MockPodCommandExecutor) Exec(arg0 context.Context, arg1, arg2, arg3 str // Exec indicates an expected call of Exec. func (mr *MockPodCommandExecutorMockRecorder) Exec(arg0, arg1, arg2, arg3 any, arg4 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := slices.Concat([]any{arg0, arg1, arg2, arg3}, arg4) + varargs := append([]any{arg0, arg1, arg2, arg3}, arg4...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockPodCommandExecutor)(nil).Exec), varargs...) }