fix(compute/deploy): dereference service number pointer (#1231)

* fix(compute/deploy): dereference service number pointer

* fix(compute/deploy): fix spacing

* fix(profile/switch): return remediation

Author: Integralist

pkg/commands/compute/deploy.go

@@ -160,9 +160,7 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 	if err != nil {
 		return err
 	}
-	if !c.Globals.Flags.NonInteractive {
-		text.Break(out)
-	}
+	text.Break(out)
 
 	fnActivateTrial, serviceID, err := c.Setup(out)
 	if err != nil {
@@ -204,7 +202,7 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 		serviceVersion, err = c.ExistingServiceVersion(serviceID, out)
 		if err != nil {
 			if errors.Is(err, ErrPackageUnchanged) {
-				text.Info(out, "Skipping package deployment, local and service version are identical. (service %s, version %d) ", serviceID, serviceVersion.Number)
+				text.Info(out, "Skipping package deployment, local and service version are identical. (service %s, version %d) ", serviceID, fastly.ToValue(serviceVersion.Number))
 				return nil
 			}
 			return err
@@ -215,6 +213,7 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 	}
 
 	var sr ServiceResources
+	serviceVersionNumber := fastly.ToValue(serviceVersion.Number)
 
 	// NOTE: A 'domain' resource isn't strictly part of the [setup] config.
 	// It's part of the implementation so that we can utilise the same interface.
@@ -226,12 +225,11 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 		PackageDomain:  c.Domain,
 		RetryLimit:     5,
 		ServiceID:      serviceID,
-		ServiceVersion: fastly.ToValue(serviceVersion.Number),
+		ServiceVersion: serviceVersionNumber,
 		Stdin:          in,
 		Stdout:         out,
 		Verbose:        c.Globals.Verbose(),
 	}
-	serviceVersionNumber := fastly.ToValue(serviceVersion.Number)
 	if err = sr.domains.Validate(); err != nil {
 		errLogService(c.Globals.ErrLog, err, serviceID, serviceVersionNumber)
 		return fmt.Errorf("error configuring service domains: %w", err)

pkg/commands/profile/switch.go

@@ -1,12 +1,12 @@
 package profile
 
 import (
-	"errors"
 	"fmt"
 	"io"
 
 	"github.com/fastly/cli/pkg/argparser"
 	"github.com/fastly/cli/pkg/commands/sso"
+	fsterr "github.com/fastly/cli/pkg/errors"
 	"github.com/fastly/cli/pkg/global"
 	"github.com/fastly/cli/pkg/profile"
 	"github.com/fastly/cli/pkg/text"
@@ -38,7 +38,10 @@ func (c *SwitchCommand) Exec(in io.Reader, out io.Writer) error {
 	if p == nil {
 		err := fmt.Errorf(profile.DoesNotExist, c.profile)
 		c.Globals.ErrLog.Add(err)
-		return err
+		return fsterr.RemediationError{
+			Inner:       err,
+			Remediation: fsterr.ProfileRemediation,
+		}
 	}
 	if isSSOToken(p) {
 		// IMPORTANT: We need to set profile fields for `sso` command.
@@ -63,10 +66,12 @@ func (c *SwitchCommand) Exec(in io.Reader, out io.Writer) error {
 	// their Default field set to false.
 	ps, ok := profile.SetDefault(c.profile, c.Globals.Config.Profiles)
 	if !ok {
-		msg := fmt.Sprintf(profile.DoesNotExist, c.profile)
-		err := errors.New(msg)
+		err := fmt.Errorf(profile.DoesNotExist, c.profile)
 		c.Globals.ErrLog.Add(err)
-		return err
+		return fsterr.RemediationError{
+			Inner:       err,
+			Remediation: fsterr.ProfileRemediation,
+		}
 	}
 	c.Globals.Config.Profiles = ps