bump Go, buildkit-golang (import from 2024-09-08)

Author: joonas-fi

go.mod

@@ -1,6 +1,6 @@
 module github.com/function61/edgerouter
 
-go 1.13
+go 1.23.1
 
 require (
 	github.com/aws/aws-lambda-go v1.14.0
@@ -11,16 +11,35 @@ require (
 	github.com/function61/eventhorizon v0.2.1-0.20200610093004-78aa8b3a710f
 	github.com/function61/gokit v0.0.0-20200608105953-12235c68c38b
 	github.com/function61/id v0.0.0-20210304120117-4b4b73375b3b
-	github.com/go-acme/lego/v3 v3.3.0 // indirect
 	github.com/gorilla/mux v1.7.4
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/peterbourgon/diskv v2.0.1+incompatible
 	github.com/prometheus/client_golang v1.4.1
 	github.com/scylladb/termtables v1.0.0
 	github.com/spf13/cobra v1.0.0
-	github.com/stretchr/testify v1.6.1 // indirect
-	golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 // indirect
-	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
 	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a
 )
+
+require (
+	github.com/apcera/termtables v0.0.0-20170405184538-bcbc5dc54055 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/golang/protobuf v1.3.4 // indirect
+	github.com/google/btree v1.0.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jmespath/go-jmespath v0.3.0 // indirect
+	github.com/kataras/jwt v0.1.2 // indirect
+	github.com/mattn/go-runewidth v0.0.8 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.9.1 // indirect
+	github.com/prometheus/procfs v0.0.8 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
+	golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 // indirect
+	golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect
+	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
+)

go.sum

@@ -14,7 +14,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/cozy/httpcache"
 	"github.com/cozy/httpcache/diskcache"
@@ -30,10 +29,6 @@ import (
 //   3) press F5 from browser. this'll inject 304 Not Modified into cache (browser expects 304 but CACHE NOT)
 //   4) now use cURL to request the same resource (= without caching), and you'll get 304 🤦
 
-func init() {
-	rand.Seed(time.Now().Unix())
-}
-
 func New(appId string, opts erconfig.BackendOptsReverseProxy, logger *log.Logger) (http.Handler, error) {
 	handler, err := NewWithModifyResponse(appId, opts, nil)
 	if err != nil {

pkg/erbackend/reverseproxybackend/reverseproxy.go

@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"sync"
@@ -53,7 +53,7 @@ func New(appId string, opts erconfig.BackendOptsS3StaticWebsite) (http.Handler,
 			}
 
 			r.Header.Set("Content-Type", contentType)
-			r.Body = ioutil.NopCloser(bytes.NewReader(body))
+			r.Body = io.NopCloser(bytes.NewReader(body))
 		}
 
 		return nil
@@ -70,7 +70,7 @@ func serveCached404Page(url404 string, cacheNotFound *cache404) ([]byte, string,
 			return nil, "", fmt.Errorf("failed ezhttp.Get 404 page: %w", err)
 		}
 
-		body, err := ioutil.ReadAll(res.Body)
+		body, err := io.ReadAll(res.Body)
 		if err != nil {
 			return nil, "", err
 		}

pkg/erbackend/statics3websitebackend/backend.go

@@ -8,7 +8,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"path"
 	"path/filepath"
@@ -163,7 +162,7 @@ func uploadAllFiles(ctx context.Context, tarArchive io.Reader, upload *uploadJob
 // filePath looks like "images/2018/unificontroller-stats.png"
 func createUploadRequest(filePath string, content io.Reader, upload *uploadJob) (*s3.PutObjectInput, error) {
 	// stupid S3 client requires io.ReadSeeker, so we've to read the entire file in memory......
-	wholeFileInMemory, err := ioutil.ReadAll(content)
+	wholeFileInMemory, err := io.ReadAll(content)
 	if err != nil {
 		return nil, err
 	}

pkg/erbackend/statics3websitebackend/deploy.go

@@ -163,8 +163,6 @@ func TestTraefikAnnotationsToApp(t *testing.T) {
 	}
 
 	for _, tc := range tcs {
-		tc := tc // pin
-
 		t.Run(tc.input.Name, func(t *testing.T) {
 			app, err := traefikAnnotationsToApp(tc.input)
 			assert.Ok(t, err)

pkg/erdiscovery/dockerdiscovery/traefikannotations_test.go

@@ -95,8 +95,6 @@ allow_specified {
 			"your IP (100.56.80.67) is not allowed (implicit deny)",
 		},
 	} {
-		tc := tc // pin
-
 		testcaseSubject := fmt.Sprintf("%s -> %s", tc.ip, tc.app) // for failures
 
 		t.Run(testcaseSubject, func(t *testing.T) {

pkg/erserver/ipfilter_test.go

@@ -4,7 +4,6 @@ package erservercli
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -93,7 +92,7 @@ func installAsService(opts Options) error {
 		return err
 	}
 
-	return ioutil.WriteFile(envFile, []byte(`
+	return os.WriteFile(envFile, []byte(`
 # --- Docker integration
 DOCKER_URL=unix:///var/run/docker.sock
 NETWORK_NAME=docker_gwbridge

pkg/erservercli/servercli.go

@@ -3,7 +3,6 @@ package erservercli
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -43,7 +42,7 @@ func setupDevCertsEntry(opts Options) *cobra.Command {
 }
 
 func serverCertGenerate(hostname string, opts Options) error {
-	tempDir, err := ioutil.TempDir("", "edgerouter-mkcert-*")
+	tempDir, err := os.MkdirTemp("", "edgerouter-mkcert-*")
 	if err != nil {
 		return err
 	}
@@ -78,7 +77,7 @@ func serverCertGenerate(hostname string, opts Options) error {
 		return err
 	}
 
-	if err := translateIfSudoError(ioutil.WriteFile(
+	if err := translateIfSudoError(os.WriteFile(
 		opts.ConfigDir().DevelopmentCertificate(),
 		append(cert, key...),
 		0600),
@@ -119,7 +118,7 @@ func findReadAndDeleteFile(globPattern string) ([]byte, error) {
 		return nil, fmt.Errorf("findReadAndDeleteFile: expected 1 match; got %d", len(globMatches))
 	}
 
-	content, err := ioutil.ReadFile(globMatches[0])
+	content, err := os.ReadFile(globMatches[0])
 	if err != nil {
 		return nil, err
 	}

pkg/erservercli/setupdevcerts.go

@@ -6,15 +6,14 @@
 	"builders": [
 		{
 			"name": "default",
-			"uses": "docker://fn61/buildkit-golang:20231229_0955_79a9c09c",
+			"uses": "docker://fn61/buildkit-golang:20240908_1146_f9b94bc0",
 			"mount_source": "",
 			"mount_destination": "/workspace",
 			"workdir": "/workspace",
 			"commands": {
 				"build": ["build-go-project.sh", "--directory=cmd/edgerouter/", "--binary-basename=edgerouter"],
 				"dev": ["bash"]
 			},
-			"dev_ports": ["80:80", "443:443"],
 			"dev_shell_commands": [
 				{ "command": "rel/edgerouter_linux-amd64 serve", "important": true },
 				{ "command": "source env-discovery-dev.env && source env-docker-integration.env && bob tips", "important": true }