package naming housekeeping (#463)

openziti · Aug 23, 2024 · 23796be · 23796be
1 parent 896125d
commit 23796be
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 370 deletions.
diff --git a/agent/agent.go b/agent/agent.go
@@ -1,7 +1,7 @@
 package agent
 
 import (
-	agentGrpc "github.com/openziti/zrok/agent/grpc"
+	"github.com/openziti/zrok/agent/agentGrpc"
 	"github.com/openziti/zrok/environment/env_core"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

diff --git a/agent/grpc/agent.pb.go → agent/agentGrpc/agent.pb.go b/agent/grpc/agent.pb.go → agent/agentGrpc/agent.pb.go
diff --git a/agent/grpc/agent.proto → agent/agentGrpc/agent.proto b/agent/grpc/agent.proto → agent/agentGrpc/agent.proto
@@ -1,4 +1,4 @@
-option go_package = "github.com/openziti/zrok/agent/grpc";
+option go_package = "github.com/openziti/zrok/agent/agentGrpc";
 
 service Agent {
 	rpc Version(VersionRequest) returns (VersionReply) {}

diff --git a/agent/grpc/agent_grpc.pb.go → agent/agentGrpc/agent_grpc.pb.go b/agent/grpc/agent_grpc.pb.go → agent/agentGrpc/agent_grpc.pb.go
diff --git a/agent/grpc.go b/agent/grpc.go
@@ -2,16 +2,15 @@ package agent
 
 import (
 	"context"
-	"github.com/openziti/zrok/agent/grpc"
+	"github.com/openziti/zrok/agent/agentGrpc"
 	"github.com/openziti/zrok/build"
-	_ "google.golang.org/grpc"
 )
 
 type agentGrpcImpl struct {
-	grpc.UnimplementedAgentServer
+	agentGrpc.UnimplementedAgentServer
 }
 
-func (s *agentGrpcImpl) Version(ctx context.Context, req *grpc.VersionRequest) (*grpc.VersionReply, error) {
+func (s *agentGrpcImpl) Version(ctx context.Context, req *agentGrpc.VersionRequest) (*agentGrpc.VersionReply, error) {
 	v := build.String()
-	return &grpc.VersionReply{V: &v}, nil
+	return &agentGrpc.VersionReply{V: &v}, nil
 }