package naming housekeeping (#463)

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"

agent/agentGrpc/agent.pb.go

@@ -2,9 +2,9 @@
 // versions:
 // 	protoc-gen-go v1.34.2
 // 	protoc        v5.27.3
-// source: agent.proto
+// source: agent/agentGrpc/agent.proto
 
-package grpc
+package agentGrpc
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -29,7 +29,7 @@ type VersionRequest struct {
 func (x *VersionRequest) Reset() {
 	*x = VersionRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_proto_msgTypes[0]
+		mi := &file_agent_agentGrpc_agent_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -42,7 +42,7 @@ func (x *VersionRequest) String() string {
 func (*VersionRequest) ProtoMessage() {}
 
 func (x *VersionRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_proto_msgTypes[0]
+	mi := &file_agent_agentGrpc_agent_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -55,7 +55,7 @@ func (x *VersionRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VersionRequest.ProtoReflect.Descriptor instead.
 func (*VersionRequest) Descriptor() ([]byte, []int) {
-	return file_agent_proto_rawDescGZIP(), []int{0}
+	return file_agent_agentGrpc_agent_proto_rawDescGZIP(), []int{0}
 }
 
 type VersionReply struct {
@@ -69,7 +69,7 @@ type VersionReply struct {
 func (x *VersionReply) Reset() {
 	*x = VersionReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_proto_msgTypes[1]
+		mi := &file_agent_agentGrpc_agent_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -82,7 +82,7 @@ func (x *VersionReply) String() string {
 func (*VersionReply) ProtoMessage() {}
 
 func (x *VersionReply) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_proto_msgTypes[1]
+	mi := &file_agent_agentGrpc_agent_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -95,7 +95,7 @@ func (x *VersionReply) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VersionReply.ProtoReflect.Descriptor instead.
 func (*VersionReply) Descriptor() ([]byte, []int) {
-	return file_agent_proto_rawDescGZIP(), []int{1}
+	return file_agent_agentGrpc_agent_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *VersionReply) GetV() string {
@@ -105,39 +105,40 @@ func (x *VersionReply) GetV() string {
 	return ""
 }
 
-var File_agent_proto protoreflect.FileDescriptor
+var File_agent_agentGrpc_agent_proto protoreflect.FileDescriptor
 
-var file_agent_proto_rawDesc = []byte{
+var file_agent_agentGrpc_agent_proto_rawDesc = []byte{
-	0x0a, 0x0b, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x10, 0x0a,
+	0x0a, 0x1b, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x70,
+	0x63, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x10, 0x0a,
 	0x0e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22,
 	0x1c, 0x0a, 0x0c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
 	0x0c, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x01, 0x76, 0x32, 0x34, 0x0a,
 	0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x2b, 0x0a, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
 	0x6e, 0x12, 0x0f, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x1a, 0x0d, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c,
-	0x79, 0x22, 0x00, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x79, 0x22, 0x00, 0x42, 0x2a, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
 	0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x7a, 0x69, 0x74, 0x69, 0x2f, 0x7a, 0x72, 0x6f, 0x6b, 0x2f,
-	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x70, 0x63,
 }
 
 var (
-	file_agent_proto_rawDescOnce sync.Once
+	file_agent_agentGrpc_agent_proto_rawDescOnce sync.Once
-	file_agent_proto_rawDescData = file_agent_proto_rawDesc
+	file_agent_agentGrpc_agent_proto_rawDescData = file_agent_agentGrpc_agent_proto_rawDesc
 )
 
-func file_agent_proto_rawDescGZIP() []byte {
+func file_agent_agentGrpc_agent_proto_rawDescGZIP() []byte {
-	file_agent_proto_rawDescOnce.Do(func() {
+	file_agent_agentGrpc_agent_proto_rawDescOnce.Do(func() {
-		file_agent_proto_rawDescData = protoimpl.X.CompressGZIP(file_agent_proto_rawDescData)
+		file_agent_agentGrpc_agent_proto_rawDescData = protoimpl.X.CompressGZIP(file_agent_agentGrpc_agent_proto_rawDescData)
 	})
-	return file_agent_proto_rawDescData
+	return file_agent_agentGrpc_agent_proto_rawDescData
 }
 
-var file_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_agent_agentGrpc_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_agent_proto_goTypes = []any{
+var file_agent_agentGrpc_agent_proto_goTypes = []any{
 	(*VersionRequest)(nil), // 0: VersionRequest
 	(*VersionReply)(nil),   // 1: VersionReply
 }
-var file_agent_proto_depIdxs = []int32{
+var file_agent_agentGrpc_agent_proto_depIdxs = []int32{
 	0, // 0: Agent.Version:input_type -> VersionRequest
 	1, // 1: Agent.Version:output_type -> VersionReply
 	1, // [1:2] is the sub-list for method output_type
@@ -147,13 +148,13 @@ var file_agent_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for field type_name
 }
 
-func init() { file_agent_proto_init() }
+func init() { file_agent_agentGrpc_agent_proto_init() }
-func file_agent_proto_init() {
+func file_agent_agentGrpc_agent_proto_init() {
-	if File_agent_proto != nil {
+	if File_agent_agentGrpc_agent_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_agent_proto_msgTypes[0].Exporter = func(v any, i int) any {
+		file_agent_agentGrpc_agent_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*VersionRequest); i {
 			case 0:
 				return &v.state
@@ -165,7 +166,7 @@ func file_agent_proto_init() {
 				return nil
 			}
 		}
-		file_agent_proto_msgTypes[1].Exporter = func(v any, i int) any {
+		file_agent_agentGrpc_agent_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*VersionReply); i {
 			case 0:
 				return &v.state
@@ -182,18 +183,18 @@ func file_agent_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_agent_proto_rawDesc,
+			RawDescriptor: file_agent_agentGrpc_agent_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_agent_proto_goTypes,
+		GoTypes:           file_agent_agentGrpc_agent_proto_goTypes,
-		DependencyIndexes: file_agent_proto_depIdxs,
+		DependencyIndexes: file_agent_agentGrpc_agent_proto_depIdxs,
-		MessageInfos:      file_agent_proto_msgTypes,
+		MessageInfos:      file_agent_agentGrpc_agent_proto_msgTypes,
 	}.Build()
-	File_agent_proto = out.File
+	File_agent_agentGrpc_agent_proto = out.File
-	file_agent_proto_rawDesc = nil
+	file_agent_agentGrpc_agent_proto_rawDesc = nil
-	file_agent_proto_goTypes = nil
+	file_agent_agentGrpc_agent_proto_goTypes = nil
-	file_agent_proto_depIdxs = nil
+	file_agent_agentGrpc_agent_proto_depIdxs = nil
 }

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) {}

agent/agentGrpc/agent_grpc.pb.go

@@ -2,9 +2,9 @@
 // versions:
 // - protoc-gen-go-grpc v1.5.1
 // - protoc             v5.27.3
-// source: agent.proto
+// source: agent/agentGrpc/agent.proto
 
-package grpc
+package agentGrpc
 
 import (
 	context "context"
@@ -117,5 +117,5 @@ var Agent_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "agent.proto",
+	Metadata: "agent/agentGrpc/agent.proto",
 }

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
 }

agent/grpc/agent/grpc/agent.pb.go

@@ -1,200 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.34.2
-// 	protoc        v5.27.3
-// source: agent/grpc/agent.proto
-
-package grpc
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type VersionRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *VersionRequest) Reset() {
-	*x = VersionRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_grpc_agent_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *VersionRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*VersionRequest) ProtoMessage() {}
-
-func (x *VersionRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_grpc_agent_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use VersionRequest.ProtoReflect.Descriptor instead.
-func (*VersionRequest) Descriptor() ([]byte, []int) {
-	return file_agent_grpc_agent_proto_rawDescGZIP(), []int{0}
-}
-
-type VersionReply struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	V *string `protobuf:"bytes,1,req,name=v" json:"v,omitempty"`
-}
-
-func (x *VersionReply) Reset() {
-	*x = VersionReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_grpc_agent_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *VersionReply) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*VersionReply) ProtoMessage() {}
-
-func (x *VersionReply) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_grpc_agent_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use VersionReply.ProtoReflect.Descriptor instead.
-func (*VersionReply) Descriptor() ([]byte, []int) {
-	return file_agent_grpc_agent_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *VersionReply) GetV() string {
-	if x != nil && x.V != nil {
-		return *x.V
-	}
-	return ""
-}
-
-var File_agent_grpc_agent_proto protoreflect.FileDescriptor
-
-var file_agent_grpc_agent_proto_rawDesc = []byte{
-	0x0a, 0x16, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x61, 0x67, 0x65,
-	0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x10, 0x0a, 0x0e, 0x56, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x1c, 0x0a, 0x0c, 0x56, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x0c, 0x0a, 0x01, 0x76, 0x18,
-	0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x01, 0x76, 0x32, 0x34, 0x0a, 0x05, 0x41, 0x67, 0x65, 0x6e,
-	0x74, 0x12, 0x2b, 0x0a, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0f, 0x2e, 0x56,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0d, 0x2e,
-	0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x25,
-	0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x65,
-	0x6e, 0x7a, 0x69, 0x74, 0x69, 0x2f, 0x7a, 0x72, 0x6f, 0x6b, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x2f, 0x67, 0x72, 0x70, 0x63,
-}
-
-var (
-	file_agent_grpc_agent_proto_rawDescOnce sync.Once
-	file_agent_grpc_agent_proto_rawDescData = file_agent_grpc_agent_proto_rawDesc
-)
-
-func file_agent_grpc_agent_proto_rawDescGZIP() []byte {
-	file_agent_grpc_agent_proto_rawDescOnce.Do(func() {
-		file_agent_grpc_agent_proto_rawDescData = protoimpl.X.CompressGZIP(file_agent_grpc_agent_proto_rawDescData)
-	})
-	return file_agent_grpc_agent_proto_rawDescData
-}
-
-var file_agent_grpc_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_agent_grpc_agent_proto_goTypes = []any{
-	(*VersionRequest)(nil), // 0: VersionRequest
-	(*VersionReply)(nil),   // 1: VersionReply
-}
-var file_agent_grpc_agent_proto_depIdxs = []int32{
-	0, // 0: Agent.Version:input_type -> VersionRequest
-	1, // 1: Agent.Version:output_type -> VersionReply
-	1, // [1:2] is the sub-list for method output_type
-	0, // [0:1] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_agent_grpc_agent_proto_init() }
-func file_agent_grpc_agent_proto_init() {
-	if File_agent_grpc_agent_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_agent_grpc_agent_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*VersionRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_grpc_agent_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*VersionReply); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_agent_grpc_agent_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_agent_grpc_agent_proto_goTypes,
-		DependencyIndexes: file_agent_grpc_agent_proto_depIdxs,
-		MessageInfos:      file_agent_grpc_agent_proto_msgTypes,
-	}.Build()
-	File_agent_grpc_agent_proto = out.File
-	file_agent_grpc_agent_proto_rawDesc = nil
-	file_agent_grpc_agent_proto_goTypes = nil
-	file_agent_grpc_agent_proto_depIdxs = nil
-}

agent/grpc/agent/grpc/agent_grpc.pb.go

@@ -1,121 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             v5.27.3
-// source: agent/grpc/agent.proto
-
-package grpc
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
-const _ = grpc.SupportPackageIsVersion9
-
-const (
-	Agent_Version_FullMethodName = "/Agent/Version"
-)
-
-// AgentClient is the client API for Agent service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type AgentClient interface {
-	Version(ctx context.Context, in *VersionRequest, opts ...grpc.CallOption) (*VersionReply, error)
-}
-
-type agentClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewAgentClient(cc grpc.ClientConnInterface) AgentClient {
-	return &agentClient{cc}
-}
-
-func (c *agentClient) Version(ctx context.Context, in *VersionRequest, opts ...grpc.CallOption) (*VersionReply, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(VersionReply)
-	err := c.cc.Invoke(ctx, Agent_Version_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// AgentServer is the server API for Agent service.
-// All implementations must embed UnimplementedAgentServer
-// for forward compatibility.
-type AgentServer interface {
-	Version(context.Context, *VersionRequest) (*VersionReply, error)
-	mustEmbedUnimplementedAgentServer()
-}
-
-// UnimplementedAgentServer must be embedded to have
-// forward compatible implementations.
-//
-// NOTE: this should be embedded by value instead of pointer to avoid a nil
-// pointer dereference when methods are called.
-type UnimplementedAgentServer struct{}
-
-func (UnimplementedAgentServer) Version(context.Context, *VersionRequest) (*VersionReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Version not implemented")
-}
-func (UnimplementedAgentServer) mustEmbedUnimplementedAgentServer() {}
-func (UnimplementedAgentServer) testEmbeddedByValue()               {}
-
-// UnsafeAgentServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to AgentServer will
-// result in compilation errors.
-type UnsafeAgentServer interface {
-	mustEmbedUnimplementedAgentServer()
-}
-
-func RegisterAgentServer(s grpc.ServiceRegistrar, srv AgentServer) {
-	// If the following call pancis, it indicates UnimplementedAgentServer was
-	// embedded by pointer and is nil.  This will cause panics if an
-	// unimplemented method is ever invoked, so we test this at initialization
-	// time to prevent it from happening at runtime later due to I/O.
-	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
-		t.testEmbeddedByValue()
-	}
-	s.RegisterService(&Agent_ServiceDesc, srv)
-}
-
-func _Agent_Version_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(VersionRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(AgentServer).Version(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: Agent_Version_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AgentServer).Version(ctx, req.(*VersionRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// Agent_ServiceDesc is the grpc.ServiceDesc for Agent service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var Agent_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "Agent",
-	HandlerType: (*AgentServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Version",
-			Handler:    _Agent_Version_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "agent/grpc/agent.proto",
-}

bin/generate_pb.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-protoc --go_out=agent/grpc \
+protoc --go_out=. \
 	--go_opt=paths=source_relative \
-	--go-grpc_out=agent/grpc \
+	--go-grpc_out=. \
 	--go-grpc_opt=paths=source_relative \
-	agent/grpc/agent.proto
+	agent/agentGrpc/agent.proto

cmd/zrok/agentVersion.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"context"
-	grpc2 "github.com/openziti/zrok/agent/grpc"
+	grpc2 "github.com/openziti/zrok/agent/agentGrpc"
 	"github.com/openziti/zrok/environment"
 	"github.com/openziti/zrok/tui"
 	"github.com/spf13/cobra"