From bf86bc3383c3617bf532aed952b478a908fe36c3 Mon Sep 17 00:00:00 2001 From: aram price Date: Mon, 14 Dec 2020 18:36:56 -0800 Subject: [PATCH] Rename for clarity --- .../generator/oidc_provider_secrets.go | 2 +- .../generator/oidc_provider_secrets_test.go | 6 +++--- .../supervisorconfig/generator/secret_helper.go | 6 +++--- internal/mocks/mocksecrethelper/mocksecrethelper.go | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/controller/supervisorconfig/generator/oidc_provider_secrets.go b/internal/controller/supervisorconfig/generator/oidc_provider_secrets.go index 4baf04712..01f0c4912 100644 --- a/internal/controller/supervisorconfig/generator/oidc_provider_secrets.go +++ b/internal/controller/supervisorconfig/generator/oidc_provider_secrets.go @@ -41,7 +41,7 @@ func NewOIDCProviderSecretsController( ) controllerlib.Controller { return controllerlib.New( controllerlib.Config{ - Name: fmt.Sprintf("%s%s", secretHelper.Name(), "controller"), + Name: fmt.Sprintf("%s%s", secretHelper.NamePrefix(), "controller"), Syncer: &oidcProviderSecretsController{ secretHelper: secretHelper, kubeClient: kubeClient, diff --git a/internal/controller/supervisorconfig/generator/oidc_provider_secrets_test.go b/internal/controller/supervisorconfig/generator/oidc_provider_secrets_test.go index a271aa222..68cbc4bf2 100644 --- a/internal/controller/supervisorconfig/generator/oidc_provider_secrets_test.go +++ b/internal/controller/supervisorconfig/generator/oidc_provider_secrets_test.go @@ -144,7 +144,7 @@ func TestOIDCProviderControllerFilterSecret(t *testing.T) { ctrl := gomock.NewController(t) t.Cleanup(ctrl.Finish) secretHelper := mocksecrethelper.NewMockSecretHelper(ctrl) - secretHelper.EXPECT().Name().Times(1).Return("some-name") + secretHelper.EXPECT().NamePrefix().Times(1).Return("some-name") secretInformer := kubeinformers.NewSharedInformerFactory( kubernetesfake.NewSimpleClientset(), @@ -202,7 +202,7 @@ func TestNewOIDCProviderSecretsControllerFilterOPC(t *testing.T) { ctrl := gomock.NewController(t) t.Cleanup(ctrl.Finish) secretHelper := mocksecrethelper.NewMockSecretHelper(ctrl) - secretHelper.EXPECT().Name().Times(1).Return("some-name") + secretHelper.EXPECT().NamePrefix().Times(1).Return("some-name") secretInformer := kubeinformers.NewSharedInformerFactory( kubernetesfake.NewSimpleClientset(), @@ -511,7 +511,7 @@ func TestOIDCProviderSecretsControllerSync(t *testing.T) { ctrl := gomock.NewController(t) t.Cleanup(ctrl.Finish) secretHelper := mocksecrethelper.NewMockSecretHelper(ctrl) - secretHelper.EXPECT().Name().Times(1).Return("some-name") + secretHelper.EXPECT().NamePrefix().Times(1).Return("some-name") if test.secretHelper != nil { test.secretHelper(secretHelper) } diff --git a/internal/controller/supervisorconfig/generator/secret_helper.go b/internal/controller/supervisorconfig/generator/secret_helper.go index 76e136f13..54ba49f55 100644 --- a/internal/controller/supervisorconfig/generator/secret_helper.go +++ b/internal/controller/supervisorconfig/generator/secret_helper.go @@ -17,9 +17,9 @@ import ( // SecretHelper describes an object that can Generate() a Secret and determine whether a Secret // IsValid(). It can also be Notify()'d about a Secret being persisted. // -// A SecretHelper has a Name() that can be used to identify it from other SecretHelper instances. +// A SecretHelper has a NamePrefix() that can be used to identify it from other SecretHelper instances. type SecretHelper interface { - Name() string + NamePrefix() string Generate(*configv1alpha1.OIDCProvider) (*corev1.Secret, error) IsValid(*configv1alpha1.OIDCProvider, *corev1.Secret) bool Notify(*configv1alpha1.OIDCProvider, *corev1.Secret) @@ -60,7 +60,7 @@ type symmetricSecretHelper struct { notifyFunc func(parent *configv1alpha1.OIDCProvider, child *corev1.Secret) } -func (s *symmetricSecretHelper) Name() string { return s.namePrefix } +func (s *symmetricSecretHelper) NamePrefix() string { return s.namePrefix } // Generate implements SecretHelper.Generate(). func (s *symmetricSecretHelper) Generate(parent *configv1alpha1.OIDCProvider) (*corev1.Secret, error) { diff --git a/internal/mocks/mocksecrethelper/mocksecrethelper.go b/internal/mocks/mocksecrethelper/mocksecrethelper.go index 68b185f31..d191d2d98 100644 --- a/internal/mocks/mocksecrethelper/mocksecrethelper.go +++ b/internal/mocks/mocksecrethelper/mocksecrethelper.go @@ -67,18 +67,18 @@ func (mr *MockSecretHelperMockRecorder) IsValid(arg0, arg1 interface{}) *gomock. return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsValid", reflect.TypeOf((*MockSecretHelper)(nil).IsValid), arg0, arg1) } -// Name mocks base method -func (m *MockSecretHelper) Name() string { +// NamePrefix mocks base method +func (m *MockSecretHelper) NamePrefix() string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Name") + ret := m.ctrl.Call(m, "NamePrefix") ret0, _ := ret[0].(string) return ret0 } -// Name indicates an expected call of Name -func (mr *MockSecretHelperMockRecorder) Name() *gomock.Call { +// NamePrefix indicates an expected call of NamePrefix +func (mr *MockSecretHelperMockRecorder) NamePrefix() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockSecretHelper)(nil).Name)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NamePrefix", reflect.TypeOf((*MockSecretHelper)(nil).NamePrefix)) } // Notify mocks base method