Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: fix regenerate.sh #7139

Merged
merged 5 commits into from
Apr 18, 2024
Merged

*: fix regenerate.sh #7139

merged 5 commits into from
Apr 18, 2024

Conversation

arvindbr8
Copy link
Member

@arvindbr8 arvindbr8 commented Apr 17, 2024

vet.sh was failing in macOS. The logger defined in channelz/internal/protoconv package was not used when build on non_linux machines, which caused staticcheck to output this:

channelz/internal/protoconv/util.go:27:5: var logger is unused (U1000)

also fixes the go_package for grpc_testing_not_regenerate proto

RELEASE NOTES: none

@arvindbr8 arvindbr8 added the Type: Meta Github repo, process, etc label Apr 17, 2024
@arvindbr8 arvindbr8 added this to the 1.64 Release milestone Apr 17, 2024
@arvindbr8 arvindbr8 requested a review from dfawley April 17, 2024 20:07
@arvindbr8 arvindbr8 marked this pull request as draft April 17, 2024 20:10
scripts/vet.sh Outdated
@@ -119,7 +119,6 @@ grep "(SA1019)" "${SC_OUT}" | not grep -Fv 'XXXXX PleaseIgnoreUnused
XXXXX Protobuf related deprecation errors:
"github.com/golang/protobuf
.pb.go:
grpc_testing_not_regenerate
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Staticcheck is staying within the module?

Ugh, should we be running it for every go.mod then?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right. Let's track this here #7141

@arvindbr8 arvindbr8 marked this pull request as ready for review April 17, 2024 20:57
@arvindbr8 arvindbr8 requested a review from dfawley April 17, 2024 20:57
@@ -26,6 +26,6 @@ import (
"google.golang.org/grpc/internal/channelz"
)

func sockoptToProto(skopts *channelz.SocketOptionData) []*channelzpb.SocketOption {
func sockoptToProto(_ *channelz.SocketOptionData) []*channelzpb.SocketOption {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to change this here but there is even an even more simplified version:

func sockoptToProto(*channelz.SocketOptionData) []*channelzpb.SocketOption {

@dfawley dfawley assigned arvindbr8 and unassigned dfawley Apr 18, 2024
@arvindbr8 arvindbr8 merged commit 9cf408e into grpc:master Apr 18, 2024
12 checks passed
@arvindbr8 arvindbr8 deleted the fix_regenerate branch May 30, 2024 00:24
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Type: Meta Github repo, process, etc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants