plural up shouldn't choke on availability zones missing

This is no longer even used, and apparently can cause some weird interactions w/ --ignore-preflights

Author: michaeljguarino

pkg/provider/aws.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"sort"
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
@@ -113,32 +112,21 @@ func mkAWS(conf config.Config) (provider *AWSProvider, err error) {
 		return
 	}
 
-	account, err := GetAwsAccount(ctx)
-	if err != nil {
-		err = plrlErrors.ErrorWrap(err, "Failed to get aws account (is your aws cli configured?)")
-		return
-	}
-
-	if len(account) == 0 {
+	provider.project = lo.FromPtr(callerIdentity.Account)
+	if len(provider.project) == 0 {
 		err = plrlErrors.ErrorWrap(fmt.Errorf("unable to find AWS account ID, make sure that your AWS CLI is configured"), "AWS cli error:")
 		return
 	}
 
-	provider.project = account
 	provider.storageClient = client
 
-	azones, err := getAvailabilityZones(ctx, provider.Region())
-	if err != nil {
-		return
-	}
-
 	projectManifest := manifest.ProjectManifest{
 		Cluster:           provider.Cluster(),
 		Project:           provider.Project(),
 		Provider:          api.ProviderAWS,
 		Region:            provider.Region(),
 		Context:           provider.Context(),
-		AvailabilityZones: azones,
+		AvailabilityZones: []string{},
 		Owner:             &manifest.Owner{Email: conf.Email, Endpoint: conf.Endpoint},
 	}
 
@@ -167,56 +155,6 @@ func getClient(region string, context context.Context) (*s3.Client, error) {
 	return s3.NewFromConfig(cfg), nil
 }
 
-func getEC2Client(ctx context.Context, region string) (*ec2.Client, error) {
-	cfg, err := awsConfig.LoadDefaultConfig(ctx)
-	if err != nil {
-		return nil, err
-	}
-	cfg.Region = region
-	return ec2.NewFromConfig(cfg), nil
-}
-
-func getAvailabilityZones(ctx context.Context, region string) ([]string, error) {
-	return fetchAZ(ctx, region, true)
-}
-
-func fetchAZ(context context.Context, region string, sorted bool) ([]string, error) {
-	ec2Client, err := getEC2Client(context, region)
-	if err != nil {
-		return nil, err
-	}
-	allAvailabilityZones := true
-	dryRun := false
-	regionName := "region-name"
-	azones, err := ec2Client.DescribeAvailabilityZones(context, &ec2.DescribeAvailabilityZonesInput{
-		AllAvailabilityZones: &allAvailabilityZones,
-		DryRun:               &dryRun,
-		Filters: []ec2Types.Filter{
-			{
-				Name:   &regionName,
-				Values: []string{region},
-			},
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	result := []string{}
-	for _, az := range azones.AvailabilityZones {
-		if az.ParentZoneId == nil {
-			result = append(result, *az.ZoneName)
-		}
-	}
-	// append when there are fewer zones than 3
-	for i := 0; (3 - len(result)) > 0; i++ {
-		result = append(result, result[i])
-	}
-	if sorted {
-		sort.Strings(result)
-	}
-	return result, nil
-}
-
 func getAwsConfig(ctx context.Context) (aws.Config, error) {
 	cfg, err := awsConfig.LoadDefaultConfig(ctx)
 	return cfg, plrlErrors.ErrorWrap(err, "Failed to initialize aws client: ")
@@ -334,20 +272,6 @@ func (prov *AWSProvider) Decommision(node *v1.Node) error {
 	return plrlErrors.ErrorWrap(err, "failed to terminate instance")
 }
 
-func GetAwsAccount(ctx context.Context) (string, error) {
-	cfg, err := getAwsConfig(ctx)
-	if err != nil {
-		return "", err
-	}
-	svc := sts.NewFromConfig(cfg)
-	result, err := svc.GetCallerIdentity(ctx, &sts.GetCallerIdentityInput{})
-	if err != nil {
-		return "", plrlErrors.ErrorWrap(err, "Error finding iam identity: ")
-	}
-
-	return *result.Account, nil
-}
-
 func ValidateAWSDomainRegistration(ctx context.Context, domain, region string) error {
 	cfg, err := getAwsConfig(ctx)
 	if err != nil {