Expose clusterctl provider dependent logic for custom provider

Signed-off-by: Danil-Grigorev <[email protected]>

Author: Danil-Grigorev

api/v1alpha2/addonprovider_wrapper.go

@@ -50,6 +50,10 @@ func (b *AddonProvider) GetType() string {
 	return "addon"
 }
 
+func (b *AddonProvider) ProviderName() string {
+	return b.GetName()
+}
+
 func (b *AddonProviderList) GetItems() []GenericProvider {
 	providers := []GenericProvider{}
 

api/v1alpha2/bootstrapprovider_wrapper.go

@@ -50,6 +50,10 @@ func (b *BootstrapProvider) GetType() string {
 	return "bootstrap"
 }
 
+func (b *BootstrapProvider) ProviderName() string {
+	return b.GetName()
+}
+
 func (b *BootstrapProviderList) GetItems() []GenericProvider {
 	providers := []GenericProvider{}
 

api/v1alpha2/controlplaneprovider_wrapper.go

@@ -50,6 +50,10 @@ func (c *ControlPlaneProvider) GetType() string {
 	return "controlplane"
 }
 
+func (c *ControlPlaneProvider) ProviderName() string {
+	return c.GetName()
+}
+
 func (c *ControlPlaneProviderList) GetItems() []GenericProvider {
 	providers := make([]GenericProvider, len(c.Items))
 

api/v1alpha2/coreprovider_wrapper.go

@@ -50,6 +50,10 @@ func (c *CoreProvider) GetType() string {
 	return "core"
 }
 
+func (c *CoreProvider) ProviderName() string {
+	return c.GetName()
+}
+
 func (c *CoreProviderList) GetItems() []GenericProvider {
 	providers := make([]GenericProvider, len(c.Items))
 

api/v1alpha2/genericprovider_interfaces.go

@@ -30,6 +30,7 @@ type GenericProvider interface {
 	GetStatus() ProviderStatus
 	SetStatus(in ProviderStatus)
 	GetType() string
+	ProviderName() string
 }
 
 // GenericProviderList interface describes operations applicable to the provider list type.

api/v1alpha2/infrastructureprovider_wrapper.go

@@ -50,6 +50,10 @@ func (c *InfrastructureProvider) GetType() string {
 	return "infrastructure"
 }
 
+func (c *InfrastructureProvider) ProviderName() string {
+	return c.GetName()
+}
+
 func (c *InfrastructureProviderList) GetItems() []GenericProvider {
 	providers := make([]GenericProvider, len(c.Items))
 

api/v1alpha2/ipamprovider_wrapper.go

@@ -50,6 +50,10 @@ func (p *IPAMProvider) GetType() string {
 	return "ipam"
 }
 
+func (p *IPAMProvider) ProviderName() string {
+	return p.GetName()
+}
+
 func (p *IPAMProviderList) GetItems() []GenericProvider {
 	providers := []GenericProvider{}
 

api/v1alpha2/runtimeextensionprovider_wrapper.go

@@ -50,6 +50,10 @@ func (p *RuntimeExtensionProvider) GetType() string {
 	return "runtimeextension"
 }
 
+func (p *RuntimeExtensionProvider) ProviderName() string {
+	return p.GetName()
+}
+
 func (p *RuntimeExtensionProviderList) GetItems() []GenericProvider {
 	providers := []GenericProvider{}
 

cmd/plugin/cmd/init_test.go

@@ -324,7 +324,7 @@ func TestInitProviders(t *testing.T) {
 
 			for _, genericProvider := range tt.wantedProviders {
 				g.Eventually(func() (bool, error) {
-					provider, err := getGenericProvider(ctx, env, string(util.ClusterctlProviderType(genericProvider)), genericProvider.GetName(), genericProvider.GetNamespace())
+					provider, err := getGenericProvider(ctx, env, string(util.ClusterctlProviderType(genericProvider)), genericProvider.ProviderName(), genericProvider.GetNamespace())
 					if err != nil {
 						return false, err
 					}

cmd/plugin/cmd/preload.go

@@ -313,7 +313,7 @@ func templateConfigMap(ctx context.Context, providerType clusterctlv1.ProviderTy
 		return nil, fmt.Errorf("cannot create config client: %w", err)
 	}
 
-	providerConfig, err := configClient.Providers().Get(provider.GetName(), util.ClusterctlProviderType(provider))
+	providerConfig, err := configClient.Providers().Get(provider.ProviderName(), util.ClusterctlProviderType(provider))
 	if err != nil {
 		if !strings.Contains(err.Error(), "failed to get configuration") {
 			return nil, err
@@ -340,7 +340,7 @@ func providerConfigMap(ctx context.Context, provider operatorv1.GenericProvider)
 
 	// If provided store fetch config url in memory reader.
 	if provider.GetSpec().FetchConfig != nil && provider.GetSpec().FetchConfig.URL != "" {
-		_, err := mr.AddProvider(provider.GetName(), util.ClusterctlProviderType(provider), provider.GetSpec().FetchConfig.URL)
+		_, err := mr.AddProvider(provider.ProviderName(), util.ClusterctlProviderType(provider), provider.GetSpec().FetchConfig.URL)
 		if err != nil {
 			return nil, fmt.Errorf("cannot add custom url provider: %w", err)
 		}
@@ -351,7 +351,7 @@ func providerConfigMap(ctx context.Context, provider operatorv1.GenericProvider)
 		return nil, fmt.Errorf("cannot create config client: %w", err)
 	}
 
-	providerConfig, err := configClient.Providers().Get(provider.GetName(), util.ClusterctlProviderType(provider))
+	providerConfig, err := configClient.Providers().Get(provider.ProviderName(), util.ClusterctlProviderType(provider))
 	if err != nil {
 		if !strings.Contains(err.Error(), "failed to get configuration") {
 			return nil, err