Match multiple storage providers in registry

cs3org · Mar 17, 2021 · 708937c · 708937c
1 parent 2f8f5a0
commit 708937c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/cs3/gateway/v1beta1/resources.proto b/cs3/gateway/v1beta1/resources.proto
@@ -28,7 +28,6 @@ option java_package = "com.cs3.gateway.v1beta1";
 option objc_class_prefix = "CGX";
 option php_namespace = "Cs3\\Gateway\\V1Beta1";
 
-import "cs3/rpc/v1beta1/status.proto";
 import "cs3/storage/provider/v1beta1/resources.proto";
 import "cs3/types/v1beta1/types.proto";
 

diff --git a/cs3/ocm/invite/v1beta1/resources.proto b/cs3/ocm/invite/v1beta1/resources.proto
@@ -29,7 +29,6 @@ option objc_class_prefix = "COI";
 option php_namespace = "Cs3\\Ocm\\Invite\\V1Beta1";
 
 import "cs3/identity/user/v1beta1/resources.proto";
-import "cs3/storage/provider/v1beta1/resources.proto";
 import "cs3/types/v1beta1/types.proto";
 
 // InviteToken is used to invite users and groups from other sync'n'share

diff --git a/cs3/storage/registry/v1beta1/registry_api.proto b/cs3/storage/registry/v1beta1/registry_api.proto
@@ -99,7 +99,7 @@ message GetStorageProviderResponse {
   cs3.types.v1beta1.Opaque opaque = 2;
   // REQUIRED.
   // The storage provider handling the requested storage resource.
-  cs3.storage.registry.v1beta1.ProviderInfo provider = 3;
+  repeated cs3.storage.registry.v1beta1.ProviderInfo provider = 3;
 }
 
 message ListStorageProvidersRequest {

diff --git a/docs/index.html b/docs/index.html
@@ -14415,7 +14415,7 @@ <h3 id="cs3.storage.registry.v1beta1.GetStorageProviderResponse">GetStorageProvi
                 <tr>
                   <td>provider</td>
                   <td><a href="#cs3.storage.registry.v1beta1.ProviderInfo">ProviderInfo</a></td>
-                  <td></td>
+                  <td>repeated</td>
                   <td><p>REQUIRED.
 The storage provider handling the requested storage resource. </p></td>
                 </tr>

diff --git a/proto.lock b/proto.lock
@@ -1461,9 +1461,6 @@
           }
         ],
         "imports": [
-          {
-            "path": "cs3/rpc/v1beta1/status.proto"
-          },
           {
             "path": "cs3/storage/provider/v1beta1/resources.proto"
           },
@@ -2709,9 +2706,6 @@
           {
             "path": "cs3/identity/user/v1beta1/resources.proto"
           },
-          {
-            "path": "cs3/storage/provider/v1beta1/resources.proto"
-          },
           {
             "path": "cs3/types/v1beta1/types.proto"
           }
@@ -4344,6 +4338,11 @@
                 "id": 3,
                 "name": "share",
                 "type": "PublicShare"
+              },
+              {
+                "id": 4,
+                "name": "password_hash",
+                "type": "string"
               }
             ]
           },
@@ -4384,6 +4383,11 @@
                 "id": 3,
                 "name": "share",
                 "type": "PublicShare"
+              },
+              {
+                "id": 4,
+                "name": "password_hash",
+                "type": "string"
               }
             ]
           }
@@ -7089,6 +7093,11 @@
                 "id": 5,
                 "name": "mtime",
                 "type": "uint64"
+              },
+              {
+                "id": 6,
+                "name": "etag",
+                "type": "string"
               }
             ]
           },
@@ -7370,7 +7379,8 @@
               {
                 "id": 3,
                 "name": "provider",
-                "type": "cs3.storage.registry.v1beta1.ProviderInfo"
+                "type": "cs3.storage.registry.v1beta1.ProviderInfo",
+                "is_repeated": true
               }
             ]
           },