bump Go, buildkit-golang

- fix lint nags on casings of identifiers

Author: joonas-fi

.config/turbobob.json

@@ -6,7 +6,7 @@
 	"builders": [
 		{
 			"name": "default",
-			"uses": "docker://fn61/buildkit-golang:20250109_1140_037f68db",
+			"uses": "docker://fn61/buildkit-golang:20251124_1405_720e0dc0",
 			"mount_source": "",
 			"mount_destination": "/workspace",
 			"workdir": "/workspace",

cmd/edgerouter/discovery.go

@@ -44,7 +44,7 @@ func discoveryList() error {
 		}
 
 		tbl.AddRow(
-			app.Id,
+			app.ID,
 			strings.Join(frontendDescrs, ", "),
 			app.Backend.Describe())
 	}
@@ -54,7 +54,7 @@ func discoveryList() error {
 	return nil
 }
 
-func discoveryDeleteApplication(appId string) error {
+func discoveryDeleteApplication(appID string) error {
 	discoverySvc, err := newDefaultDiscoveryWithoutLogger()
 	if err != nil {
 		return err
@@ -68,7 +68,7 @@ func discoveryDeleteApplication(appId string) error {
 		return err
 	}
 
-	app := erconfig.FindApplication(appId, apps)
+	app := erconfig.FindApplication(appID, apps)
 	if app == nil {
 		return errors.New("app to delete not found")
 	}
@@ -100,7 +100,7 @@ func discoveryPut(content io.Reader, newOk bool) error {
 		return err
 	}
 
-	appAlreadyExists := erconfig.FindApplication(app.Id, existingApps) != nil
+	appAlreadyExists := erconfig.FindApplication(app.ID, existingApps) != nil
 
 	// sanity checks
 
@@ -109,7 +109,7 @@ func discoveryPut(content io.Reader, newOk bool) error {
 	}
 
 	if !newOk && !appAlreadyExists {
-		return errors.New("App doesn't exist. did you mean to create new with '--new'?")
+		return errors.New("app doesn't exist. did you mean to create new with '--new'?")
 	}
 
 	return discoverySvc.UpdateApplication(ctx, *app)
@@ -132,7 +132,7 @@ func discoveryPutEntry() *cobra.Command {
 	return cmd
 }
 
-func discoveryCat(appId string) error {
+func discoveryCat(appID string) error {
 	discoverySvc, err := newDefaultDiscoveryWithoutLogger()
 	if err != nil {
 		return err
@@ -146,7 +146,7 @@ func discoveryCat(appId string) error {
 		return err
 	}
 
-	app := erconfig.FindApplication(appId, apps)
+	app := erconfig.FindApplication(appID, apps)
 	if app == nil {
 		return errors.New("app not found")
 	}

pkg/erbackend/authssobackend/sso.go

@@ -14,12 +14,12 @@ func New(
 	opts erconfig.BackendOptsAuthSso,
 	authorizedBackend http.Handler,
 ) (http.Handler, error) {
-	serverUrl := opts.IdServerUrl
-	if serverUrl == "" {
-		serverUrl = idclient.Function61
+	serverURL := opts.IDServerURL
+	if serverURL == "" {
+		serverURL = idclient.Function61
 	}
 
-	idpClient := idclient.New(serverUrl)
+	idpClient := idclient.New(serverURL)
 
 	router := mux.NewRouter()
 

pkg/erbackend/lambdabackend/lambdabackend.go

@@ -48,7 +48,7 @@ func New(opts erconfig.BackendOptsAwsLambda, logger *log.Logger) (http.Handler,
 		functionName: opts.FunctionName,
 		lambda: lambda.New(
 			awsSession,
-			aws.NewConfig().WithCredentials(creds).WithRegion(opts.RegionId)),
+			aws.NewConfig().WithCredentials(creds).WithRegion(opts.RegionID)),
 		isPayloadV2: isPayloadV2,
 	}
 
@@ -87,7 +87,7 @@ func (b *lambdaBackend) serveHTTPModel(w http.ResponseWriter, r *http.Request) {
 
 	const routeKey = "$default"
 
-	proxyRequestJson, err := json.Marshal(events.APIGatewayV2HTTPRequest{
+	proxyRequestJSON, err := json.Marshal(events.APIGatewayV2HTTPRequest{
 		Version:        "2.0",
 		RouteKey:       routeKey,
 		RawPath:        r.URL.Path,
@@ -120,7 +120,7 @@ func (b *lambdaBackend) serveHTTPModel(w http.ResponseWriter, r *http.Request) {
 
 	lambdaResponse, err := b.lambda.InvokeWithContext(r.Context(), &lambda.InvokeInput{
 		FunctionName: aws.String(b.functionName),
-		Payload:      proxyRequestJson,
+		Payload:      proxyRequestJSON,
 	})
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -133,7 +133,7 @@ func (b *lambdaBackend) serveHTTPModel(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := proxyApiGatewayResponse(payloadResponse, w); err != nil {
+	if err := proxyAPIGatewayResponse(payloadResponse, w); err != nil {
 		// TODO: if we already wrote headers, this will not succeed
 		http.Error(w, err.Error(), http.StatusBadGateway)
 	}
@@ -170,15 +170,15 @@ func (b *lambdaBackend) serveRESTModel(w http.ResponseWriter, r *http.Request) {
 		proxyRequest.IsBase64Encoded = true
 	}
 
-	proxyRequestJson, err := json.Marshal(&proxyRequest)
+	proxyRequestJSON, err := json.Marshal(&proxyRequest)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
 	lambdaResponse, err := b.lambda.InvokeWithContext(r.Context(), &lambda.InvokeInput{
 		FunctionName: aws.String(b.functionName),
-		Payload:      proxyRequestJson,
+		Payload:      proxyRequestJSON,
 	})
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -197,7 +197,7 @@ func (b *lambdaBackend) serveRESTModel(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := proxyApiGatewayResponse(&events.APIGatewayV2HTTPResponse{
+	if err := proxyAPIGatewayResponse(&events.APIGatewayV2HTTPResponse{
 		StatusCode:        payloadResponse.StatusCode,
 		Headers:           payloadResponse.Headers,
 		MultiValueHeaders: payloadResponse.MultiValueHeaders,
@@ -210,7 +210,7 @@ func (b *lambdaBackend) serveRESTModel(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func proxyApiGatewayResponse(payloadResponse *events.APIGatewayV2HTTPResponse, w http.ResponseWriter) error {
+func proxyAPIGatewayResponse(payloadResponse *events.APIGatewayV2HTTPResponse, w http.ResponseWriter) error {
 	responseHeaders := w.Header()
 
 	for key, val := range payloadResponse.Headers {

pkg/erbackend/reverseproxybackend/reverseproxy.go

@@ -29,8 +29,8 @@ 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 New(appId string, opts erconfig.BackendOptsReverseProxy, logger *log.Logger) (http.Handler, error) {
-	handler, err := NewWithModifyResponse(appId, opts, nil)
+func New(appID string, opts erconfig.BackendOptsReverseProxy, logger *log.Logger) (http.Handler, error) {
+	handler, err := NewWithModifyResponse(appID, opts, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -39,7 +39,7 @@ func New(appId string, opts erconfig.BackendOptsReverseProxy, logger *log.Logger
 }
 
 func NewWithModifyResponse(
-	appId string,
+	appID string,
 	opts erconfig.BackendOptsReverseProxy,
 	modifyResponse func(r *http.Response) error,
 ) (http.Handler, error) {
@@ -49,13 +49,13 @@ func NewWithModifyResponse(
 	}
 
 	// transport that has optional TLS customizations and maybe caching (depending on options)
-	transport, err := maybeWrapWithCache(appId, opts, func() http.RoundTripper {
-		if opts.TlsConfig != nil { // got custom TLS config?
+	transport, err := maybeWrapWithCache(appID, opts, func() http.RoundTripper {
+		if opts.TLSConfig != nil { // got custom TLS config?
 			return &http.Transport{
 				TLSClientConfig: &tls.Config{
-					ServerName: opts.TlsConfig.ServerName,
+					ServerName: opts.TLSConfig.ServerName,
 					//nolint:gosec // InsecureSkipVerify intentionally configurable
-					InsecureSkipVerify: opts.TlsConfig.InsecureSkipVerify,
+					InsecureSkipVerify: opts.TLSConfig.InsecureSkipVerify,
 				},
 			}
 		} else {
@@ -72,7 +72,7 @@ func NewWithModifyResponse(
 			//nolint:gosec // Cryptographical randomness not required here
 			randomOriginIdx := rand.Intn(len(originUrls))
 
-			originUrl := originUrls[randomOriginIdx]
+			originURL := originUrls[randomOriginIdx]
 
 			maybeIndexSuffix := func() string { // "/foo/" => "/foo/index.html" (if configured)
 				if opts.IndexDocument != "" && strings.HasSuffix(req.URL.Path, "/") {
@@ -82,19 +82,19 @@ func NewWithModifyResponse(
 				}
 			}()
 
-			req.URL.Scheme = originUrl.Scheme // "http" | "https"
+			req.URL.Scheme = originURL.Scheme // "http" | "https"
 
 			// this specifies the host we're connecting to
-			req.URL.Host = originUrl.Host
+			req.URL.Host = originURL.Host
 
 			// sometimes we want the outgoing request to include the original "Host: ..." header, so
 			// the backend can see what hostname is in browser's address bar
 			if !opts.PassHostHeader {
-				req.Host = originUrl.Host
+				req.Host = originURL.Host
 			}
 
 			// origin's Path is "normally" empty (e.g. "http://example.com"), but can be used to add a prefix
-			req.URL.Path = originUrl.Path + req.URL.Path + maybeIndexSuffix
+			req.URL.Path = originURL.Path + req.URL.Path + maybeIndexSuffix
 
 			// remove query string if we know we're serving static content and the output does
 			// not vary based on query string. someone malicious could even be trying to flood our
@@ -115,7 +115,7 @@ func NewWithModifyResponse(
 }
 
 func maybeWrapWithCache(
-	appId string,
+	appID string,
 	opts erconfig.BackendOptsReverseProxy,
 	inner http.RoundTripper,
 ) (http.RoundTripper, error) {
@@ -124,7 +124,7 @@ func maybeWrapWithCache(
 	}
 
 	// there's no abstraction for getting system-level cache dir in Go
-	cacheLocation := filepath.Join("/var/cache/edgerouter", appId)
+	cacheLocation := filepath.Join("/var/cache/edgerouter", appID)
 
 	if err := os.MkdirAll(cacheLocation, 0700); err != nil {
 		return nil, fmt.Errorf("cachingreverseproxy: %w", err)
@@ -142,21 +142,21 @@ func maybeWrapWithCache(
 	return cache, nil
 }
 
-func parseOriginUrls(originUrlStrs []string) ([]url.URL, error) {
-	originUrls := []url.URL{}
+func parseOriginUrls(originURLStrs []string) ([]url.URL, error) {
+	originURLs := []url.URL{}
 
-	for _, originUrlStr := range originUrlStrs {
-		originUrl, err := url.Parse(originUrlStr)
+	for _, originURLStr := range originURLStrs {
+		originURL, err := url.Parse(originURLStr)
 		if err != nil {
 			return nil, err
 		}
 
-		originUrls = append(originUrls, *originUrl)
+		originURLs = append(originURLs, *originURL)
 	}
 
-	if len(originUrls) == 0 {
+	if len(originURLs) == 0 {
 		return nil, errors.New("empty origin list")
 	}
 
-	return originUrls, nil
+	return originURLs, nil
 }

pkg/erbackend/statics3websitebackend/backend.go

@@ -16,9 +16,9 @@ import (
 	"github.com/function61/gokit/ezhttp"
 )
 
-func New(appId string, opts erconfig.BackendOptsS3StaticWebsite) (http.Handler, error) {
+func New(appID string, opts erconfig.BackendOptsS3StaticWebsite) (http.Handler, error) {
 	if opts.DeployedVersion == "" {
-		errMsg := fmt.Sprintf("no deployed version for %s", appId)
+		errMsg := fmt.Sprintf("no deployed version for %s", appID)
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, errMsg, http.StatusNotFound)
 		}), nil
@@ -27,13 +27,13 @@ func New(appId string, opts erconfig.BackendOptsS3StaticWebsite) (http.Handler,
 	// this is not much more than sugar on top of the much more powerful reverseproxybackend
 
 	// bucketPrefix looks like "sites/joonasfi-blog/versionid"
-	origin := "https://s3." + opts.RegionId + ".amazonaws.com/" + opts.BucketName + "/" + bucketPrefix(appId, opts.DeployedVersion)
+	origin := "https://s3." + opts.RegionID + ".amazonaws.com/" + opts.BucketName + "/" + bucketPrefix(appID, opts.DeployedVersion)
 
 	cacheNotFound := &cache404{}
 
 	// FIXME: it uses appId as cache key, thus we synthetize new cache each time a
 	//        new version is deployed
-	return reverseproxybackend.NewWithModifyResponse(appId+"-"+opts.DeployedVersion, erconfig.BackendOptsReverseProxy{
+	return reverseproxybackend.NewWithModifyResponse(appID+"-"+opts.DeployedVersion, erconfig.BackendOptsReverseProxy{
 		// "/favicon.ico" =>
 		//   https://s3.us-east-1.amazonaws.com/myorg-websites/sites/joonasfi-blog/versionid/favicon.ico
 		Origins: []string{origin},

pkg/erbackend/statics3websitebackend/deploy.go

@@ -23,22 +23,22 @@ import (
 )
 
 type uploadJob struct {
-	applicationId  string
+	applicationID  string
 	deploymentSpec deploymentSpec
 	bucket         *s3facade.BucketContext
 }
 
 // atomically deploys a new version of a site to a S3 bucket, then updates service
 // discovery to point to the new deployed version
-func Deploy(ctx context.Context, tarArchive io.Reader, applicationId string, deployVersion string, discoverySvc erdiscovery.ReaderWriter) error {
+func Deploy(ctx context.Context, tarArchive io.Reader, applicationID string, deployVersion string, discoverySvc erdiscovery.ReaderWriter) error {
 	apps, err := discoverySvc.ReadApplications(ctx)
 	if err != nil {
 		return err
 	}
 
-	app := erconfig.FindApplication(applicationId, apps)
+	app := erconfig.FindApplication(applicationID, apps)
 	if app == nil {
-		return fmt.Errorf("unknown applicationId: %s", applicationId)
+		return fmt.Errorf("unknown applicationId: %s", applicationID)
 	}
 
 	if app.Backend.Kind != erconfig.BackendKindS3StaticWebsite {
@@ -50,13 +50,13 @@ func Deploy(ctx context.Context, tarArchive io.Reader, applicationId string, dep
 	bucket, err := s3facade.Bucket(
 		s3StaticWebsiteOpts.BucketName,
 		s3facade.CredentialsFromEnv,
-		s3StaticWebsiteOpts.RegionId)
+		s3StaticWebsiteOpts.RegionID)
 	if err != nil {
 		return err
 	}
 
 	upload := &uploadJob{
-		applicationId: app.Id,
+		applicationID: app.ID,
 		deploymentSpec: deploymentSpec{
 			Version:    deployVersion,
 			DeployedAt: time.Now(),
@@ -72,7 +72,7 @@ func Deploy(ctx context.Context, tarArchive io.Reader, applicationId string, dep
 	// to all edge routers
 	app.Backend = erconfig.S3Backend(
 		s3StaticWebsiteOpts.BucketName,
-		s3StaticWebsiteOpts.RegionId,
+		s3StaticWebsiteOpts.RegionID,
 		upload.deploymentSpec.Version)
 
 	return discoverySvc.UpdateApplication(ctx, *app)
@@ -137,16 +137,16 @@ func uploadAllFiles(ctx context.Context, tarArchive io.Reader, upload *uploadJob
 	}
 
 	// deployment spec
-	deploymentSpecJson, err := json.MarshalIndent(&upload.deploymentSpec, "", "  ")
+	deploymentSpecJSON, err := json.MarshalIndent(&upload.deploymentSpec, "", "  ")
 	if err != nil {
 		return err
 	}
 
 	workItems <- &s3.PutObjectInput{
 		Bucket:      upload.bucket.Name,
-		Key:         aws.String(bucketPrefix(upload.applicationId, upload.deploymentSpec.Version) + ".deployment.json"),
+		Key:         aws.String(bucketPrefix(upload.applicationID, upload.deploymentSpec.Version) + ".deployment.json"),
 		ContentType: aws.String("application/json"),
-		Body:        bytes.NewReader(deploymentSpecJson),
+		Body:        bytes.NewReader(deploymentSpecJSON),
 	}
 
 	closeOnceAndWait()
@@ -170,7 +170,7 @@ func createUploadRequest(filePath string, content io.Reader, upload *uploadJob)
 	ext := filepath.Ext(filePath)
 
 	// looks like "joonasfi-blog/versionid/"
-	pathPrefix := bucketPrefix(upload.applicationId, upload.deploymentSpec.Version) + "/"
+	pathPrefix := bucketPrefix(upload.applicationID, upload.deploymentSpec.Version) + "/"
 
 	// sometimes the entries start with a dot, and we would end up with
 	// "sites/APP_ID/VERSION/./readme.md" unless we normalize this
@@ -207,6 +207,6 @@ func uploadWorker(ctx context.Context, s3Client *s3.S3, objects <-chan *s3.PutOb
 }
 
 // looks like "sites/joonasfi-blog/versionid"
-func bucketPrefix(applicationId string, deployVersion string) string {
-	return "sites/" + applicationId + "/" + deployVersion
+func bucketPrefix(applicationID string, deployVersion string) string {
+	return "sites/" + applicationID + "/" + deployVersion
 }