fix(compute/deploy): check package before service clone

pkg/commands/compute/deploy.go

@@ -112,7 +112,7 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 		return err
 	}
 
-	newService, serviceID, serviceVersion, cont, err := serviceManagement(serviceID, source, c, in, out, fnActivateTrial, spinner)
+	newService, serviceID, serviceVersion, cont, err := serviceManagement(pkgPath, serviceID, source, c, in, out, fnActivateTrial, spinner)
 	if err != nil {
 		return err
 	}
@@ -146,15 +146,15 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 		return err
 	}
 
-	cont, err = processPackage(
-		c, pkgPath, serviceID, serviceVersion.Number, spinner, out,
-	)
+	err = pkgUpload(spinner, c.Globals.APIClient, serviceID, serviceVersion.Number, pkgPath)
 	if err != nil {
+		c.Globals.ErrLog.AddWithContext(err, map[string]any{
+			"Package path":    pkgPath,
+			"Service ID":      serviceID,
+			"Service Version": serviceVersion,
+		})
 		return err
 	}
-	if !cont {
-		return nil
-	}
 
 	if err = processService(c, serviceID, serviceVersion.Number, spinner); err != nil {
 		return err
@@ -443,7 +443,7 @@ func preconfigureActivateTrial(endpoint, token string, httpClient api.HTTPClient
 }
 
 func serviceManagement(
-	serviceID string,
+	pkgPath, serviceID string,
 	source manifest.Source,
 	c *DeployCommand,
 	in io.Reader,
@@ -480,7 +480,36 @@ func serviceManagement(
 			}
 		}
 
-		serviceVersion, err = manageExistingServiceFlow(serviceID, c.ServiceVersion, c.Globals.APIClient, c.Globals.Verbose(), out, c.Globals.ErrLog)
+		serviceVersion, err = c.ServiceVersion.Parse(serviceID, c.Globals.APIClient)
+		if err != nil {
+			c.Globals.ErrLog.AddWithContext(err, map[string]any{
+				"Service ID": serviceID,
+			})
+			return false, "", serviceVersion, false, err
+		}
+
+		filesHash, err := getFilesHash(pkgPath)
+		if err != nil {
+			c.Globals.ErrLog.AddWithContext(err, map[string]any{
+				"Package path": pkgPath,
+			})
+			return false, "", nil, false, err
+		}
+
+		cont, err = pkgCompare(c.Globals.APIClient, serviceID, serviceVersion.Number, filesHash, out)
+		if err != nil {
+			c.Globals.ErrLog.AddWithContext(err, map[string]any{
+				"Package path":    pkgPath,
+				"Service ID":      serviceID,
+				"Service Version": serviceVersion,
+			})
+			return false, "", nil, false, err
+		}
+		if !cont {
+			return false, "", nil, false, err
+		}
+
+		serviceVersion, err = manageExistingServiceFlow(serviceID, serviceVersion, c.Globals.APIClient, c.Globals.Verbose(), out, c.Globals.ErrLog)
 		if err != nil {
 			return false, "", nil, false, err
 		}
@@ -712,34 +741,26 @@ func updateManifestServiceID(m *manifest.File, manifestFilename string, serviceI
 // manageExistingServiceFlow clones service version if required.
 func manageExistingServiceFlow(
 	serviceID string,
-	serviceVersionFlag cmd.OptionalServiceVersion,
+	serviceVersion *fastly.Version,
 	apiClient api.Interface,
 	verbose bool,
 	out io.Writer,
 	errLog fsterr.LogInterface,
-) (serviceVersion *fastly.Version, err error) {
-	serviceVersion, err = serviceVersionFlag.Parse(serviceID, apiClient)
-	if err != nil {
-		errLog.AddWithContext(err, map[string]any{
-			"Service ID": serviceID,
-		})
-		return serviceVersion, err
-	}
-
+) (*fastly.Version, error) {
 	// Validate that we're dealing with a Compute@Edge 'wasm' service and not a
 	// VCL service, for which we cannot upload a wasm package format to.
 	serviceDetails, err := apiClient.GetServiceDetails(&fastly.GetServiceInput{ID: serviceID})
 	if err != nil {
 		errLog.AddWithContext(err, map[string]any{
 			"Service ID":      serviceID,
-			"Service Version": serviceVersion,
+			"Service Version": serviceVersion.Number,
 		})
 		return serviceVersion, err
 	}
 	if serviceDetails.Type != "wasm" {
 		errLog.AddWithContext(fmt.Errorf("error: invalid service type: '%s'", serviceDetails.Type), map[string]any{
 			"Service ID":      serviceID,
-			"Service Version": serviceVersion,
+			"Service Version": serviceVersion.Number,
 			"Service Type":    serviceDetails.Type,
 		})
 		return serviceVersion, fsterr.RemediationError{
@@ -793,19 +814,18 @@ func checkServiceID(serviceID string, client api.Interface) error {
 
 // pkgCompare compares the local package files hash against the existing service
 // package version and exits early with message if identical.
-func pkgCompare(client api.Interface, serviceID string, version int, filesHash string, out io.Writer) (bool, error) {
+func pkgCompare(client api.Interface, serviceID string, version int, filesHash string, out io.Writer) (cont bool, err error) {
 	p, err := client.GetPackage(&fastly.GetPackageInput{
 		ServiceID:      serviceID,
 		ServiceVersion: version,
 	})
-
-	if err == nil {
-		if filesHash == p.Metadata.FilesHash {
-			text.Info(out, "Skipping package deployment, local and service version are identical. (service %v, version %v) ", serviceID, version)
-			return false, nil
-		}
+	if err != nil {
+		return false, err
+	}
+	if filesHash == p.Metadata.FilesHash {
+		text.Info(out, "Skipping package deployment, local and service version are identical. (service %v, version %v) ", serviceID, version)
+		return false, nil
 	}
-
 	return true, nil
 }
 
@@ -1104,47 +1124,6 @@ func processSetupCreation(
 	return nil
 }
 
-func processPackage(
-	c *DeployCommand,
-	pkgPath, serviceID string,
-	serviceVersion int,
-	spinner text.Spinner,
-	out io.Writer,
-) (cont bool, err error) {
-	filesHash, err := getFilesHash(pkgPath)
-	if err != nil {
-		c.Globals.ErrLog.AddWithContext(err, map[string]any{
-			"Package path": pkgPath,
-		})
-		return false, err
-	}
-
-	cont, err = pkgCompare(c.Globals.APIClient, serviceID, serviceVersion, filesHash, out)
-	if err != nil {
-		c.Globals.ErrLog.AddWithContext(err, map[string]any{
-			"Package path":    pkgPath,
-			"Service ID":      serviceID,
-			"Service Version": serviceVersion,
-		})
-		return false, err
-	}
-	if !cont {
-		return false, nil
-	}
-
-	err = pkgUpload(spinner, c.Globals.APIClient, serviceID, serviceVersion, pkgPath)
-	if err != nil {
-		c.Globals.ErrLog.AddWithContext(err, map[string]any{
-			"Package path":    pkgPath,
-			"Service ID":      serviceID,
-			"Service Version": serviceVersion,
-		})
-		return false, err
-	}
-
-	return true, nil
-}
-
 func processService(c *DeployCommand, serviceID string, serviceVersion int, spinner text.Spinner) error {
 	if c.Comment.WasSet {
 		_, err := c.Globals.APIClient.UpdateVersion(&fastly.UpdateVersionInput{

pkg/commands/compute/deploy_test.go

@@ -194,6 +194,7 @@ func TestDeploy(t *testing.T) {
 				CloneVersionFn:      testutil.CloneVersionError,
 				GetServiceDetailsFn: getServiceDetailsWasm,
 				ListVersionsFn:      testutil.ListVersions,
+				GetPackageFn:        getPackageOk,
 			},
 			wantError: fmt.Sprintf("error cloning service version: %s", testutil.Err.Error()),
 		},
@@ -206,6 +207,7 @@ func TestDeploy(t *testing.T) {
 				GetServiceFn:        getServiceOK,
 				ListDomainsFn:       listDomainsError,
 				ListVersionsFn:      testutil.ListVersions,
+				GetPackageFn:        getPackageOk,
 			},
 			wantError: fmt.Sprintf("error fetching service domains: %s", testutil.Err.Error()),
 		},

pkg/commands/compute/hashsum.go

@@ -39,6 +39,7 @@ func NewHashsumCommand(parent cmd.Registerer, g *global.Data, build *BuildComman
 // Exec implements the command interface.
 func (c *HashsumCommand) Exec(in io.Reader, out io.Writer) (err error) {
 	if !c.Globals.Flags.Quiet {
+		// FIXME: Remove `hashsum` subcommand before v11.0.0 is released.
 		text.Warning(out, "This command is deprecated. Use `fastly compute hash-files` instead.")
 		if c.Globals.Verbose() || c.SkipBuild {
 			text.Break(out)