Skip to content

Commit f1de9d0

Browse files
doriabledoriable
authored
Upgrade protobuf-go and protoc-gen-go (#3653)
1 parent 8ca7e7c commit f1de9d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+87
-129
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
golang.org/x/sync v0.11.0
4747
golang.org/x/term v0.29.0
4848
golang.org/x/tools v0.30.0
49-
google.golang.org/protobuf v1.36.4
49+
google.golang.org/protobuf v1.36.5
5050
gopkg.in/yaml.v3 v3.0.1
5151
pluginrpc.com/pluginrpc v0.5.0
5252
)

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 h1:
308308
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
309309
google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
310310
google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
311-
google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
312-
google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
311+
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
312+
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
313313
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
314314
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
315315
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎make/go/dep_golangci_lint.mk‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,35 @@ $(call _conditional_include,$(MAKEGO)/base.mk)
66
$(call _assert_var,CACHE_VERSIONS)
77
$(call _assert_var,CACHE_BIN)
88

9-
# We want to ensure we rebuild golangci-lint every time we require a new Go minor version.
10-
# Otherwise, the cached version may not support the latest language features.
11-
GOLANGCI_LINT_GO_VERSION := $(shell go list -m -f '{{.GoVersion}}' | cut -d'.' -f1-2)
9+
ifeq ($(UNAME_OS),Darwin)
10+
GOLANGCI_LINT_OS := darwin
11+
else ifeq ($(UNAME_OS),Linux)
12+
GOLANGCI_LINT_OS := linux
13+
endif
14+
15+
ifeq ($(UNAME_ARCH),x86_64)
16+
GOLANGCI_LINT_ARCH := amd64
17+
else ifeq ($(UNAME_ARCH),arm64)
18+
GOLANGCI_LINT_ARCH := arm64
19+
else ifeq ($(UNAME_ARCH),aarch64)
20+
GOLANGCI_LINT_ARCH := arm64
21+
else
22+
GOLANGCI_LINT_ARCH := $(UNAME_ARCH)
23+
endif
1224

1325
# Settable
14-
# https://github.com/golangci/golangci-lint/releases 20250103 checked 20250124
26+
# https://github.com/golangci/golangci-lint/releases 20250212 checked 20250212
1527
# Contrast golangci-lint configuration with the one in https://github.com/connectrpc/connect-go/blob/main/.golangci.yml when upgrading
16-
GOLANGCI_LINT_VERSION ?= v1.63.4
28+
GOLANGCI_LINT_VERSION ?= v1.64.3
1729

18-
GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION)-go$(GOLANGCI_LINT_GO_VERSION)
30+
GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION)
1931
$(GOLANGCI_LINT):
2032
@rm -f $(CACHE_BIN)/golangci-lint
21-
GOBIN=$(CACHE_BIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
33+
$(eval GOLANGCI_LINT_TMP := $(shell mktemp -d))
34+
curl -fsSL -o $(GOLANGCI_LINT_TMP)/golangci-lint.tar.gz \
35+
https://github.com/golangci/golangci-lint/releases/download/$(GOLANGCI_LINT_VERSION)/golangci-lint-$(subst v,,$(GOLANGCI_LINT_VERSION))-$(GOLANGCI_LINT_OS)-$(GOLANGCI_LINT_ARCH).tar.gz
36+
cd $(GOLANGCI_LINT_TMP); tar zxf $(GOLANGCI_LINT_TMP)/golangci-lint.tar.gz --strip-components 1 && mv golangci-lint $(CACHE_BIN)/golangci-lint
37+
@rm -rf $(GOLANGCI_LINT_TMP)
2238
@rm -rf $(dir $(GOLANGCI_LINT))
2339
@mkdir -p $(dir $(GOLANGCI_LINT))
2440
@touch $(GOLANGCI_LINT)

‎make/go/dep_protoc_gen_go.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS)
77
$(call _assert_var,CACHE_BIN)
88

99
# Settable
10-
# https://github.com/protocolbuffers/protobuf-go/releases 20250124 checked 20250124
11-
PROTOC_GEN_GO_VERSION ?= v1.36.4
10+
# https://github.com/protocolbuffers/protobuf-go/releases 20250206 checked 20250210
11+
PROTOC_GEN_GO_VERSION ?= v1.36.5
1212

1313
GO_GET_PKGS := $(GO_GET_PKGS) \
1414
google.golang.org/protobuf/proto@$(PROTOC_GEN_GO_VERSION)

