fix CLI crash (#693)

Author: zreigz

pkg/client/plural.go

@@ -1,8 +1,10 @@
 package client
 
 import (
+	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"strings"
 
 	gitutils "github.com/pluralsh/plural-cli/pkg/utils/git"
@@ -128,6 +130,8 @@ func (p *Plural) HandleInit(c *cli.Context) error {
 			return fmt.Errorf("preflight checks failed: %w", err)
 		}
 		fmt.Println("Preflight checks failed, but continuing because --ignore-preflights was specified.")
+		fmt.Println("Please note that you may encounter issues later on during provisioning.")
+		displayWarning(err)
 	}
 
 	if !git && common.Affirm("You're attempting to setup plural outside a git repository. Would you like us to set one up for you here?", "PLURAL_INIT_AFFIRM_SETUP_REPO") {
@@ -275,3 +279,21 @@ func (p *Plural) ReinstallOperator(c *cli.Context, id, handle *string, chart_loc
 
 	return p.DoInstallOperator(url, deployToken, c.String("values"), chart_loc, clusterId)
 }
+
+func displayWarning(err error) {
+	var outMsg string
+	var ee *exec.ExitError
+	// check if the error is of type *exec.ExitError to extract stderr
+	// it happens for Azure CLI errors for example
+	if errors.As(err, &ee) {
+		stderr := strings.TrimSpace(string(ee.Stderr))
+		if stderr != "" {
+			outMsg = fmt.Sprintf("%s: %s", err.Error(), stderr)
+		} else {
+			outMsg = err.Error()
+		}
+	} else {
+		outMsg = err.Error()
+	}
+	fmt.Printf("\033[33mWarning:\033[0m %s\n\n", outMsg)
+}

pkg/provider/aws.go

@@ -72,24 +72,20 @@ var (
 
 func mkAWS(conf config.Config) (provider *AWSProvider, err error) {
 	ctx := context.Background()
-
+	provider = &AWSProvider{}
 	iamSession, callerIdentity, err := GetAWSCallerIdentity(ctx)
 	if err != nil {
-		return nil, plrlErrors.ErrorWrap(err, "Failed to get AWS caller identity")
+		return provider, plrlErrors.ErrorWrap(err, "Failed to get AWS caller identity")
+	}
+	provider.goContext = &ctx
+	provider.ctx = map[string]any{
+		"IAMSession": iamSession,
 	}
-
 	fmt.Printf("\nUsing %s AWS profile\n", getAWSProfileName())
 	fmt.Printf("Caller identity ARN: %s\n", lo.FromPtr(callerIdentity.Arn))
 	fmt.Printf("Caller identity account: %s\n", lo.FromPtr(callerIdentity.Account))
 	fmt.Printf("Caller identity user ID: %s\n\n", lo.FromPtr(callerIdentity.UserId))
 
-	provider = &AWSProvider{
-		goContext: &ctx,
-		ctx: map[string]any{
-			"IAMSession": iamSession,
-		},
-	}
-
 	var awsSurvey = []*survey.Question{
 		{
 			Name:     "cluster",
@@ -178,22 +174,22 @@ func (aws *AWSProvider) KubeContext() string {
 	return fmt.Sprintf("arn:aws:eks:%s:%s:cluster/%s", aws.Region(), aws.project, aws.Cluster())
 }
 
-func (p *AWSProvider) mkBucket(name string) error {
-	client := p.storageClient
-	_, err := client.HeadBucket(*p.goContext, &s3.HeadBucketInput{Bucket: &name})
+func (aws *AWSProvider) mkBucket(name string) error {
+	client := aws.storageClient
+	_, err := client.HeadBucket(*aws.goContext, &s3.HeadBucketInput{Bucket: &name})
 
 	if err != nil {
 		bucket := &s3.CreateBucketInput{
 			Bucket: &name,
 		}
 
-		if p.Region() != "us-east-1" {
+		if aws.Region() != "us-east-1" {
 			bucket.CreateBucketConfiguration = &s3Types.CreateBucketConfiguration{
-				LocationConstraint: s3Types.BucketLocationConstraint(p.Region()),
+				LocationConstraint: s3Types.BucketLocationConstraint(aws.Region()),
 			}
 		}
 
-		_, err = client.CreateBucket(*p.goContext, bucket)
+		_, err = client.CreateBucket(*aws.goContext, bucket)
 		return err
 	}
 
@@ -231,29 +227,29 @@ func (aws *AWSProvider) Preflights() []*preflights.Preflight {
 }
 
 func (aws *AWSProvider) Flush() error {
-	if aws.writer == nil {
+	if aws == nil || aws.writer == nil {
 		return nil
 	}
 	return aws.writer()
 }
 
-func (prov *AWSProvider) Permissions() (permissions.Checker, error) {
-	return permissions.NewAwsChecker(*prov.goContext)
+func (aws *AWSProvider) Permissions() (permissions.Checker, error) {
+	return permissions.NewAwsChecker(*aws.goContext)
 }
 
-func (prov *AWSProvider) Decommision(node *v1.Node) error {
-	cfg, err := awsConfig.LoadDefaultConfig(*prov.goContext)
+func (aws *AWSProvider) Decommision(node *v1.Node) error {
+	cfg, err := awsConfig.LoadDefaultConfig(*aws.goContext)
 
 	if err != nil {
 		return plrlErrors.ErrorWrap(err, "Failed to establish aws session")
 	}
 
-	cfg.Region = prov.Region()
+	cfg.Region = aws.Region()
 
 	name := "private-dns-name"
 
 	svc := ec2.NewFromConfig(cfg)
-	instances, err := svc.DescribeInstances(*prov.goContext, &ec2.DescribeInstancesInput{
+	instances, err := svc.DescribeInstances(*aws.goContext, &ec2.DescribeInstancesInput{
 		Filters: []ec2Types.Filter{
 			{Name: &name, Values: []string{node.Name}},
 		},
@@ -265,7 +261,7 @@ func (prov *AWSProvider) Decommision(node *v1.Node) error {
 
 	instance := instances.Reservations[0].Instances[0]
 
-	_, err = svc.TerminateInstances(*prov.goContext, &ec2.TerminateInstancesInput{
+	_, err = svc.TerminateInstances(*aws.goContext, &ec2.TerminateInstancesInput{
 		InstanceIds: []string{*instance.InstanceId},
 	})
 

pkg/provider/azure.go

@@ -88,6 +88,7 @@ type AzureProvider struct {
 }
 
 func mkAzure(conf config.Config) (prov *AzureProvider, err error) {
+	prov = &AzureProvider{}
 	subId, tenID, subName, err := GetAzureAccount()
 	if err != nil {
 		return
@@ -129,14 +130,12 @@ func mkAzure(conf config.Config) (prov *AzureProvider, err error) {
 		return
 	}
 
-	prov = &AzureProvider{cluster,
-		resourceGroup,
-		"",
-		location,
-		map[string]any{"SubscriptionId": subId, "TenantId": tenID, "StorageAccount": storageAccount},
-		nil,
-		clients,
-	}
+	prov.cluster = cluster
+	prov.resourceGroup = resourceGroup
+	prov.bucket = ""
+	prov.region = location
+	prov.ctx = map[string]any{"SubscriptionId": subId, "TenantId": tenID, "StorageAccount": storageAccount}
+	prov.clients = clients
 
 	projectManifest := manifest.ProjectManifest{
 		Cluster:  prov.Cluster(),
@@ -256,7 +255,7 @@ func (*AzureProvider) Permissions() (permissions.Checker, error) {
 }
 
 func (az *AzureProvider) Flush() error {
-	if az.writer == nil {
+	if az == nil || az.writer == nil {
 		return nil
 	}
 	return az.writer()

pkg/provider/gcp/provider.go

@@ -185,7 +185,7 @@ func (in *Provider) Permissions() (permissions.Checker, error) {
 }
 
 func (in *Provider) Flush() error {
-	if in.writer == nil {
+	if in == nil || in.writer == nil {
 		return nil
 	}
 	return in.writer()
@@ -220,7 +220,7 @@ func NewProvider(options ...Option) (*Provider, error) {
 
 	for _, opt := range options {
 		if err := opt(result); err != nil {
-			return nil, err
+			return result, err
 		}
 	}