add context to InstallGoVersions and http get

Author: BenTheElder

cmd/publishing-bot/publisher.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -228,7 +229,7 @@ func (p *PublisherMunger) runSmokeTests(smokeTest, oldHead, newHead string, bran
 func (p *PublisherMunger) construct() error {
 	sourceRemote := filepath.Join(p.baseRepoPath, p.config.SourceRepo, ".git")
 
-	if err := golang.InstallGoVersions(&p.reposRules); err != nil {
+	if err := golang.InstallGoVersions(context.Background(), &p.reposRules); err != nil {
 		return err
 	}
 

pkg/golang/install.go

@@ -17,6 +17,7 @@ limitations under the License.
 package golang
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net/http"
@@ -32,7 +33,7 @@ import (
 
 // InstallGoVersions download and unpacks the specified Golang versions to $GOPATH/
 // If the DefaultGoVersion is not specfied in rules, it defaults to the current Go release.
-func InstallGoVersions(rules *config.RepositoryRules) error {
+func InstallGoVersions(ctx context.Context, rules *config.RepositoryRules) error {
 	if rules == nil {
 		return nil
 	}
@@ -41,15 +42,15 @@ func InstallGoVersions(rules *config.RepositoryRules) error {
 	//
 	// Any version > 1.21 that supports GOTOOLCHAIN can automatically
 	// fetch the correct go version for a given module if not otherwise overridden.
-	defaultGoVersion := ""
+	var defaultGoVersion string
 	if rules.DefaultGoVersion != nil {
 		defaultGoVersion = *rules.DefaultGoVersion
 	} else {
 		// NOTE: we only do this in the else block, so if the rules explicitly
 		// specify a default, they do not depend on this endpoint
 		// That means if we ever have issues with getCurrentGoRelease, a quick
 		// fix is just setting the default again.
-		v, err := getCurrentGoRelease()
+		v, err := getCurrentGoRelease(ctx)
 		if err != nil {
 			return err
 		}
@@ -118,18 +119,26 @@ func installGoVersion(v, pth string) error {
 	return os.Rename(tmpPath, pth)
 }
 
-func getCurrentGoRelease() (string, error) {
+func getCurrentGoRelease(ctx context.Context) (string, error) {
 	var resp *http.Response
 	var err error
 	for i := 0; i < 3; i++ {
-		resp, err = http.Get("https://go.dev/VERSION?m=text")
+		req, reqErr := http.NewRequestWithContext(ctx, "GET", "https://go.dev/VERSION?m=text", nil)
+		if reqErr != nil {
+			return "", reqErr
+		}
+		resp, err = http.DefaultClient.Do(req)
 		if err == nil && resp.StatusCode == http.StatusOK {
 			break
 		}
 		if resp != nil {
 			resp.Body.Close()
 		}
-		time.Sleep(time.Second)
+		select {
+		case <-ctx.Done():
+			return "", ctx.Err()
+		case <-time.After(time.Second):
+		}
 	}
 	if err != nil {
 		return "", err