From 4600e5e0dacd57d9e353a6e56bdb83b88a8cc232 Mon Sep 17 00:00:00 2001
From: Michael Mandrus <michael.mandrus@grafana.com>
Date: Mon, 13 Jun 2022 12:39:23 -0400
Subject: [PATCH] refactor .proto file according to prior PR suggestions

---
 .../secretsmanagerplugin/secretsmanager.proto | 78 ++++++++++---------
 1 file changed, 43 insertions(+), 35 deletions(-)

diff --git a/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.proto b/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.proto
index 0ab75cdf9d7..6fc90534b50 100644
--- a/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.proto
+++ b/pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.proto
@@ -3,54 +3,62 @@ package secretsmanagerplugin;
 
 option go_package = "./;secretsmanagerplugin";
 
-message SecretsGetRequest {
-    Key keyDescriptor = 1;
-}
-
-message SecretsSetRequest {
-    Key keyDescriptor = 1;
-    string value = 2;
-}
-
-message SecretsDelRequest {
-    Key keyDescriptor = 1;
-}
-
-message SecretsKeysRequest {
-    Key keyDescriptor = 1;
-    bool allOrganizations = 2;
-}
-
-message SecretsRenameRequest {
-    Key keyDescriptor = 1;
-    string newNamespace = 2;
-}
-
 message Key {
     int64 orgId = 1;
     string namespace = 2;
     string type = 3;
 }
 
-message SecretsErrorResponse {
-    string error = 1;
+message GetSecretRequest {
+    Key keyDescriptor = 1;
 }
 
-message SecretsGetResponse {
-    string error = 1;
+message GetSecretResponse {
+    string userFriendlyError = 1;
     string decryptedValue = 2;
     bool exists = 3;  
 }
 
-message SecretsKeysResponse {
-    string error = 1;
+message SetSecretRequest {
+    Key keyDescriptor = 1;
+    string value = 2;
+}
+
+message SetSecretResponse {
+    string userFriendlyError = 1;
+}
+
+message DelSecretRequest {
+    Key keyDescriptor = 1;
+}
+
+message DelSecretResponse {
+    string userFriendlyError = 1;
+}
+
+message ListSecretsRequest {
+    Key keyDescriptor = 1;
+    bool allOrganizations = 2;
+}
+
+message ListSecretsResponse {
+    string userFriendlyError = 1;
     repeated Key keys = 2;
 }
 
-service RemoteSecretsManager {
-    rpc Get(SecretsGetRequest) returns (SecretsGetResponse);
-    rpc Set(SecretsSetRequest) returns (SecretsErrorResponse);
-    rpc Del(SecretsDelRequest) returns (SecretsErrorResponse);
-    rpc Keys(SecretsKeysRequest) returns (SecretsKeysResponse);
-    rpc Rename(SecretsRenameRequest) returns (SecretsErrorResponse);
+message RenameSecretRequest {
+    Key keyDescriptor = 1;
+    string newNamespace = 2;
+}
+
+message RenameSecretResponse {
+    string userFriendlyError = 1;
+}
+
+service SecretsManager {
+    rpc Get(GetSecretRequest) returns (GetSecretResponse);
+    rpc Set(SetSecretRequest) returns (SetSecretResponse);
+    rpc Del(DelSecretRequest) returns (DelSecretResponse);
+    rpc Keys(ListSecretsRequest) returns (ListSecretsResponse);
+    rpc Rename(RenameSecretRequest) returns (RenameSecretResponse);
 }
\ No newline at end of file