Browse Source

refactor: use ProviderInterface explicitly

Moritz Johner 2 months ago
parent
commit
a1ab11052e
45 changed files with 79 additions and 83 deletions
  1. 0 4
      apis/externalsecrets/v1/provider.go
  2. 2 2
      providers/v1/akeyless/akeyless.go
  3. 2 2
      providers/v1/aws/provider.go
  4. 2 2
      providers/v1/azure/keyvault/keyvault.go
  5. 2 2
      providers/v1/barbican/provider.go
  6. 2 2
      providers/v1/beyondtrust/provider.go
  7. 1 1
      providers/v1/beyondtrust/provider_test.go
  8. 1 1
      providers/v1/bitwarden/provider.go
  9. 2 2
      providers/v1/chef/chef.go
  10. 1 1
      providers/v1/cloudru/secretmanager/provider.go
  11. 1 1
      providers/v1/conjur/provider.go
  12. 2 2
      providers/v1/delinea/provider.go
  13. 3 3
      providers/v1/doppler/provider.go
  14. 2 2
      providers/v1/dvls/provider.go
  15. 1 1
      providers/v1/fake/fake.go
  16. 2 2
      providers/v1/fortanix/provider.go
  17. 2 2
      providers/v1/gcp/secretmanager/provider.go
  18. 2 2
      providers/v1/github/provider.go
  19. 1 1
      providers/v1/gitlab/gitlab.go
  20. 1 1
      providers/v1/gitlab/provider.go
  21. 3 3
      providers/v1/ibm/provider.go
  22. 2 2
      providers/v1/infisical/provider.go
  23. 2 2
      providers/v1/keepersecurity/provider.go
  24. 2 2
      providers/v1/kubernetes/provider.go
  25. 1 1
      providers/v1/nebius/mysterybox/provider.go
  26. 1 1
      providers/v1/ngrok/provider.go
  27. 3 3
      providers/v1/onboardbase/provider.go
  28. 3 3
      providers/v1/onepassword/onepassword.go
  29. 1 1
      providers/v1/onepasswordsdk/provider.go
  30. 2 2
      providers/v1/oracle/oracle.go
  31. 1 1
      providers/v1/ovh/provider.go
  32. 1 1
      providers/v1/passbolt/passbolt.go
  33. 1 1
      providers/v1/passworddepot/passworddepot.go
  34. 3 3
      providers/v1/previder/provider.go
  35. 3 3
      providers/v1/pulumi/provider.go
  36. 3 3
      providers/v1/scaleway/provider.go
  37. 3 3
      providers/v1/secretserver/provider.go
  38. 1 1
      providers/v1/secretserver/provider_test.go
  39. 2 2
      providers/v1/senhasegura/provider.go
  40. 2 2
      providers/v1/vault/provider.go
  41. 2 2
      providers/v1/volcengine/provider.go
  42. 2 2
      providers/v1/webhook/webhook.go
  43. 1 1
      providers/v1/yandex/certificatemanager/certificatemanager.go
  44. 1 1
      providers/v1/yandex/common/provider.go
  45. 1 1
      providers/v1/yandex/lockbox/lockbox.go

+ 0 - 4
apis/externalsecrets/v1/provider.go

@@ -64,10 +64,6 @@ type ProviderInterface interface {
 	Capabilities() SecretStoreCapabilities
 }
 
-// Provider is kept as a compatibility alias while the rest of the tree migrates
-// to the more explicit ProviderInterface name.
-type Provider = ProviderInterface
-
 // +kubebuilder:object:root=false
 // +kubebuilder:object:generate:false
 // +k8s:deepcopy-gen:interfaces=nil

+ 2 - 2
providers/v1/akeyless/akeyless.go

