all: use a more straightforward return value

Change-Id: I3b6b8125e305ac5731e1bf77ab5b49471a9bcda7
Reviewed-on: https://go-review.googlesource.com/c/build/+/653199
Reviewed-by: Carlos Amedee <[email protected]>
Auto-Submit: Ian Lance Taylor <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>
Reviewed-by: Ian Lance Taylor <[email protected]>

Author: cuishuang

internal/cloud/aws.go

@@ -153,7 +153,7 @@ func (ac *AWSClient) Instance(ctx context.Context, instID string) (*Instance, er
 		return nil, errors.New("describe instances output does not contain a valid instance")
 	}
 	ec2Inst := dio.Reservations[0].Instances[0]
-	return ec2ToInstance(ec2Inst), err
+	return ec2ToInstance(ec2Inst), nil
 }
 
 // RunningInstances retrieves all EC2 instances in a region which have not been terminated or stopped.
@@ -206,7 +206,7 @@ func (ac *AWSClient) DestroyInstances(ctx context.Context, instIDs ...string) er
 	if err != nil {
 		return fmt.Errorf("unable to destroy vm: %w", err)
 	}
-	return err
+	return nil
 }
 
 // WaitUntilInstanceRunning waits until a stopping condition is met. The stopping conditions are:
@@ -220,7 +220,7 @@ func (ac *AWSClient) WaitUntilInstanceRunning(ctx context.Context, instID string
 	if err != nil {
 		return fmt.Errorf("failed waiting for vm instance: %w", err)
 	}
-	return err
+	return nil
 }
 
 // InstanceType contains information about an EC2 vm instance type.

internal/gomote/gomote.go

@@ -512,7 +512,7 @@ func (s *Server) signURLForDownload(object string) (url string, err error) {
 	if err != nil {
 		return "", fmt.Errorf("unable to generate signed url: %w", err)
 	}
-	return url, err
+	return url, nil
 }
 
 // WriteFileFromURL initiates an HTTP request to the passed in URL and streams the contents of the request to the gomote instance.

internal/gomote/swarming.go

@@ -763,7 +763,7 @@ func (ss *SwarmingServer) signURLForDownload(object string) (url string, err err
 	if err != nil {
 		return "", fmt.Errorf("unable to generate signed url: %w", err)
 	}
-	return url, err
+	return url, nil
 }
 
 // SwarmOpts provides additional options for swarming task creation.

internal/task/buildbucket.go

@@ -65,7 +65,7 @@ func (c *RealBuildBucketClient) RunBuild(ctx context.Context, bucket, builder st
 	if err != nil {
 		return 0, err
 	}
-	return build.Id, err
+	return build.Id, nil
 }
 
 func (c *RealBuildBucketClient) Completed(ctx context.Context, id int64) (string, bool, error) {

internal/task/releasevscodego.go

@@ -471,7 +471,7 @@ func (r *ReleaseVSCodeGoTasks) determineReleaseVersion(ctx *wf.TaskContext, vers
 	default:
 		return releaseVersion{}, fmt.Errorf("unknown version selection strategy: %q", versionBumpStrategy)
 	}
-	return release, err
+	return release, nil
 }
 
 // nextPrereleaseVersion inspects the tags in vscode-go repo that match with the

maintner/github.go

@@ -1638,7 +1638,7 @@ func (p *githubRepoPoller) getMilestonePage(ctx context.Context, page int) ([]in
 	for i, m := range ms {
 		its[i] = m
 	}
-	return its, res, err
+	return its, res, nil
 }
 
 func (p *githubRepoPoller) getLabelPage(ctx context.Context, page int) ([]interface{}, *github.Response, error) {
@@ -1652,7 +1652,7 @@ func (p *githubRepoPoller) getLabelPage(ctx context.Context, page int) ([]interf
 	for i, lb := range ls {
 		its[i] = lb
 	}
-	return its, res, err
+	return its, res, nil
 }
 
 // foreachItem walks over all pages of items from getPage and calls fn for each item.