Bump Go version to 1.22

.github/workflows/ci.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.19.x, 1.20.x, 1.21.x]
+        go-version: [1.20.x, 1.21.x, 1.22.x]
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -32,5 +32,5 @@ jobs:
           BUF_TOKEN: ${{ secrets.BUF_TOKEN }}
         run: make test
       - name: lint
-        if: matrix.go-version == '1.21.x'
+        if: matrix.go-version == '1.22.x'
         run: make lint

.golangci.yml

@@ -34,6 +34,7 @@ linters:
     - golint            # deprecated by Go team
     - gomnd             # some unnamed constants are okay
     - ifshort           # deprecated by author
+    - inamedparam       # convention is not followed
     - interfacer        # deprecated by author
     - ireturn           # "accept interfaces, return structs" isn't ironclad
     - lll               # don't want hard limits for line length

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 Buf Technologies, Inc.
+   Copyright 2023-2024 Buf Technologies, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -7,12 +7,12 @@ MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 MAKEFLAGS += --no-print-directory
 BIN := .tmp/bin
-COPYRIGHT_YEARS := 2023
+COPYRIGHT_YEARS := 2023-2024
 LICENSE_IGNORE := -e internal/testdata/
 # Set to use a different compiler. For example, `GO=go1.18rc1 make test`.
 GO ?= go
-BUF_VERSION ?= v1.26.1
-GOLANGCI_LINT_VERSION ?= v1.54.1
+BUF_VERSION ?= v1.29.0
+GOLANGCI_LINT_VERSION ?= v1.56.2
 
 .PHONY: help
 help: ## Describe useful make targets

