change the request type from string to bytes in the proto file

Signed-off-by: Shinya Hayashi <[email protected]>
cybozu-go · Oct 28, 2024 · 780cd60 · 780cd60
1 parent f78824d
commit 780cd60
Show file tree

Hide file tree

Showing 7 changed files with 131 additions and 45 deletions.
diff --git a/docs/controller-protocol.md b/docs/controller-protocol.md
@@ -32,7 +32,7 @@ CreateOrUpdateMantleBackupRequest is a request message for CreateOrUpdateMantleB
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| mantleBackup | [string](#string) |  |  |
+| mantleBackup | [bytes](#bytes) |  |  |
 
 
 
@@ -59,7 +59,7 @@ CreateOrUpdatePVCRequest is a request message for CreateOrUpdatePVC RPC.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| pvc | [string](#string) |  |  |
+| pvc | [bytes](#bytes) |  |  |
 
 
 

diff --git a/internal/controller/mantlebackup_controller.go b/internal/controller/mantlebackup_controller.go
@@ -523,7 +523,7 @@ func (r *MantleBackupReconciler) replicateManifests(
 	resp, err := client.CreateOrUpdatePVC(
 		ctx,
 		&proto.CreateOrUpdatePVCRequest{
-			Pvc: string(pvcSentJson),
+			Pvc: pvcSentJson,
 		},
 	)
 	if err != nil {
@@ -553,7 +553,7 @@ func (r *MantleBackupReconciler) replicateManifests(
 	if _, err := client.CreateOrUpdateMantleBackup(
 		ctx,
 		&proto.CreateOrUpdateMantleBackupRequest{
-			MantleBackup: string(backupSentJson),
+			MantleBackup: backupSentJson,
 		},
 	); err != nil {
 		return ctrl.Result{}, err

diff --git a/internal/controller/mantlebackup_controller_test.go b/internal/controller/mantlebackup_controller_test.go
@@ -368,7 +368,7 @@ var _ = Describe("MantleBackup controller", func() {
 						req *proto.CreateOrUpdateMantleBackupRequest,
 						opts ...grpc.CallOption,
 					) (*proto.CreateOrUpdateMantleBackupResponse, error) {
-						err := json.Unmarshal([]byte(req.GetMantleBackup()), &targetBackup)
+						err := json.Unmarshal(req.GetMantleBackup(), &targetBackup)
 						if err != nil {
 							panic(err)
 						}

diff --git a/internal/controller/replication.go b/internal/controller/replication.go
@@ -45,7 +45,7 @@ func (s *SecondaryServer) CreateOrUpdatePVC(
 ) (*proto.CreateOrUpdatePVCResponse, error) {
 	// Unmarshal the request
 	var pvcReceived corev1.PersistentVolumeClaim
-	if err := json.Unmarshal([]byte(req.Pvc), &pvcReceived); err != nil {
+	if err := json.Unmarshal(req.Pvc, &pvcReceived); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal the requested PVC: %w", err)
 	}
 
@@ -104,7 +104,7 @@ func (s *SecondaryServer) CreateOrUpdateMantleBackup(
 	req *proto.CreateOrUpdateMantleBackupRequest,
 ) (*proto.CreateOrUpdateMantleBackupResponse, error) {
 	var backupReceived mantlev1.MantleBackup
-	if err := json.Unmarshal([]byte(req.MantleBackup), &backupReceived); err != nil {
+	if err := json.Unmarshal(req.MantleBackup, &backupReceived); err != nil {
 		return nil, err
 	}
 

diff --git a/pkg/controller/proto/controller.pb.go b/pkg/controller/proto/controller.pb.go
diff --git a/pkg/controller/proto/controller.proto b/pkg/controller/proto/controller.proto
@@ -6,7 +6,7 @@ option go_package = "github.com/cybozu-go/mantle/pkg/controller/proto";
 
 // CreateOrUpdatePVCRequest is a request message for CreateOrUpdatePVC RPC.
 message CreateOrUpdatePVCRequest {
-    string pvc = 1;
+    bytes pvc = 1;
 }
 
 // CreateOrUpdatePVCResponse is a response message for CreateOrUpdatePVC RPC.
@@ -16,7 +16,7 @@ message CreateOrUpdatePVCResponse {
 
 // CreateOrUpdateMantleBackupRequest is a request message for CreateOrUpdateMantleBackup RPC.
 message CreateOrUpdateMantleBackupRequest {
-    string mantleBackup = 1;
+    bytes mantleBackup = 1;
 }
 
 // CreateOrUpdateMantleBackupResponse is a response message for CreateOrUpdateMantleBackup RPC.

diff --git a/pkg/controller/proto/controller_grpc.pb.go b/pkg/controller/proto/controller_grpc.pb.go