diff --git a/go.mod b/go.mod index cfaf328571..0f3a7025ec 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.7.0 github.com/itchyny/gojq v0.12.17 - github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 + github.com/maxbrunsfeld/counterfeiter/v6 v6.11.3 github.com/mitchellh/hashstructure v1.1.0 github.com/mitchellh/mapstructure v1.5.0 github.com/onsi/ginkgo/v2 v2.23.4 diff --git a/go.sum b/go.sum index 809139c0b9..4da6767012 100644 --- a/go.sum +++ b/go.sum @@ -1793,8 +1793,8 @@ github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-sqlite3 v1.14.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A= github.com/mattn/go-sqlite3 v1.14.28/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 h1:yVCLo4+ACVroOEr4iFU1iH46Ldlzz2rTuu18Ra7M8sU= -github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2/go.mod h1:VzB2VoMh1Y32/QqDfg9ZJYHj99oM4LiGtqPZydTiQSQ= +github.com/maxbrunsfeld/counterfeiter/v6 v6.11.3 h1:Eaq36EIyJNp7b3qDhjV7jmDVq/yPeW2v4pTqzGbOGB4= +github.com/maxbrunsfeld/counterfeiter/v6 v6.11.3/go.mod h1:6KKUoQBZBW6PDXJtNfqeEjPXMj/ITTk+cWK9t9uS5+E= github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU= github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= diff --git a/pkg/api/wrappers/wrappersfakes/fake_install_strategy_deployment_interface.go b/pkg/api/wrappers/wrappersfakes/fake_install_strategy_deployment_interface.go index 022d580264..b24538859d 100644 --- a/pkg/api/wrappers/wrappersfakes/fake_install_strategy_deployment_interface.go +++ b/pkg/api/wrappers/wrappersfakes/fake_install_strategy_deployment_interface.go @@ -843,28 +843,6 @@ func (fake *FakeInstallStrategyDeploymentInterface) GetServiceAccountByNameRetur func (fake *FakeInstallStrategyDeploymentInterface) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.createDeploymentMutex.RLock() - defer fake.createDeploymentMutex.RUnlock() - fake.createOrUpdateDeploymentMutex.RLock() - defer fake.createOrUpdateDeploymentMutex.RUnlock() - fake.createRoleMutex.RLock() - defer fake.createRoleMutex.RUnlock() - fake.createRoleBindingMutex.RLock() - defer fake.createRoleBindingMutex.RUnlock() - fake.deleteDeploymentMutex.RLock() - defer fake.deleteDeploymentMutex.RUnlock() - fake.ensureServiceAccountMutex.RLock() - defer fake.ensureServiceAccountMutex.RUnlock() - fake.findAnyDeploymentsMatchingLabelsMutex.RLock() - defer fake.findAnyDeploymentsMatchingLabelsMutex.RUnlock() - fake.findAnyDeploymentsMatchingNamesMutex.RLock() - defer fake.findAnyDeploymentsMatchingNamesMutex.RUnlock() - fake.getOpClientMutex.RLock() - defer fake.getOpClientMutex.RUnlock() - fake.getOpListerMutex.RLock() - defer fake.getOpListerMutex.RUnlock() - fake.getServiceAccountByNameMutex.RLock() - defer fake.getServiceAccountByNameMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/controller/bundle/bundlefakes/fake_unpacker.go b/pkg/controller/bundle/bundlefakes/fake_unpacker.go index f710412ac9..4c388ed43a 100644 --- a/pkg/controller/bundle/bundlefakes/fake_unpacker.go +++ b/pkg/controller/bundle/bundlefakes/fake_unpacker.go @@ -98,8 +98,6 @@ func (fake *FakeUnpacker) UnpackBundleReturnsOnCall(i int, result1 *bundle.Bundl func (fake *FakeUnpacker) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.unpackBundleMutex.RLock() - defer fake.unpackBundleMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/controller/registry/resolver/solver/zz_search_test.go b/pkg/controller/registry/resolver/solver/zz_search_test.go index f3f8be8fd5..d84e6efd3b 100644 --- a/pkg/controller/registry/resolver/solver/zz_search_test.go +++ b/pkg/controller/registry/resolver/solver/zz_search_test.go @@ -851,32 +851,6 @@ func (fake *FakeS) WhyReturnsOnCall(i int, result1 []z.Lit) { func (fake *FakeS) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.addMutex.RLock() - defer fake.addMutex.RUnlock() - fake.assumeMutex.RLock() - defer fake.assumeMutex.RUnlock() - fake.goSolveMutex.RLock() - defer fake.goSolveMutex.RUnlock() - fake.litMutex.RLock() - defer fake.litMutex.RUnlock() - fake.maxVarMutex.RLock() - defer fake.maxVarMutex.RUnlock() - fake.reasonsMutex.RLock() - defer fake.reasonsMutex.RUnlock() - fake.sCopyMutex.RLock() - defer fake.sCopyMutex.RUnlock() - fake.solveMutex.RLock() - defer fake.solveMutex.RUnlock() - fake.testMutex.RLock() - defer fake.testMutex.RUnlock() - fake.tryMutex.RLock() - defer fake.tryMutex.RUnlock() - fake.untestMutex.RLock() - defer fake.untestMutex.RUnlock() - fake.valueMutex.RLock() - defer fake.valueMutex.RUnlock() - fake.whyMutex.RLock() - defer fake.whyMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_rbac_v1_clusterrolebinding_lister.go b/pkg/fakes/client-go/listers/fake_rbac_v1_clusterrolebinding_lister.go index c8d5145b60..77fcc2d59c 100644 --- a/pkg/fakes/client-go/listers/fake_rbac_v1_clusterrolebinding_lister.go +++ b/pkg/fakes/client-go/listers/fake_rbac_v1_clusterrolebinding_lister.go @@ -171,10 +171,6 @@ func (fake *FakeClusterRoleBindingLister) ListReturnsOnCall(i int, result1 []*v1 func (fake *FakeClusterRoleBindingLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.getMutex.RLock() - defer fake.getMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_rbac_v1_role_lister.go b/pkg/fakes/client-go/listers/fake_rbac_v1_role_lister.go index 572d652e6d..82eed6967a 100644 --- a/pkg/fakes/client-go/listers/fake_rbac_v1_role_lister.go +++ b/pkg/fakes/client-go/listers/fake_rbac_v1_role_lister.go @@ -166,10 +166,6 @@ func (fake *FakeRoleLister) RolesReturnsOnCall(i int, result1 v1.RoleNamespaceLi func (fake *FakeRoleLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - fake.rolesMutex.RLock() - defer fake.rolesMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_rbac_v1_role_namespace_lister.go b/pkg/fakes/client-go/listers/fake_rbac_v1_role_namespace_lister.go index 52aa39bed6..e3432c88fb 100644 --- a/pkg/fakes/client-go/listers/fake_rbac_v1_role_namespace_lister.go +++ b/pkg/fakes/client-go/listers/fake_rbac_v1_role_namespace_lister.go @@ -171,10 +171,6 @@ func (fake *FakeRoleNamespaceLister) ListReturnsOnCall(i int, result1 []*v1a.Rol func (fake *FakeRoleNamespaceLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.getMutex.RLock() - defer fake.getMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_rbac_v1_rolebinding_lister.go b/pkg/fakes/client-go/listers/fake_rbac_v1_rolebinding_lister.go index 1ba69b7956..7caeab6ca5 100644 --- a/pkg/fakes/client-go/listers/fake_rbac_v1_rolebinding_lister.go +++ b/pkg/fakes/client-go/listers/fake_rbac_v1_rolebinding_lister.go @@ -166,10 +166,6 @@ func (fake *FakeRoleBindingLister) RoleBindingsReturnsOnCall(i int, result1 v1.R func (fake *FakeRoleBindingLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - fake.roleBindingsMutex.RLock() - defer fake.roleBindingsMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_rbac_v1_rolebinding_namespace_lister.go b/pkg/fakes/client-go/listers/fake_rbac_v1_rolebinding_namespace_lister.go index 858563e503..fdda3a76cf 100644 --- a/pkg/fakes/client-go/listers/fake_rbac_v1_rolebinding_namespace_lister.go +++ b/pkg/fakes/client-go/listers/fake_rbac_v1_rolebinding_namespace_lister.go @@ -171,10 +171,6 @@ func (fake *FakeRoleBindingNamespaceLister) ListReturnsOnCall(i int, result1 []* func (fake *FakeRoleBindingNamespaceLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.getMutex.RLock() - defer fake.getMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_v1_secret_lister.go b/pkg/fakes/client-go/listers/fake_v1_secret_lister.go index 1f0be9775c..c07aa9f450 100644 --- a/pkg/fakes/client-go/listers/fake_v1_secret_lister.go +++ b/pkg/fakes/client-go/listers/fake_v1_secret_lister.go @@ -166,10 +166,6 @@ func (fake *FakeSecretLister) SecretsReturnsOnCall(i int, result1 v1.SecretNames func (fake *FakeSecretLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - fake.secretsMutex.RLock() - defer fake.secretsMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_v1_secret_namespace_lister.go b/pkg/fakes/client-go/listers/fake_v1_secret_namespace_lister.go index 745bf8cfe0..b4c70b1f95 100644 --- a/pkg/fakes/client-go/listers/fake_v1_secret_namespace_lister.go +++ b/pkg/fakes/client-go/listers/fake_v1_secret_namespace_lister.go @@ -171,10 +171,6 @@ func (fake *FakeSecretNamespaceLister) ListReturnsOnCall(i int, result1 []*v1a.S func (fake *FakeSecretNamespaceLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.getMutex.RLock() - defer fake.getMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_v1_service_account_lister.go b/pkg/fakes/client-go/listers/fake_v1_service_account_lister.go index ef7b3619af..9c417b127e 100644 --- a/pkg/fakes/client-go/listers/fake_v1_service_account_lister.go +++ b/pkg/fakes/client-go/listers/fake_v1_service_account_lister.go @@ -166,10 +166,6 @@ func (fake *FakeServiceAccountLister) ServiceAccountsReturnsOnCall(i int, result func (fake *FakeServiceAccountLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - fake.serviceAccountsMutex.RLock() - defer fake.serviceAccountsMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_v1_service_account_namespace_lister.go b/pkg/fakes/client-go/listers/fake_v1_service_account_namespace_lister.go index fc70380fea..b6cd697361 100644 --- a/pkg/fakes/client-go/listers/fake_v1_service_account_namespace_lister.go +++ b/pkg/fakes/client-go/listers/fake_v1_service_account_namespace_lister.go @@ -171,10 +171,6 @@ func (fake *FakeServiceAccountNamespaceLister) ListReturnsOnCall(i int, result1 func (fake *FakeServiceAccountNamespaceLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.getMutex.RLock() - defer fake.getMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_v1_service_lister.go b/pkg/fakes/client-go/listers/fake_v1_service_lister.go index d92397c35c..3a3a7dfd22 100644 --- a/pkg/fakes/client-go/listers/fake_v1_service_lister.go +++ b/pkg/fakes/client-go/listers/fake_v1_service_lister.go @@ -166,10 +166,6 @@ func (fake *FakeServiceLister) ServicesReturnsOnCall(i int, result1 v1.ServiceNa func (fake *FakeServiceLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - fake.servicesMutex.RLock() - defer fake.servicesMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/client-go/listers/fake_v1_service_namespace_lister.go b/pkg/fakes/client-go/listers/fake_v1_service_namespace_lister.go index ed3f7ec881..02e7c77ac5 100644 --- a/pkg/fakes/client-go/listers/fake_v1_service_namespace_lister.go +++ b/pkg/fakes/client-go/listers/fake_v1_service_namespace_lister.go @@ -171,10 +171,6 @@ func (fake *FakeServiceNamespaceLister) ListReturnsOnCall(i int, result1 []*v1a. func (fake *FakeServiceNamespaceLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.getMutex.RLock() - defer fake.getMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/fake_reconciler.go b/pkg/fakes/fake_reconciler.go index 2f15bf8a3b..dce319b547 100644 --- a/pkg/fakes/fake_reconciler.go +++ b/pkg/fakes/fake_reconciler.go @@ -170,10 +170,6 @@ func (fake *FakeRegistryReconciler) EnsureRegistryServerReturnsOnCall(i int, res func (fake *FakeRegistryReconciler) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.checkRegistryServerMutex.RLock() - defer fake.checkRegistryServerMutex.RUnlock() - fake.ensureRegistryServerMutex.RLock() - defer fake.ensureRegistryServerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/fake_reconciler_factory.go b/pkg/fakes/fake_reconciler_factory.go index 2797300230..58cf7a4af8 100644 --- a/pkg/fakes/fake_reconciler_factory.go +++ b/pkg/fakes/fake_reconciler_factory.go @@ -88,8 +88,6 @@ func (fake *FakeRegistryReconcilerFactory) ReconcilerForSourceReturnsOnCall(i in func (fake *FakeRegistryReconcilerFactory) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.reconcilerForSourceMutex.RLock() - defer fake.reconcilerForSourceMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/fake_registry_store.go b/pkg/fakes/fake_registry_store.go index 8cc33bf3ee..aa4aec059d 100644 --- a/pkg/fakes/fake_registry_store.go +++ b/pkg/fakes/fake_registry_store.go @@ -2089,58 +2089,6 @@ func (fake *FakeQuery) SendBundlesReturnsOnCall(i int, result1 error) { func (fake *FakeQuery) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.getApisForEntryMutex.RLock() - defer fake.getApisForEntryMutex.RUnlock() - fake.getBundleMutex.RLock() - defer fake.getBundleMutex.RUnlock() - fake.getBundleForChannelMutex.RLock() - defer fake.getBundleForChannelMutex.RUnlock() - fake.getBundlePathIfExistsMutex.RLock() - defer fake.getBundlePathIfExistsMutex.RUnlock() - fake.getBundlePathsForPackageMutex.RLock() - defer fake.getBundlePathsForPackageMutex.RUnlock() - fake.getBundleThatProvidesMutex.RLock() - defer fake.getBundleThatProvidesMutex.RUnlock() - fake.getBundleThatReplacesMutex.RLock() - defer fake.getBundleThatReplacesMutex.RUnlock() - fake.getBundleVersionMutex.RLock() - defer fake.getBundleVersionMutex.RUnlock() - fake.getBundlesForPackageMutex.RLock() - defer fake.getBundlesForPackageMutex.RUnlock() - fake.getChannelEntriesFromPackageMutex.RLock() - defer fake.getChannelEntriesFromPackageMutex.RUnlock() - fake.getChannelEntriesThatProvideMutex.RLock() - defer fake.getChannelEntriesThatProvideMutex.RUnlock() - fake.getChannelEntriesThatReplaceMutex.RLock() - defer fake.getChannelEntriesThatReplaceMutex.RUnlock() - fake.getCurrentCSVNameForChannelMutex.RLock() - defer fake.getCurrentCSVNameForChannelMutex.RUnlock() - fake.getDefaultChannelForPackageMutex.RLock() - defer fake.getDefaultChannelForPackageMutex.RUnlock() - fake.getDefaultPackageMutex.RLock() - defer fake.getDefaultPackageMutex.RUnlock() - fake.getDependenciesForBundleMutex.RLock() - defer fake.getDependenciesForBundleMutex.RUnlock() - fake.getImagesForBundleMutex.RLock() - defer fake.getImagesForBundleMutex.RUnlock() - fake.getLatestChannelEntriesThatProvideMutex.RLock() - defer fake.getLatestChannelEntriesThatProvideMutex.RUnlock() - fake.getPackageMutex.RLock() - defer fake.getPackageMutex.RUnlock() - fake.listBundlesMutex.RLock() - defer fake.listBundlesMutex.RUnlock() - fake.listChannelsMutex.RLock() - defer fake.listChannelsMutex.RUnlock() - fake.listImagesMutex.RLock() - defer fake.listImagesMutex.RUnlock() - fake.listPackagesMutex.RLock() - defer fake.listPackagesMutex.RUnlock() - fake.listRegistryBundlesMutex.RLock() - defer fake.listRegistryBundlesMutex.RUnlock() - fake.listTablesMutex.RLock() - defer fake.listTablesMutex.RUnlock() - fake.sendBundlesMutex.RLock() - defer fake.sendBundlesMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/fake_resolver.go b/pkg/fakes/fake_resolver.go index 6f766ece18..5ae5c72d4d 100644 --- a/pkg/fakes/fake_resolver.go +++ b/pkg/fakes/fake_resolver.go @@ -103,8 +103,6 @@ func (fake *FakeStepResolver) ResolveStepsReturnsOnCall(i int, result1 []*v1alph func (fake *FakeStepResolver) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.resolveStepsMutex.RLock() - defer fake.resolveStepsMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/fake_strategy.go b/pkg/fakes/fake_strategy.go index 6930c046e4..94b366c522 100644 --- a/pkg/fakes/fake_strategy.go +++ b/pkg/fakes/fake_strategy.go @@ -78,8 +78,6 @@ func (fake *FakeStrategy) GetStrategyNameReturnsOnCall(i int, result1 string) { func (fake *FakeStrategy) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.getStrategyNameMutex.RLock() - defer fake.getStrategyNameMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/fake_strategy_installer.go b/pkg/fakes/fake_strategy_installer.go index f3bad53359..6384c4f3d2 100644 --- a/pkg/fakes/fake_strategy_installer.go +++ b/pkg/fakes/fake_strategy_installer.go @@ -368,16 +368,6 @@ func (fake *FakeStrategyInstaller) ShouldRotateCertsReturnsOnCall(i int, result1 func (fake *FakeStrategyInstaller) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.certsRotateAtMutex.RLock() - defer fake.certsRotateAtMutex.RUnlock() - fake.certsRotatedMutex.RLock() - defer fake.certsRotatedMutex.RUnlock() - fake.checkInstalledMutex.RLock() - defer fake.checkInstalledMutex.RUnlock() - fake.installMutex.RLock() - defer fake.installMutex.RUnlock() - fake.shouldRotateCertsMutex.RLock() - defer fake.shouldRotateCertsMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/fakes/fake_strategy_resolver.go b/pkg/fakes/fake_strategy_resolver.go index 11254decc4..5e0fefe524 100644 --- a/pkg/fakes/fake_strategy_resolver.go +++ b/pkg/fakes/fake_strategy_resolver.go @@ -192,10 +192,6 @@ func (fake *FakeStrategyResolverInterface) UnmarshalStrategyReturnsOnCall(i int, func (fake *FakeStrategyResolverInterface) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.installerForStrategyMutex.RLock() - defer fake.installerForStrategyMutex.RUnlock() - fake.unmarshalStrategyMutex.RLock() - defer fake.unmarshalStrategyMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_apiextensions_v1lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_apiextensions_v1lister.go index 06f856a397..138950ff57 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_apiextensions_v1lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_apiextensions_v1lister.go @@ -116,10 +116,6 @@ func (fake *FakeAPIExtensionsV1Lister) RegisterCustomResourceDefinitionListerArg func (fake *FakeAPIExtensionsV1Lister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.customResourceDefinitionListerMutex.RLock() - defer fake.customResourceDefinitionListerMutex.RUnlock() - fake.registerCustomResourceDefinitionListerMutex.RLock() - defer fake.registerCustomResourceDefinitionListerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_apiregistration_v1lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_apiregistration_v1lister.go index 7300a4afaf..cc6ed0d2fe 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_apiregistration_v1lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_apiregistration_v1lister.go @@ -116,10 +116,6 @@ func (fake *FakeAPIRegistrationV1Lister) RegisterAPIServiceListerArgsForCall(i i func (fake *FakeAPIRegistrationV1Lister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.aPIServiceListerMutex.RLock() - defer fake.aPIServiceListerMutex.RUnlock() - fake.registerAPIServiceListerMutex.RLock() - defer fake.registerAPIServiceListerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_apps_v1lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_apps_v1lister.go index be84f79f02..53e64161c1 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_apps_v1lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_apps_v1lister.go @@ -118,10 +118,6 @@ func (fake *FakeAppsV1Lister) RegisterDeploymentListerArgsForCall(i int) (string func (fake *FakeAppsV1Lister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.deploymentListerMutex.RLock() - defer fake.deploymentListerMutex.RUnlock() - fake.registerDeploymentListerMutex.RLock() - defer fake.registerDeploymentListerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_clusterserviceversion_v1alpha1_lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_clusterserviceversion_v1alpha1_lister.go index e2c5235fc8..d0e0a271a6 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_clusterserviceversion_v1alpha1_lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_clusterserviceversion_v1alpha1_lister.go @@ -166,10 +166,6 @@ func (fake *FakeClusterServiceVersionLister) ListReturnsOnCall(i int, result1 [] func (fake *FakeClusterServiceVersionLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.clusterServiceVersionsMutex.RLock() - defer fake.clusterServiceVersionsMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_clusterserviceversion_v1alpha1_namespace_lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_clusterserviceversion_v1alpha1_namespace_lister.go index 483f1b0dd0..63e14aeb1d 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_clusterserviceversion_v1alpha1_namespace_lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_clusterserviceversion_v1alpha1_namespace_lister.go @@ -171,10 +171,6 @@ func (fake *FakeClusterServiceVersionNamespaceLister) ListReturnsOnCall(i int, r func (fake *FakeClusterServiceVersionNamespaceLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.getMutex.RLock() - defer fake.getMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_core_v1lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_core_v1lister.go index 48ee59f232..99e222e063 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_core_v1lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_core_v1lister.go @@ -626,30 +626,6 @@ func (fake *FakeCoreV1Lister) ServiceListerReturnsOnCall(i int, result1 v1.Servi func (fake *FakeCoreV1Lister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.configMapListerMutex.RLock() - defer fake.configMapListerMutex.RUnlock() - fake.namespaceListerMutex.RLock() - defer fake.namespaceListerMutex.RUnlock() - fake.podListerMutex.RLock() - defer fake.podListerMutex.RUnlock() - fake.registerConfigMapListerMutex.RLock() - defer fake.registerConfigMapListerMutex.RUnlock() - fake.registerNamespaceListerMutex.RLock() - defer fake.registerNamespaceListerMutex.RUnlock() - fake.registerPodListerMutex.RLock() - defer fake.registerPodListerMutex.RUnlock() - fake.registerSecretListerMutex.RLock() - defer fake.registerSecretListerMutex.RUnlock() - fake.registerServiceAccountListerMutex.RLock() - defer fake.registerServiceAccountListerMutex.RUnlock() - fake.registerServiceListerMutex.RLock() - defer fake.registerServiceListerMutex.RUnlock() - fake.secretListerMutex.RLock() - defer fake.secretListerMutex.RUnlock() - fake.serviceAccountListerMutex.RLock() - defer fake.serviceAccountListerMutex.RUnlock() - fake.serviceListerMutex.RLock() - defer fake.serviceListerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_operator_lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_operator_lister.go index a74ce90210..7547e9e432 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_operator_lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_operator_lister.go @@ -582,24 +582,6 @@ func (fake *FakeOperatorLister) RbacV1ReturnsOnCall(i int, result1 operatorliste func (fake *FakeOperatorLister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.aPIExtensionsV1Mutex.RLock() - defer fake.aPIExtensionsV1Mutex.RUnlock() - fake.aPIRegistrationV1Mutex.RLock() - defer fake.aPIRegistrationV1Mutex.RUnlock() - fake.appsV1Mutex.RLock() - defer fake.appsV1Mutex.RUnlock() - fake.coreV1Mutex.RLock() - defer fake.coreV1Mutex.RUnlock() - fake.networkingV1Mutex.RLock() - defer fake.networkingV1Mutex.RUnlock() - fake.operatorsV1Mutex.RLock() - defer fake.operatorsV1Mutex.RUnlock() - fake.operatorsV1alpha1Mutex.RLock() - defer fake.operatorsV1alpha1Mutex.RUnlock() - fake.operatorsV2Mutex.RLock() - defer fake.operatorsV2Mutex.RUnlock() - fake.rbacV1Mutex.RLock() - defer fake.rbacV1Mutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v1alpha1lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v1alpha1lister.go index a3a4256c37..06423d95c0 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v1alpha1lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v1alpha1lister.go @@ -424,22 +424,6 @@ func (fake *FakeOperatorsV1alpha1Lister) SubscriptionListerReturnsOnCall(i int, func (fake *FakeOperatorsV1alpha1Lister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.catalogSourceListerMutex.RLock() - defer fake.catalogSourceListerMutex.RUnlock() - fake.clusterServiceVersionListerMutex.RLock() - defer fake.clusterServiceVersionListerMutex.RUnlock() - fake.installPlanListerMutex.RLock() - defer fake.installPlanListerMutex.RUnlock() - fake.registerCatalogSourceListerMutex.RLock() - defer fake.registerCatalogSourceListerMutex.RUnlock() - fake.registerClusterServiceVersionListerMutex.RLock() - defer fake.registerClusterServiceVersionListerMutex.RUnlock() - fake.registerInstallPlanListerMutex.RLock() - defer fake.registerInstallPlanListerMutex.RUnlock() - fake.registerSubscriptionListerMutex.RLock() - defer fake.registerSubscriptionListerMutex.RUnlock() - fake.subscriptionListerMutex.RLock() - defer fake.subscriptionListerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v1lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v1lister.go index 5ca20c7d14..18d80e800c 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v1lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v1lister.go @@ -118,10 +118,6 @@ func (fake *FakeOperatorsV1Lister) RegisterOperatorGroupListerArgsForCall(i int) func (fake *FakeOperatorsV1Lister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.operatorGroupListerMutex.RLock() - defer fake.operatorGroupListerMutex.RUnlock() - fake.registerOperatorGroupListerMutex.RLock() - defer fake.registerOperatorGroupListerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v2lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v2lister.go index 2239e3dff1..73d2bd5167 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v2lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_operators_v2lister.go @@ -118,10 +118,6 @@ func (fake *FakeOperatorsV2Lister) RegisterOperatorConditionListerArgsForCall(i func (fake *FakeOperatorsV2Lister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.operatorConditionListerMutex.RLock() - defer fake.operatorConditionListerMutex.RUnlock() - fake.registerOperatorConditionListerMutex.RLock() - defer fake.registerOperatorConditionListerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/lib/operatorlister/operatorlisterfakes/fake_rbac_v1lister.go b/pkg/lib/operatorlister/operatorlisterfakes/fake_rbac_v1lister.go index e8f1b1abff..6a578b93dd 100644 --- a/pkg/lib/operatorlister/operatorlisterfakes/fake_rbac_v1lister.go +++ b/pkg/lib/operatorlister/operatorlisterfakes/fake_rbac_v1lister.go @@ -420,22 +420,6 @@ func (fake *FakeRbacV1Lister) RoleListerReturnsOnCall(i int, result1 v1.RoleList func (fake *FakeRbacV1Lister) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.clusterRoleBindingListerMutex.RLock() - defer fake.clusterRoleBindingListerMutex.RUnlock() - fake.clusterRoleListerMutex.RLock() - defer fake.clusterRoleListerMutex.RUnlock() - fake.registerClusterRoleBindingListerMutex.RLock() - defer fake.registerClusterRoleBindingListerMutex.RUnlock() - fake.registerClusterRoleListerMutex.RLock() - defer fake.registerClusterRoleListerMutex.RUnlock() - fake.registerRoleBindingListerMutex.RLock() - defer fake.registerRoleBindingListerMutex.RUnlock() - fake.registerRoleListerMutex.RLock() - defer fake.registerRoleListerMutex.RUnlock() - fake.roleBindingListerMutex.RLock() - defer fake.roleBindingListerMutex.RUnlock() - fake.roleListerMutex.RLock() - defer fake.roleListerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/package-server/client/fakes/fake_list_bundles_client.go b/pkg/package-server/client/fakes/fake_list_bundles_client.go index e98a2c9525..ecaa1d0788 100644 --- a/pkg/package-server/client/fakes/fake_list_bundles_client.go +++ b/pkg/package-server/client/fakes/fake_list_bundles_client.go @@ -486,20 +486,6 @@ func (fake *FakeRegistry_ListBundlesClient) TrailerReturnsOnCall(i int, result1 func (fake *FakeRegistry_ListBundlesClient) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.closeSendMutex.RLock() - defer fake.closeSendMutex.RUnlock() - fake.contextMutex.RLock() - defer fake.contextMutex.RUnlock() - fake.headerMutex.RLock() - defer fake.headerMutex.RUnlock() - fake.recvMutex.RLock() - defer fake.recvMutex.RUnlock() - fake.recvMsgMutex.RLock() - defer fake.recvMsgMutex.RUnlock() - fake.sendMsgMutex.RLock() - defer fake.sendMsgMutex.RUnlock() - fake.trailerMutex.RLock() - defer fake.trailerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/package-server/client/fakes/fake_list_packages_client.go b/pkg/package-server/client/fakes/fake_list_packages_client.go index e24b25a870..b74a25322a 100644 --- a/pkg/package-server/client/fakes/fake_list_packages_client.go +++ b/pkg/package-server/client/fakes/fake_list_packages_client.go @@ -486,20 +486,6 @@ func (fake *FakeRegistry_ListPackagesClient) TrailerReturnsOnCall(i int, result1 func (fake *FakeRegistry_ListPackagesClient) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.closeSendMutex.RLock() - defer fake.closeSendMutex.RUnlock() - fake.contextMutex.RLock() - defer fake.contextMutex.RUnlock() - fake.headerMutex.RLock() - defer fake.headerMutex.RUnlock() - fake.recvMutex.RLock() - defer fake.recvMutex.RUnlock() - fake.recvMsgMutex.RLock() - defer fake.recvMsgMutex.RUnlock() - fake.sendMsgMutex.RLock() - defer fake.sendMsgMutex.RUnlock() - fake.trailerMutex.RLock() - defer fake.trailerMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/pkg/package-server/client/fakes/fake_registry_client.go b/pkg/package-server/client/fakes/fake_registry_client.go index 8d087c3e3f..30416a2bc1 100644 --- a/pkg/package-server/client/fakes/fake_registry_client.go +++ b/pkg/package-server/client/fakes/fake_registry_client.go @@ -827,26 +827,6 @@ func (fake *FakeRegistryClient) ListPackagesReturnsOnCall(i int, result1 api.Reg func (fake *FakeRegistryClient) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - fake.getBundleMutex.RLock() - defer fake.getBundleMutex.RUnlock() - fake.getBundleForChannelMutex.RLock() - defer fake.getBundleForChannelMutex.RUnlock() - fake.getBundleThatReplacesMutex.RLock() - defer fake.getBundleThatReplacesMutex.RUnlock() - fake.getChannelEntriesThatProvideMutex.RLock() - defer fake.getChannelEntriesThatProvideMutex.RUnlock() - fake.getChannelEntriesThatReplaceMutex.RLock() - defer fake.getChannelEntriesThatReplaceMutex.RUnlock() - fake.getDefaultBundleThatProvidesMutex.RLock() - defer fake.getDefaultBundleThatProvidesMutex.RUnlock() - fake.getLatestChannelEntriesThatProvideMutex.RLock() - defer fake.getLatestChannelEntriesThatProvideMutex.RUnlock() - fake.getPackageMutex.RLock() - defer fake.getPackageMutex.RUnlock() - fake.listBundlesMutex.RLock() - defer fake.listBundlesMutex.RUnlock() - fake.listPackagesMutex.RLock() - defer fake.listPackagesMutex.RUnlock() copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/.gitignore b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/.gitignore index 1597f12b71..070b2a1fc9 100644 --- a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/.gitignore +++ b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/.gitignore @@ -30,3 +30,4 @@ integration/testdata/output *.profile *.bench /.vscode +.DS_Store diff --git a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/README.md b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/README.md index db70f92c2d..dd36898987 100644 --- a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/README.md +++ b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/README.md @@ -20,25 +20,14 @@ If you are having problems with `counterfeiter` and are not using a supported ve Typically, `counterfeiter` is used in `go generate` directives. It can be frustrating when you change your interface declaration and suddenly all of your generated code is suddenly out-of-date. The best practice here is to use the [`go generate` command](https://blog.golang.org/generate) to make it easier to keep your test doubles up to date. -#### Step 1 - Create `tools.go` +⚠️ If you are working with go 1.23 or earlier, please refer to an [older version of this README](https://github.com/maxbrunsfeld/counterfeiter/blob/e39cbe6aaa94a0b6718cf3d413cd5319c3a1f6fa/README.md#using-counterfeiter), as the instructions below assume go 1.24 (which added `go tool` support) and later. -You can take a dependency on tools by creating a `tools.go` file, as described in [How can I track tool dependencies for a module?](https://go.dev/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module). This ensures that everyone working with your module is using the same version of each tool you use. +#### Step 1 - Add `counterfeiter` as a tool dependency -```shell -$ cat tools/tools.go -``` - -```go -//go:build tools +Establish a tool dependency on counterfeiter by running the following command: -package tools - -import ( - _ "github.com/maxbrunsfeld/counterfeiter/v6" -) - -// This file imports packages that are used when running go generate, or used -// during the development process but not otherwise depended on by built code. +```shell +go get -tool github.com/maxbrunsfeld/counterfeiter/v6 ``` #### Step 2a - Add `go:generate` Directives @@ -52,7 +41,7 @@ $ cat myinterface.go ```go package foo -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . MySpecialInterface +//go:generate go tool counterfeiter . MySpecialInterface type MySpecialInterface interface { DoThings(string, uint64) (int, error) @@ -67,8 +56,8 @@ Writing `FakeMySpecialInterface` to `foofakes/fake_my_special_interface.go`... D #### Step 2b - Add `counterfeiter:generate` Directives If you plan to have many directives in a single package, consider using this -option. You can add directives right next to your interface definitions -(or not), in any `.go` file in your module. +option, as it will speed things up considerably. You can add directives right +next to your interface definitions (or not), in any `.go` file in your module. ```shell $ cat myinterface.go @@ -78,7 +67,7 @@ $ cat myinterface.go package foo // You only need **one** of these per package! -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//go:generate go tool counterfeiter -generate // You will add lots of directives like these in the same package... //counterfeiter:generate . MySpecialInterface @@ -112,7 +101,7 @@ $ go generate ./... You can use the following command to invoke `counterfeiter` from within a go module: ```shell -$ go run github.com/maxbrunsfeld/counterfeiter/v6 +$ go tool counterfeiter USAGE counterfeiter @@ -153,7 +142,7 @@ type MySpecialInterface interface { ``` ```shell -$ go run github.com/maxbrunsfeld/counterfeiter/v6 path/to/foo MySpecialInterface +$ go tool counterfeiter path/to/foo MySpecialInterface Wrote `FakeMySpecialInterface` to `path/to/foo/foofakes/fake_my_special_interface.go` ``` @@ -196,7 +185,7 @@ For more examples of using the `counterfeiter` API, look at [some of the provide For third party interfaces, you can specify the interface using the alternative syntax `.`, for example: ```shell -$ go run github.com/maxbrunsfeld/counterfeiter/v6 github.com/go-redis/redis.Pipeliner +$ go tool counterfeiter github.com/go-redis/redis.Pipeliner ``` ### Running The Tests For `counterfeiter` diff --git a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/interface_template.go b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/interface_template.go index 3be9c1a5c3..3cd2ccfe5b 100644 --- a/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/interface_template.go +++ b/vendor/github.com/maxbrunsfeld/counterfeiter/v6/generator/interface_template.go @@ -147,10 +147,6 @@ func (fake *{{$.Name}}{{$.GenericTypeParameters}}) {{Title .Name}}ReturnsOnCall( func (fake *{{.Name}}{{$.GenericTypeParameters}}) Invocations() map[string][][]interface{} { fake.invocationsMutex.RLock() defer fake.invocationsMutex.RUnlock() - {{- range .Methods}} - fake.{{UnExport .Name}}Mutex.RLock() - defer fake.{{UnExport .Name}}Mutex.RUnlock() - {{- end}} copiedInvocations := map[string][][]interface{}{} for key, value := range fake.invocations { copiedInvocations[key] = value diff --git a/vendor/modules.txt b/vendor/modules.txt index efeff6480a..8972d0c61b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -427,8 +427,8 @@ github.com/mattn/go-isatty # github.com/mattn/go-sqlite3 v1.14.28 ## explicit; go 1.19 github.com/mattn/go-sqlite3 -# github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 -## explicit; go 1.23 +# github.com/maxbrunsfeld/counterfeiter/v6 v6.11.3 +## explicit; go 1.23.0 github.com/maxbrunsfeld/counterfeiter/v6 github.com/maxbrunsfeld/counterfeiter/v6/arguments github.com/maxbrunsfeld/counterfeiter/v6/command