@@ -57,7 +57,7 @@ const (
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &Akeyless{}
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Provider satisfies the provider interface.
 type Provider struct{}
@@ -570,7 +570,7 @@ func (a *akeylessBase) getAkeylessHTTPClient(ctx context.Context, provider *esv1
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/aws/provider.go

@@ -40,7 +40,7 @@ import (
 )
 
 // https://github.com/external-secrets/external-secrets/issues/644
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Provider satisfies the provider interface.
 type Provider struct{}
@@ -230,7 +230,7 @@ func (f fixedDelayer) BackoffDelay(int, error) (time.Duration, error) {
 }
 
 // NewProvider creates a new AWS Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/azure/keyvault/keyvault.go

@@ -120,7 +120,7 @@ const (
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &Azure{}
-var _ esv1.Provider = &Azure{}
+var _ esv1.ProviderInterface = &Azure{}
 
 // SecretClient is an interface to keyvault.BaseClient.
 type SecretClient interface {
@@ -1512,7 +1512,7 @@ func (a *Azure) getSecretWithLegacySDK(ctx context.Context, ref esv1.ExternalSec
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Azure{}
 }
 

+ 2 - 2
providers/v1/barbican/provider.go

@@ -37,7 +37,7 @@ const (
 	errClientInit   = "barbican provider client initialization failed: %w"
 )
 
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Provider implements the Barbican provider.
 type Provider struct{}
@@ -120,7 +120,7 @@ func newClient(ctx context.Context, store esv1.GenericStore, kube client.Client,
 }
 
 // NewProvider constructs a new Barbican provider.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/beyondtrust/provider.go

@@ -74,7 +74,7 @@ var (
 	maxFileSecretSizeBytes = 5000000
 )
 
-// Provider is a Password Safe secrets provider implementing NewClient and ValidateStore for the esv1.Provider interface.
+// Provider is a Password Safe secrets provider implementing NewClient and ValidateStore for the esv1.ProviderInterface interface.
 type Provider struct {
 	apiURL        string
 	retrievaltype string
@@ -421,7 +421,7 @@ func (p *Provider) ValidateStore(store esv1.GenericStore) (admission.Warnings, e
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 1 - 1
providers/v1/beyondtrust/provider_test.go

@@ -120,7 +120,7 @@ func TestNewClient(t *testing.T) {
 	type args struct {
 		store    esv1.SecretStore
 		kube     kubeclient.Client
-		provider esv1.Provider
+		provider esv1.ProviderInterface
 	}
 	tests := []struct {
 		name              string

+ 1 - 1
providers/v1/bitwarden/provider.go

@@ -42,7 +42,7 @@ type Provider struct {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/chef/chef.go

@@ -101,7 +101,7 @@ type Providerchef struct {
 }
 
 var _ esv1.SecretsClient = &Providerchef{}
-var _ esv1.Provider = &Providerchef{}
+var _ esv1.ProviderInterface = &Providerchef{}
 
 // NewClient creates a new Chef Infra Server client.
 func (providerchef *Providerchef) NewClient(ctx context.Context, store esv1.GenericStore, kube kclient.Client, namespace string) (esv1.SecretsClient, error) {
@@ -359,7 +359,7 @@ func (providerchef *Providerchef) Capabilities() esv1.SecretStoreCapabilities {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Providerchef{}
 }
 

+ 1 - 1
providers/v1/cloudru/secretmanager/provider.go

@@ -50,7 +50,7 @@ func MaintenanceStatus() esv1.MaintenanceStatus {
 	return esv1.MaintenanceStatusMaintained
 }
 
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 var _ esv1.SecretsClient = &Client{}
 
 // Provider is a secrets provider for Cloud.ru Secret Manager.

+ 1 - 1
providers/v1/conjur/provider.go

@@ -77,7 +77,7 @@ func newConjurProvider(
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{
 		NewConjurProvider: newConjurProvider,
 	}

+ 2 - 2
providers/v1/delinea/provider.go

@@ -45,7 +45,7 @@ var (
 // Provider implements the External Secrets provider for Delinea Secret Server.
 type Provider struct{}
 
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Capabilities return the provider supported capabilities (ReadOnly, WriteOnly, ReadWrite).
 func (p *Provider) Capabilities() esv1.SecretStoreCapabilities {
@@ -190,7 +190,7 @@ func (p *Provider) ValidateStore(store esv1.GenericStore) (admission.Warnings, e
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 3 - 3
providers/v1/doppler/provider.go

@@ -42,12 +42,12 @@ const (
 	errDopplerStore = "missing or invalid Doppler SecretStore"
 )
 
-// Provider is a Doppler secrets provider implementing NewClient and ValidateStore for the esv1.Provider interface.
+// Provider is a Doppler secrets provider implementing NewClient and ValidateStore for the esv1.ProviderInterface interface.
 type Provider struct{}
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &Client{}
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 var (
 	enableCache          bool
@@ -254,7 +254,7 @@ func (p *Provider) ValidateStore(store esv1.GenericStore) (admission.Warnings, e
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/dvls/provider.go

@@ -29,7 +29,7 @@ import (
 	"github.com/external-secrets/external-secrets/runtime/esutils"
 )
 
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Provider implements the external-secrets Provider interface for DVLS.
 type Provider struct{}
@@ -131,7 +131,7 @@ func getDVLSProvider(store esv1.GenericStore) (*esv1.DVLSProvider, error) {
 }
 
 // NewProvider creates a new DVLS Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 1 - 1
providers/v1/fake/fake.go

@@ -260,7 +260,7 @@ func mapKey(key, version string) string {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/fortanix/provider.go

@@ -45,7 +45,7 @@ const (
 	errAPIKeySecretRefKeyIsRequired  = "apiKey.secretRef.key is required"
 )
 
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Capabilities returns the provider supported capabilities (ReadOnly, WriteOnly, ReadWrite).
 func (p *Provider) Capabilities() esv1.SecretStoreCapabilities {
@@ -126,7 +126,7 @@ func validateSecretStoreRef(store esv1.GenericStore, ref *esv1.FortanixProviderS
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/gcp/secretmanager/provider.go

@@ -38,7 +38,7 @@ type Provider struct{}
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &Client{}
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 /*
 Currently, GCPSM client has a limitation around how concurrent connections work
@@ -195,7 +195,7 @@ func isReferentSpec(prov *esv1.GCPSMProvider) bool {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/github/provider.go

@@ -41,7 +41,7 @@ const (
 type Provider struct {
 }
 
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Capabilities return the provider supported capabilities (ReadOnly, WriteOnly, ReadWrite).
 func (p *Provider) Capabilities() esv1.SecretStoreCapabilities {
@@ -129,7 +129,7 @@ func (p *Provider) ValidateStore(store esv1.GenericStore) (admission.Warnings, e
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 1 - 1
providers/v1/gitlab/gitlab.go

@@ -55,7 +55,7 @@ const (
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &gitlabBase{}
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // ProjectsClient is an interface for interacting with GitLab project APIs.
 type ProjectsClient interface {

+ 1 - 1
providers/v1/gitlab/provider.go

@@ -190,7 +190,7 @@ func (g *Provider) ValidateStore(store esv1.GenericStore) (admission.Warnings, e
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 3 - 3
providers/v1/ibm/provider.go

@@ -70,8 +70,8 @@ var contextTimeout = time.Minute * 2
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var (
-	_ esv1.SecretsClient = &providerIBM{}
-	_ esv1.Provider      = &providerIBM{}
+	_ esv1.SecretsClient     = &providerIBM{}
+	_ esv1.ProviderInterface = &providerIBM{}
 )
 
 // SecretManagerClient defines the interface for interacting with IBM Cloud Secrets Manager.
@@ -769,7 +769,7 @@ func formSecretMap(secretData any) (map[string]any, error) {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &providerIBM{}
 }
 

+ 2 - 2
providers/v1/infisical/provider.go

@@ -68,7 +68,7 @@ type ClientScope struct {
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &Provider{}
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Capabilities returns the provider's supported capabilities.
 func (p *Provider) Capabilities() esv1.SecretStoreCapabilities {
@@ -590,7 +590,7 @@ func validateUniversalAuth(store esv1.GenericStore, spec *esv1.InfisicalProvider
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/keepersecurity/provider.go

@@ -46,7 +46,7 @@ type Provider struct{}
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &Client{}
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Capabilities returns the provider's supported capabilities (ReadWrite).
 func (p *Provider) Capabilities() esv1.SecretStoreCapabilities {
@@ -119,7 +119,7 @@ func getKeeperSecurityAuth(ctx context.Context, store *esv1.KeeperSecurityProvid
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/kubernetes/provider.go

@@ -36,7 +36,7 @@ import (
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &Client{}
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // KClient defines the interface for interacting with Kubernetes Secrets.
 type KClient interface {
@@ -185,7 +185,7 @@ func (p *Provider) Close(_ context.Context) error {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 1 - 1
providers/v1/nebius/mysterybox/provider.go

@@ -289,7 +289,7 @@ func (p *Provider) initTokenGetter() error {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{
 		Logger:              log,
 		NewMysteryboxClient: newMysteryboxClient,

+ 1 - 1
providers/v1/ngrok/provider.go

@@ -177,7 +177,7 @@ func getConfig(store esv1.GenericStore) (*esv1.NgrokProvider, error) {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 3 - 3
providers/v1/onboardbase/provider.go

@@ -35,12 +35,12 @@ const (
 	errOnboardbaseStore = "missing or invalid Onboardbase SecretStore"
 )
 
-// Provider is a Onboardbase secrets provider implementing NewClient and ValidateStore for the esv1.Provider interface.
+// Provider is a Onboardbase secrets provider implementing NewClient and ValidateStore for the esv1.ProviderInterface interface.
 type Provider struct{}
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &Client{}
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Capabilities returns the provider's supported capabilities.
 func (p *Provider) Capabilities() esv1.SecretStoreCapabilities {
@@ -106,7 +106,7 @@ func (p *Provider) ValidateStore(store esv1.GenericStore) (admission.Warnings, e
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 3 - 3
providers/v1/onepassword/onepassword.go

@@ -104,8 +104,8 @@ type PushSecretMetadataSpec struct {
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var (
-	_ esv1.SecretsClient = &ProviderOnePassword{}
-	_ esv1.Provider      = &ProviderOnePassword{}
+	_ esv1.SecretsClient     = &ProviderOnePassword{}
+	_ esv1.ProviderInterface = &ProviderOnePassword{}
 )
 
 // Capabilities return the provider supported capabilities (ReadOnly, WriteOnly, ReadWrite).
@@ -824,7 +824,7 @@ func hasUniqueVaultNumbers(vaults map[string]int) bool {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &ProviderOnePassword{}
 }
 

+ 1 - 1
providers/v1/onepasswordsdk/provider.go

@@ -169,7 +169,7 @@ func (p *Provider) Capabilities() esv1.SecretStoreCapabilities {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{
 		clientCache: cache.Must[esv1.SecretsClient](100, nil),
 	}

+ 2 - 2
providers/v1/oracle/oracle.go

@@ -71,7 +71,7 @@ const (
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &VaultManagementService{}
-var _ esv1.Provider = &VaultManagementService{}
+var _ esv1.ProviderInterface = &VaultManagementService{}
 
 // VaultManagementService implements the External Secrets provider interface for Oracle Cloud Infrastructure Vault.
 type VaultManagementService struct {
@@ -718,7 +718,7 @@ func sanitizeOCISDKErr(err error) error {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &VaultManagementService{}
 }
 

+ 1 - 1
providers/v1/ovh/provider.go

@@ -336,7 +336,7 @@ func (p *Provider) Capabilities() esv1.SecretStoreCapabilities {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{
 		secretKeyResolver: DefaultSecretKeyResolver{},
 	}

+ 1 - 1
providers/v1/passbolt/passbolt.go

@@ -285,7 +285,7 @@ func assureLoggedIn(ctx context.Context, client *api.Client) error {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &ProviderPassbolt{}
 }
 

+ 1 - 1
providers/v1/passworddepot/passworddepot.go

@@ -199,7 +199,7 @@ func (p *PasswordDepot) Close(_ context.Context) error {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &PasswordDepot{}
 }
 

+ 3 - 3
providers/v1/previder/provider.go

@@ -35,9 +35,9 @@ const (
 	errNotImplemented = "not implemented"
 )
 
-var _ esv1.Provider = &SecretManager{}
+var _ esv1.ProviderInterface = &SecretManager{}
 
-// SecretManager implements the esv1.Provider interface for Previder Vault.
+// SecretManager implements the esv1.ProviderInterface interface for Previder Vault.
 type SecretManager struct {
 	VaultClient previderclient.PreviderVaultClient
 	TokenType   string
@@ -153,7 +153,7 @@ func (s *SecretManager) Close(context.Context) error {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &SecretManager{}
 }
 

+ 3 - 3
providers/v1/pulumi/provider.go

@@ -30,10 +30,10 @@ import (
 	"github.com/external-secrets/external-secrets/runtime/esutils/resolvers"
 )
 
-// Provider implements the esv1.Provider interface for Pulumi ESC.
+// Provider implements the esv1.ProviderInterface interface for Pulumi ESC.
 type Provider struct{}
 
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 const (
 	errClusterStoreRequiresNamespace = "cluster store requires namespace"
@@ -157,7 +157,7 @@ func (p *Provider) Capabilities() esv1.SecretStoreCapabilities {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 3 - 3
providers/v1/scaleway/provider.go

@@ -38,9 +38,9 @@ var (
 	log           = ctrl.Log.WithName("provider").WithName("scaleway")
 )
 
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
-// Provider is a Scaleway provider implementation that satisfies the esv1.Provider interface.
+// Provider is a Scaleway provider implementation that satisfies the esv1.ProviderInterface interface.
 type Provider struct{}
 
 // Capabilities return the provider supported capabilities (ReadOnly, WriteOnly, ReadWrite).
@@ -174,7 +174,7 @@ func (p *Provider) ValidateStore(store esv1.GenericStore) (admission.Warnings, e
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 3 - 3
providers/v1/secretserver/provider.go

@@ -45,10 +45,10 @@ var (
 	errMissingSecretKey = errors.New("must specify a secret key")
 )
 
-// Provider struct that implements the ESO esv1.Provider.
+// Provider struct that implements the ESO esv1.ProviderInterface.
 type Provider struct{}
 
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Capabilities return the provider supported capabilities (ReadOnly, WriteOnly, ReadWrite).
 func (p *Provider) Capabilities() esv1.SecretStoreCapabilities {
@@ -206,7 +206,7 @@ func (p *Provider) ValidateStore(store esv1.GenericStore) (admission.Warnings, e
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 1 - 1
providers/v1/secretserver/provider_test.go

@@ -654,7 +654,7 @@ func TestCapabilities(t *testing.T) {
 // TestNewProvider tests the NewProvider function.
 func TestNewProvider(t *testing.T) {
 	tests := map[string]struct {
-		want esv1.Provider
+		want esv1.ProviderInterface
 	}{
 		"creates a new provider instance": {
 			want: &Provider{},

+ 2 - 2
providers/v1/senhasegura/provider.go

@@ -32,7 +32,7 @@ import (
 )
 
 // https://github.com/external-secrets/external-secrets/issues/644
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Provider struct that satisfier ESO interface.
 type Provider struct{}
@@ -119,7 +119,7 @@ func validateStore(store esv1.GenericStore) error {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/vault/provider.go

@@ -38,7 +38,7 @@ import (
 )
 
 var (
-	_           esv1.Provider = &Provider{}
+	_           esv1.ProviderInterface = &Provider{}
 	enableCache bool
 	logger      = ctrl.Log.WithName("provider").WithName("vault")
 	clientCache *cache.Cache[vaultutil.Client]
@@ -375,7 +375,7 @@ func init() {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{
 		NewVaultClient: NewVaultClient,
 	}

+ 2 - 2
providers/v1/volcengine/provider.go

@@ -29,7 +29,7 @@ import (
 	"github.com/external-secrets/external-secrets/runtime/esutils"
 )
 
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Provider implements the actual SecretsClient interface.
 type Provider struct{}
@@ -103,7 +103,7 @@ func getVolcengineProvider(store esv1.GenericStore) (*esv1.VolcengineProvider, e
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 2 - 2
providers/v1/webhook/webhook.go

@@ -42,7 +42,7 @@ const (
 
 // https://github.com/external-secrets/external-secrets/issues/644
 var _ esv1.SecretsClient = &WebHook{}
-var _ esv1.Provider = &Provider{}
+var _ esv1.ProviderInterface = &Provider{}
 
 // Provider satisfies the provider interface.
 type Provider struct{}
@@ -326,7 +326,7 @@ func (w *WebHook) Validate() (esv1.ValidationResult, error) {
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return &Provider{}
 }
 

+ 1 - 1
providers/v1/yandex/certificatemanager/certificatemanager.go

@@ -89,7 +89,7 @@ func newSecretGetter(ctx context.Context, apiEndpoint string, authorizedKey *iam
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return ydxcommon.InitYandexCloudProvider(
 		log,
 		clock.NewRealClock(),

+ 1 - 1
providers/v1/yandex/common/provider.go

@@ -40,7 +40,7 @@ import (
 const maxSecretsClientLifetime = 5 * time.Minute // supposed SecretsClient lifetime is quite short
 
 // https://github.com/external-secrets/external-secrets/issues/644
-var _ esv1.Provider = &YandexCloudProvider{}
+var _ esv1.ProviderInterface = &YandexCloudProvider{}
 
 // YandexCloudProvider implements the Provider interface for Yandex.Cloud services.
 type YandexCloudProvider struct {

+ 1 - 1
providers/v1/yandex/lockbox/lockbox.go

@@ -89,7 +89,7 @@ func newSecretGetter(ctx context.Context, apiEndpoint string, authorizedKey *iam
 }
 
 // NewProvider creates a new Provider instance.
-func NewProvider() esv1.Provider {
+func NewProvider() esv1.ProviderInterface {
 	return ydxcommon.InitYandexCloudProvider(
 		log,
 		clock.NewRealClock(),