cache.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ func decodeForCache(data []byte) (*prototransformv1alpha1.CacheEntry, error) {
 }
 
 func isCorrectCacheEntry(entry *prototransformv1alpha1.CacheEntry, schemaID string, syms []string) bool {
-	return entry.Id == schemaID && isSuperSet(entry.IncludedSymbols, syms)
+	return entry.GetId() == schemaID && isSuperSet(entry.GetIncludedSymbols(), syms)
 }
 
 func isSuperSet(have, want []string) bool {

cache/filecache/filecache.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

cache/filecache/filecache_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -174,7 +174,7 @@ func TestSanitize(t *testing.T) {
 func checkFiles(t *testing.T, dir string, mode fs.FileMode, names map[string]struct{}) {
 	t.Helper()
 	err := fs.WalkDir(os.DirFS(dir), ".", func(path string, dirEntry fs.DirEntry, err error) error {
-		if !assert.NoError(t, err) {
+		if !assert.NoError(t, err) { //nolint:testifylint
 			return nil
 		}
 		if dirEntry.IsDir() {
@@ -190,7 +190,7 @@ func checkFiles(t *testing.T, dir string, mode fs.FileMode, names map[string]str
 		}
 		delete(names, path)
 		info, err := dirEntry.Info()
-		if !assert.NoErrorf(t, err, "failed to get file info for %s", path) {
+		if !assert.NoErrorf(t, err, "failed to get file info for %s", path) { //nolint:testifylint
 			return nil
 		}
 		assert.Equal(t, mode, info.Mode())

cache/internal/cachetesting/cachetesting.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

cache/memcache/memcache.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

cache/memcache/memcache_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

cache/rediscache/rediscache.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

cache/rediscache/rediscache_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

cache_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

config.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 package prototransform
 
 import (
+	"errors"
 	"fmt"
 	"time"
 
@@ -83,22 +84,22 @@ type SchemaWatcherConfig struct {
 
 func (c *SchemaWatcherConfig) validate() error {
 	if c.SchemaPoller == nil {
-		return fmt.Errorf("schema poller not provided")
+		return errors.New("schema poller not provided")
 	}
 	if c.PollingPeriod < 0 {
-		return fmt.Errorf("polling period duration cannot be negative")
+		return errors.New("polling period duration cannot be negative")
 	}
 	if c.Jitter < 0 {
-		return fmt.Errorf("jitter cannot be negative")
+		return errors.New("jitter cannot be negative")
 	}
 	if c.Jitter > 1.0 {
-		return fmt.Errorf("jitter cannot be greater than 1.0 (100%%)")
+		return errors.New("jitter cannot be greater than 1.0 (100%)")
 	}
 	if c.Leaser != nil && c.Cache == nil {
-		return fmt.Errorf("leaser config should only be present when cache config also present")
+		return errors.New("leaser config should only be present when cache config also present")
 	}
 	if c.Leaser != nil && c.CurrentProcess != nil && len(c.CurrentProcess) == 0 {
-		return fmt.Errorf("current process is empty but not nil; leave nil or set to non-empty value")
+		return errors.New("current process is empty but not nil; leave nil or set to non-empty value")
 	}
 	for _, sym := range c.IncludeSymbols {
 		if sym == "" {

converter.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

converter_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ import (
 func TestSchemaService_ConvertMessage(t *testing.T) {
 	t.Parallel()
 	// create schema for message to convert
-	sourceFile := fakeFileDescriptorSet().File[0]
+	sourceFile := fakeFileDescriptorSet().GetFile()[0]
 
 	// create test message
 	fileDescriptor, err := protodesc.NewFile(sourceFile, nil)

doc.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

example_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

filter.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ func redactList(value protoreflect.Value, redaction func(protoreflect.FieldDescr
 }
 
 func redactMap(value protoreflect.Value, redaction func(protoreflect.FieldDescriptor) bool) {
-	value.Map().Range(func(mapKey protoreflect.MapKey, mapValue protoreflect.Value) bool {
+	value.Map().Range(func(_ protoreflect.MapKey, mapValue protoreflect.Value) bool {
 		redactMessage(mapValue.Message(), redaction)
 		return true
 	})

filter_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

format.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

go.mod

@@ -1,6 +1,6 @@
 module github.com/bufbuild/prototransform
 
-go 1.19
+go 1.20
 
 require (
 	buf.build/gen/go/bufbuild/reflect/connectrpc/go v1.14.0-20240117202343-bf8f65e8876c.1

internal/proto/buf/prototransform/v1alpha1/cache.proto

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

internal/proto/buf/prototransform/v1alpha1/lease.proto

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

jitter.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

jitter_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

leaser.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

leaser/internal/leasertesting/leasertesting.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

leaser/memcacheleaser/memcacheleaser.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

leaser/memcacheleaser/memcacheleaser_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

leaser/polling_leaser.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

leaser/redisleaser/redisleaser.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

leaser/redisleaser/redisleaser_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

reflect_client.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@ package prototransform
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"os"
@@ -49,7 +50,7 @@ func NewDefaultFileDescriptorSetServiceClient(token string) reflectv1beta1connec
 			connect.UnaryInterceptorFunc(func(call connect.UnaryFunc) connect.UnaryFunc {
 				return func(ctx context.Context, req connect.AnyRequest) (connect.AnyResponse, error) {
 					// decorate user-agent with the name of the package
-					userAgent := fmt.Sprintf("%s prototransform-go", req.Header().Get("User-Agent"))
+					userAgent := req.Header().Get("User-Agent") + " prototransform-go"
 					req.Header().Set("User-Agent", userAgent)
 					return call(ctx, req)
 				}
@@ -68,7 +69,7 @@ func NewDefaultFileDescriptorSetServiceClient(token string) reflectv1beta1connec
 //
 // To get a token from the environment (e.g. BUF_TOKEN env var), see BufTokenFromEnvironment.
 func NewAuthInterceptor(token string) connect.Interceptor {
-	bearerAuthValue := fmt.Sprintf("Bearer %s", token)
+	bearerAuthValue := "Bearer " + token
 	return connect.UnaryInterceptorFunc(func(next connect.UnaryFunc) connect.UnaryFunc {
 		return func(ctx context.Context, request connect.AnyRequest) (connect.AnyResponse, error) {
 			request.Header().Set("Authorization", bearerAuthValue)
@@ -84,7 +85,7 @@ func BufTokenFromEnvironment(moduleRef string) (string, error) {
 	parts := strings.SplitN(moduleRef, "/", 2)
 	envBufToken := os.Getenv("BUF_TOKEN")
 	if envBufToken == "" {
-		return "", fmt.Errorf("no BUF_TOKEN environment variable set")
+		return "", errors.New("no BUF_TOKEN environment variable set")
 	}
 	tok := parseBufToken(envBufToken, parts[0])
 	if tok == "" {

reflect_client_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ func TestReflectClientLargeRequest(t *testing.T) {
 	// downloading the entire response.
 	resp, err := getFileDescriptorSet(ctx, client, req)
 	require.NoError(t, err)
-	require.GreaterOrEqual(t, len(resp.Msg.FileDescriptorSet.File), 42)
+	require.GreaterOrEqual(t, len(resp.Msg.GetFileDescriptorSet().GetFile()), 42)
 
 	// If we ask for one fewer type, we should be below the limit and get back
 	// a "not modified" response code instead of a response body.

resolver.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Buf Technologies, Inc.
+// Copyright 2023-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ type resolver struct {
 func newResolver(fileDescriptors *descriptorpb.FileDescriptorSet) (*resolver, error) {
 	var result resolver
 	// TODO(TCN-925): maybe should reparse unrecognized fields in fileDescriptors after creating resolver?
-	if len(fileDescriptors.File) == 0 {
+	if len(fileDescriptors.GetFile()) == 0 {
 		return &result, nil
 	}
 	files, err := protodesc.FileOptions{AllowUnresolvable: true}.NewFiles(fileDescriptors)