‎private/buf/cmd/buf/buf_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ var (
6767
{ID: "FIELD_LOWER_SNAKE_CASE", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that field names are lower_snake_case."},
6868
{ID: "FIELD_NOT_REQUIRED", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that fields are not configured to be required."},
6969
{ID: "IMPORT_NO_PUBLIC", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that imports are not public."},
70-
{ID: "IMPORT_NO_WEAK", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that imports are not weak."},
7170
{ID: "IMPORT_USED", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that imports are used."},
7271
{ID: "MESSAGE_PASCAL_CASE", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that messages are PascalCase."},
7372
{ID: "ONEOF_LOWER_SNAKE_CASE", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that oneof names are lower_snake_case."},
@@ -679,7 +678,6 @@ ENUM_PASCAL_CASE BASIC, STANDARD * Checks that
679678
ENUM_VALUE_UPPER_SNAKE_CASE BASIC, STANDARD * Checks that enum values are UPPER_SNAKE_CASE.
680679
FIELD_LOWER_SNAKE_CASE BASIC, STANDARD * Checks that field names are lower_snake_case.
681680
IMPORT_NO_PUBLIC BASIC, STANDARD * Checks that imports are not public.
682-
IMPORT_NO_WEAK BASIC, STANDARD * Checks that imports are not weak.
683681
IMPORT_USED BASIC, STANDARD * Checks that imports are used.
684682
MESSAGE_PASCAL_CASE BASIC, STANDARD * Checks that messages are PascalCase.
685683
ONEOF_LOWER_SNAKE_CASE BASIC, STANDARD * Checks that oneof names are lower_snake_case.
@@ -876,7 +874,6 @@ PACKAGE_SAME_SWIFT_PREFIX MINIMAL, BASIC, STANDARD, PACKAGE_AFFINITY
876874
ENUM_NO_ALLOW_ALIAS MINIMAL, BASIC, STANDARD, SENSIBLE * Checks that enums do not have the allow_alias option set.
877875
FIELD_NO_DESCRIPTOR MINIMAL, BASIC, STANDARD, SENSIBLE * Checks that field names are not any capitalization of "descriptor" with any number of prefix or suffix underscores.
878876
IMPORT_NO_PUBLIC MINIMAL, BASIC, STANDARD, SENSIBLE * Checks that imports are not public.
879-
IMPORT_NO_WEAK MINIMAL, BASIC, STANDARD, SENSIBLE * Checks that imports are not weak.
880877
PACKAGE_DEFINED MINIMAL, BASIC, STANDARD, SENSIBLE * Checks that all files have a package defined.
881878
ENUM_PASCAL_CASE BASIC, STANDARD, STYLE_BASIC, STYLE_STANDARD * Checks that enums are PascalCase.
882879
ENUM_VALUE_UPPER_SNAKE_CASE BASIC, STANDARD, STYLE_BASIC, STYLE_STANDARD * Checks that enum values are UPPER_SNAKE_CASE.
@@ -933,7 +930,6 @@ ENUM_VALUE_UPPER_SNAKE_CASE BASIC, STANDARD * Checks tha
933930
FIELD_LOWER_SNAKE_CASE BASIC, STANDARD * Checks that field names are lower_snake_case.
934931
FIELD_NOT_REQUIRED BASIC, STANDARD * Checks that fields are not configured to be required.
935932
IMPORT_NO_PUBLIC BASIC, STANDARD * Checks that imports are not public.
936-
IMPORT_NO_WEAK BASIC, STANDARD * Checks that imports are not weak.
937933
IMPORT_USED BASIC, STANDARD * Checks that imports are used.
938934
MESSAGE_PASCAL_CASE BASIC, STANDARD * Checks that messages are PascalCase.
939935
ONEOF_LOWER_SNAKE_CASE BASIC, STANDARD * Checks that oneof names are lower_snake_case.

‎private/bufpkg/bufcheck/bufcheckserver/bufcheckserver.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ var (
106106
bufcheckserverbuild.LintFieldNoDescriptorRuleSpecBuilder.Build(true, []string{"MINIMAL", "BASIC", "DEFAULT", "STANDARD", "SENSIBLE"}),
107107
bufcheckserverbuild.LintFileLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD", "STYLE_DEFAULT", "STYLE_STANDARD"}),
108108
bufcheckserverbuild.LintImportNoPublicRuleSpecBuilder.Build(true, []string{"MINIMAL", "BASIC", "DEFAULT", "STANDARD", "SENSIBLE"}),
109-
bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(true, []string{"MINIMAL", "BASIC", "DEFAULT", "STANDARD", "SENSIBLE"}),
110109
bufcheckserverbuild.LintMessagePascalCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD", "STYLE_BASIC", "STYLE_DEFAULT", "STYLE_STANDARD"}),
111110
bufcheckserverbuild.LintOneofLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD", "STYLE_BASIC", "STYLE_DEFAULT", "STYLE_STANDARD"}),
112111
bufcheckserverbuild.LintPackageDefinedRuleSpecBuilder.Build(true, []string{"MINIMAL", "BASIC", "DEFAULT", "STANDARD", "SENSIBLE"}),
@@ -129,6 +128,7 @@ var (
129128
bufcheckserverbuild.LintRPCResponseStandardNameRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD", "STYLE_DEFAULT", "STYLE_STANDARD"}),
130129
bufcheckserverbuild.LintServicePascalCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD", "STYLE_BASIC", "STYLE_DEFAULT", "STYLE_STANDARD"}),
131130
bufcheckserverbuild.LintServiceSuffixRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD", "STYLE_DEFAULT", "STYLE_STANDARD"}),
131+
bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(false, []string{}),
132132
},
133133
Categories: []*check.CategorySpec{
134134
bufcheckserverbuild.FileCategorySpec,
@@ -238,7 +238,6 @@ var (
238238
bufcheckserverbuild.LintFieldLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
239239
bufcheckserverbuild.LintFileLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD"}),
240240
bufcheckserverbuild.LintImportNoPublicRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
241-
bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
242241
bufcheckserverbuild.LintImportUsedRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
243242
bufcheckserverbuild.LintMessagePascalCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
244243
bufcheckserverbuild.LintOneofLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
@@ -265,6 +264,7 @@ var (
265264
bufcheckserverbuild.LintServicePascalCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
266265
bufcheckserverbuild.LintServiceSuffixRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD"}),
267266
bufcheckserverbuild.LintSyntaxSpecifiedRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
267+
bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(false, []string{}),
268268
},
269269
Categories: []*check.CategorySpec{
270270
bufcheckserverbuild.FileCategorySpec,
@@ -367,7 +367,6 @@ var (
367367
bufcheckserverbuild.LintFieldNotRequiredRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
368368
bufcheckserverbuild.LintFileLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD"}),
369369
bufcheckserverbuild.LintImportNoPublicRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
370-
bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
371370
bufcheckserverbuild.LintImportUsedRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
372371
bufcheckserverbuild.LintMessagePascalCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
373372
bufcheckserverbuild.LintOneofLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
@@ -395,6 +394,7 @@ var (
395394
bufcheckserverbuild.LintServiceSuffixRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD"}),
396395
bufcheckserverbuild.LintStablePackageNoImportUnstableRuleSpecBuilder.Build(false, []string{}),
397396
bufcheckserverbuild.LintSyntaxSpecifiedRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
397+
bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(false, []string{}),
398398
},
399399
Categories: []*check.CategorySpec{
400400
bufcheckserverbuild.FileCategorySpec,

‎private/bufpkg/bufcheck/bufcheckserver/internal/bufcheckserverbuild/bufcheckserverbuild.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -689,10 +689,15 @@ var (
689689
}
690690
// LintImportNoWeakRuleSpecBuilder is a rule spec builder.
691691
LintImportNoWeakRuleSpecBuilder = &bufcheckserverutil.RuleSpecBuilder{
692-
ID: "IMPORT_NO_WEAK",
693-
Purpose: "Checks that imports are not weak.",
694-
Type: check.RuleTypeLint,
695-
Handler: bufcheckserverhandle.HandleLintImportNoWeak,
692+
ID: "IMPORT_NO_WEAK",
693+
Purpose: "Checks that imports are not weak.",
694+
Deprecated: true,
695+
Type: check.RuleTypeLint,
696+
Handler: check.RuleHandlerFunc(
697+
func(context.Context, check.ResponseWriter, check.Request) error {
698+
return nil
699+
},
700+
),
696701
}
697702
// LintImportUsedRuleSpecBuilder is a rule spec builder.
698703
LintImportUsedRuleSpecBuilder = &bufcheckserverutil.RuleSpecBuilder{

‎private/bufpkg/bufcheck/bufcheckserver/internal/bufcheckserverhandle/lint.go‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -460,25 +460,6 @@ func handleLintImportNoPublic(
460460
return nil
461461
}
462462

463-
// HandleLintImportNoWeak is a handle function.
464-
var HandleLintImportNoWeak = bufcheckserverutil.NewLintFileImportRuleHandler(handleLintImportNoWeak)
465-
466-
func handleLintImportNoWeak(
467-
responseWriter bufcheckserverutil.ResponseWriter,
468-
_ bufcheckserverutil.Request,
469-
fileImport bufprotosource.FileImport,
470-
) error {
471-
if fileImport.IsWeak() {
472-
responseWriter.AddProtosourceAnnotation(
473-
fileImport.Location(),
474-
nil,
475-
`Import %q must not be weak.`,
476-
fileImport.Import(),
477-
)
478-
}
479-
return nil
480-
}
481-
482463
// HandleLintImportUsed is a handle function.
483464
var HandleLintImportUsed = bufcheckserverutil.NewLintFileImportRuleHandler(handleLintImportUsed)
484465

‎private/bufpkg/bufcheck/lint_test.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,6 @@ func TestRunImportNoPublic(t *testing.T) {
172172
)
173173
}
174174

175-
func TestRunImportNoWeak(t *testing.T) {
176-
t.Parallel()
177-
testLint(
178-
t,
179-
"import_no_weak",
180-
bufanalysistesting.NewFileAnnotation(t, "a.proto", 6, 1, 6, 30, "IMPORT_NO_WEAK"),
181-
bufanalysistesting.NewFileAnnotation(t, "a.proto", 7, 1, 7, 29, "IMPORT_NO_WEAK"),
182-
bufanalysistesting.NewFileAnnotation(t, "one/one.proto", 6, 1, 6, 30, "IMPORT_NO_WEAK"),
183-
)
184-
}
185-
186175
func TestRunImportUsed(t *testing.T) {
187176
t.Parallel()
188177
testLint(

‎private/bufpkg/bufcheck/testdata/lint/import_no_weak/a.proto‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)