From 8b3705ec1bd9a28a9f8b9d6c52f2c532e229277c Mon Sep 17 00:00:00 2001
From: Khosrow Afroozeh <parshua@gmail.com>
Date: Thu, 16 Nov 2023 17:49:35 +0100
Subject: [PATCH] Rename grpc proto definition files due to compiler
 limitations. Resolves #414

---
 proto/auth/{auth.proto => aerospike_proxy_auth.proto}     | 2 +-
 .../{auth_grpc.pb.go => aerospike_proxy_auth_grpc.pb.go}  | 2 +-
 proto/kvs/{kv.proto => aerospike_proxy_kv.proto}          | 2 +-
 .../kvs/{kv_grpc.pb.go => aerospike_proxy_kv_grpc.pb.go}  | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename proto/auth/{auth.proto => aerospike_proxy_auth.proto} (85%)
 rename proto/auth/{auth_grpc.pb.go => aerospike_proxy_auth_grpc.pb.go} (98%)
 rename proto/kvs/{kv.proto => aerospike_proxy_kv.proto} (99%)
 rename proto/kvs/{kv_grpc.pb.go => aerospike_proxy_kv_grpc.pb.go} (99%)

diff --git a/proto/auth/auth.proto b/proto/auth/aerospike_proxy_auth.proto
similarity index 85%
rename from proto/auth/auth.proto
rename to proto/auth/aerospike_proxy_auth.proto
index b46c649f..0eb80920 100644
--- a/proto/auth/auth.proto
+++ b/proto/auth/aerospike_proxy_auth.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = ".;auth";
+option go_package = "github.com/aerospike/aerospike-client-go/v6/proto/auth;auth";
 option java_package = "com.aerospike.proxy.client";
 
 // Proxy auth service
diff --git a/proto/auth/auth_grpc.pb.go b/proto/auth/aerospike_proxy_auth_grpc.pb.go
similarity index 98%
rename from proto/auth/auth_grpc.pb.go
rename to proto/auth/aerospike_proxy_auth_grpc.pb.go
index 05fc395d..024047de 100644
--- a/proto/auth/auth_grpc.pb.go
+++ b/proto/auth/aerospike_proxy_auth_grpc.pb.go
@@ -97,5 +97,5 @@ var AuthService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "auth.proto",
+	Metadata: "proto/auth/aerospike_proxy_auth.proto",
 }
diff --git a/proto/kvs/kv.proto b/proto/kvs/aerospike_proxy_kv.proto
similarity index 99%
rename from proto/kvs/kv.proto
rename to proto/kvs/aerospike_proxy_kv.proto
index 0867eecf..fd9768de 100644
--- a/proto/kvs/kv.proto
+++ b/proto/kvs/aerospike_proxy_kv.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = ".;kvs";
+option go_package = "github.com/aerospike/aerospike-client-go/v6/proto/kvs;kvs";
 option java_package = "com.aerospike.proxy.client";
 
 // The about request message.
diff --git a/proto/kvs/kv_grpc.pb.go b/proto/kvs/aerospike_proxy_kv_grpc.pb.go
similarity index 99%
rename from proto/kvs/kv_grpc.pb.go
rename to proto/kvs/aerospike_proxy_kv_grpc.pb.go
index 57b9474b..c4f07ff0 100644
--- a/proto/kvs/kv_grpc.pb.go
+++ b/proto/kvs/aerospike_proxy_kv_grpc.pb.go
@@ -97,7 +97,7 @@ var About_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "kv.proto",
+	Metadata: "proto/kvs/aerospike_proxy_kv.proto",
 }
 
 // KVSClient is the client API for KVS service.
@@ -1147,7 +1147,7 @@ var KVS_ServiceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "kv.proto",
+	Metadata: "proto/kvs/aerospike_proxy_kv.proto",
 }
 
 // ScanClient is the client API for Scan service.
@@ -1332,7 +1332,7 @@ var Scan_ServiceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "kv.proto",
+	Metadata: "proto/kvs/aerospike_proxy_kv.proto",
 }
 
 // QueryClient is the client API for Query service.
@@ -1787,5 +1787,5 @@ var Query_ServiceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "kv.proto",
+	Metadata: "proto/kvs/aerospike_proxy_kv.proto",
 }