Skip to content

*: fix regenerate.sh #7139

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Apr 18, 2024
Merged

*: fix regenerate.sh #7139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebab67c
*: fix regenerate.sh
arvindbr8 Apr 17, 2024
3b6aff6
add a log statement in sockopt_nonlinux to get rid of vet issue in macos
arvindbr8 Apr 17, 2024
63aa8ea
fix everything
arvindbr8 Apr 17, 2024
2611957
add trap back to regenerate
arvindbr8 Apr 17, 2024
a800400
revert source change in vet.sh
arvindbr8 Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions channelz/internal/protoconv/sockopt_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@ import (
"time"

channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/internal/channelz"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/durationpb"
)

var logger = grpclog.Component("channelz")

func convertToPbDuration(sec int64, usec int64) *durationpb.Duration {
return durationpb.New(time.Duration(sec*1e9 + usec*1e3))
}
Expand Down
2 changes: 1 addition & 1 deletion channelz/internal/protoconv/sockopt_nonlinux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@dfawley dfawley Apr 18, 2024

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 {

return nil
}
6 changes: 0 additions & 6 deletions channelz/internal/protoconv/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
// implementation and the protobuf representation of all the entities.
package protoconv

import (
"google.golang.org/grpc/grpclog"
)

var logger = grpclog.Component("channelz")

func strFromPointer(s *string) string {
if s == nil {
return ""
Expand Down
2 changes: 1 addition & 1 deletion reflection/test/grpc_testing_not_regenerate/dynamic.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

syntax = "proto3";

option go_package = "google.golang.org/grpc/reflection/grpc_testing_not_regenerate";
option go_package = "google.golang.org/grpc/reflection/test/grpc_testing_not_regenerate";

package grpc.testing;

Expand Down
2 changes: 1 addition & 1 deletion reflection/test/grpc_testing_not_regenerate/testv3.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

syntax = "proto3";

option go_package = "google.golang.org/grpc/reflection/grpc_testing_not_regenerate";
option go_package = "google.golang.org/grpc/reflection/test/grpc_testing_not_regenerate";

package grpc.testingv3;

Expand Down
2 changes: 1 addition & 1 deletion regenerate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,6 @@ mv ${WORKDIR}/out/google.golang.org/grpc/lookup/grpc_lookup_v1/* ${WORKDIR}/out/

# grpc_testing_not_regenerate/*.pb.go are not re-generated,
# see grpc_testing_not_regenerate/README.md for details.
rm ${WORKDIR}/out/google.golang.org/grpc/reflection/grpc_testing_not_regenerate/*.pb.go
rm ${WORKDIR}/out/google.golang.org/grpc/reflection/test/grpc_testing_not_regenerate/*.pb.go

cp -R ${WORKDIR}/out/google.golang.org/grpc/* .