Skip to content

Apply lint fixes before import. #317

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
jnthntatum merged 1 commit into from
Oct 5, 2023
Merged

Apply lint fixes before import. #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions tools/celrpc/celrpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"google.golang.org/grpc/reflection"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/emptypb"

confpb "google.golang.org/genproto/googleapis/api/expr/conformance/v1alpha1"
epb "google.golang.org/protobuf/types/known/emptypb"
)

// ConfClient manages calls to conformance test services.
Expand All @@ -46,7 +46,7 @@ type grpcConfClient struct {
// - one output line is expected, repeat again.
type pipeConfClient struct {
binary string
cmd_args []string
cmdArgs []string
cmd *exec.Cmd
stdOut *bufio.Reader
stdIn io.Writer
Expand Down Expand Up @@ -139,7 +139,7 @@ func NewPipeClient(serverCmd string, base64Encode bool, pingsEnabled bool) (Conf
return &c, fmt.Errorf("server cmd '%s' invalid", serverCmd)
}
c.binary = fields[0]
c.cmd_args = fields[1:]
c.cmdArgs = fields[1:]

return &c, c.reset()
}
Expand All @@ -149,7 +149,7 @@ func (c *pipeConfClient) reset() error {
if c.binary == "" {
return errors.New("reset on invalid pipe service configuration")
}
cmd := exec.Command(c.binary, c.cmd_args...)
cmd := exec.Command(c.binary, c.cmdArgs...)
out, err := cmd.StdoutPipe()
if err != nil {
return err
Expand All @@ -171,7 +171,7 @@ func (c *pipeConfClient) reset() error {
}

func (c *pipeConfClient) isAlive() bool {
m := emptypb.Empty{}
m := epb.Empty{}
err := c.pipeCommand("ping", &m, &m)
return err == nil
}
Expand Down
6 changes: 3 additions & 3 deletions tools/celrpc/testpipeimpl/main/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/emptypb"

confpb "google.golang.org/genproto/googleapis/api/expr/conformance/v1alpha1"
exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
statuspb "google.golang.org/genproto/googleapis/rpc/status"
epb "google.golang.org/protobuf/types/known/emptypb"
)

type codec struct {
Expand Down Expand Up @@ -188,12 +188,12 @@ func processLoop() int {
return 1
}
case "ping":
req := emptypb.Empty{}
req := epb.Empty{}
if err := c.unmarshal(msg, &req); err != nil {
fmt.Fprintf(os.Stderr, "bad ping req: %v\n", err)
return 1
}
resp := emptypb.Empty{}
resp := epb.Empty{}
if err = c.serialize(writer, &resp); err != nil {
fmt.Fprintf(os.Stderr, "error serializing ping resp %v\n", err)
return 1
Expand Down