Azure: update to use provider interface

pkg/asset/machines/azure/azuremachines.go

@@ -45,8 +45,10 @@ func GenerateMachines(platform *azure.Platform, pool *types.MachinePool, userDat
 		return nil, fmt.Errorf("failed to create machineapi.TagSpecifications from UserTags: %w", err)
 	}
 
-	var image *capz.Image = &capz.Image{}
+	image := &capz.Image{}
 	osImage := mpool.OSImage
+	galleryName := strings.ReplaceAll(clusterID, "-", "_")
+
 	switch {
 	case osImage.Publisher != "":
 		image = &capz.Image{
@@ -61,7 +63,6 @@ func GenerateMachines(platform *azure.Platform, pool *types.MachinePool, userDat
 		}
 	case useImageGallery:
 		// image gallery names cannot have dashes
-		galleryName := strings.ReplaceAll(clusterID, "-", "_")
 		id := clusterID
 		if hyperVGen == "V2" {
 			id += genV2Suffix

pkg/infrastructure/azure/azure.go

@@ -23,26 +23,20 @@ import (
 	aztypes "github.com/openshift/installer/pkg/types/azure"
 )
 
-var _ clusterapi.Provider = (*Provider)(nil)
-
 // Provider implements Azure CAPI installation.
-type Provider struct{}
-
-// InfraProvider is the Azure SDK infra provider.
-type InfraProvider struct{}
-
-// InitializeProvider initializes the Azure SDK provider.
-func InitializeProvider() clusterapi.Provider {
-	return &InfraProvider{}
+type Provider struct {
+	clusterapi.InfraProvider
 }
 
+var _ clusterapi.PreProvider = Provider{}
+
 // Name returns the name of the provider.
-func (p *InfraProvider) Name() string {
-	return "azure"
+func (p Provider) Name() string {
+	return aztypes.Name
 }
 
 // PreProvision is called before provisioning using CAPI controllers has begun.
-func (p *InfraProvider) PreProvision(ctx context.Context, in clusterapi.PreProvisionInput) error {
+func (p Provider) PreProvision(ctx context.Context, in clusterapi.PreProvisionInput) error {
 	session, err := in.InstallConfig.Azure.Session()
 	if err != nil {
 		return fmt.Errorf("failed to get session: %w", err)