cluster-api: Use constants for existing platforms

We also fix a typo in an error log.

Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

pkg/asset/machines/clusterapi.go

@@ -19,7 +19,9 @@ import (
 	"github.com/openshift/installer/pkg/asset/machines/aws"
 	"github.com/openshift/installer/pkg/asset/manifests/capiutils"
 	"github.com/openshift/installer/pkg/asset/rhcos"
+	awstypes "github.com/openshift/installer/pkg/types/aws"
 	awsdefaults "github.com/openshift/installer/pkg/types/aws/defaults"
+	azuretypes "github.com/openshift/installer/pkg/types/azure"
 )
 
 // GenerateClusterAPI generates manifests for target cluster.
@@ -30,7 +32,7 @@ func GenerateClusterAPI(ctx context.Context, installConfig *installconfig.Instal
 	pool := *ic.ControlPlane
 
 	switch ic.Platform.Name() {
-	case "aws":
+	case awstypes.Name:
 		subnets := map[string]string{}
 		if len(ic.Platform.AWS.Subnets) > 0 {
 			subnetMeta, err := installConfig.AWS.PrivateSubnets(ctx)
@@ -169,7 +171,8 @@ func GenerateClusterAPI(ctx context.Context, installConfig *installconfig.Instal
 			File:   asset.File{Filename: fmt.Sprintf("10_machine_%s.yaml", bootstrapMachine.Name)},
 			Object: bootstrapMachine,
 		})
-	case "azure":
+	case azuretypes.Name:
+		// TODO: implement
 	default:
 		// TODO: support other platforms
 	}

pkg/asset/manifests/clusterapi/cluster.go

@@ -26,6 +26,8 @@ import (
 	"github.com/openshift/installer/pkg/asset/openshiftinstall"
 	"github.com/openshift/installer/pkg/asset/rhcos"
 	"github.com/openshift/installer/pkg/clusterapi"
+	awstypes "github.com/openshift/installer/pkg/types/aws"
+	azuretypes "github.com/openshift/installer/pkg/types/azure"
 )
 
 const (
@@ -142,7 +144,7 @@ func (c *Cluster) Generate(dependencies asset.Parents) error {
 
 	var out *capiutils.GenerateClusterAssetsOutput
 	switch platform := installConfig.Config.Platform.Name(); platform {
-	case "aws":
+	case awstypes.Name:
 		// Move this somewhere else.
 		// if err := aws.PutIAMRoles(clusterID.InfraID, installConfig); err != nil {
 		// 	return errors.Wrap(err, "failed to create IAM roles")
@@ -152,11 +154,11 @@ func (c *Cluster) Generate(dependencies asset.Parents) error {
 		if err != nil {
 			return errors.Wrap(err, "failed to generate AWS manifests")
 		}
-	case "azure":
+	case azuretypes.Name:
 		var err error
 		out, err = azure.GenerateClusterAssets(installConfig, clusterID)
 		if err != nil {
-			return errors.Wrap(err, "failed to generate AWS manifests")
+			return errors.Wrap(err, "failed to generate Azure manifests")
 		}
 	default:
 		return fmt.Errorf("unsupported platform %q", platform)