Skip to content

Commit 2669bc1

Browse files
sbezverkjdef
authored andcommitted
Modification of names used for credentials
1 parent 716f53e commit 2669bc1

File tree

3 files changed

+211
-205
lines changed

3 files changed

+211
-205
lines changed

csi.proto

+22-22
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,18 @@ message CreateVolumeRequest {
140140
// validating these parameters. COs will treat these as opaque.
141141
map<string, string> parameters = 5;
142142

143-
// End user credentials used to authenticate/authorize volume creation
144-
// request.
143+
// Credentials used by Controller plugin to authenticate/authorize
144+
// volume creation request.
145145
// This field contains credential data, for example username and
146146
// password. Each key must consist of alphanumeric characters, '-',
147147
// '_' or '.'. Each value MUST contain a valid string. An SP MAY
148148
// choose to accept binary (non-string) data by using a binary-to-text
149149
// encoding scheme, like base64. An SP SHALL advertise the
150150
// requirements for credentials in documentation. COs SHALL permit
151-
// users to pass through the required credentials. This information is
151+
// passing through the required credentials. This information is
152152
// sensitive and MUST be treated as such (not logged, etc.) by the CO.
153153
// This field is OPTIONAL.
154-
map<string, string> user_credentials = 6;
154+
map<string, string> controller_create_credentials = 6;
155155
}
156156

157157
message CreateVolumeResponse {
@@ -267,18 +267,18 @@ message DeleteVolumeRequest {
267267
// This field is REQUIRED.
268268
string volume_id = 2;
269269

270-
// End user credentials used to authenticate/authorize volume deletion
271-
// request.
270+
// Credentials used by Controller plugin to authenticate/authorize
271+
// volume deletion request.
272272
// This field contains credential data, for example username and
273273
// password. Each key must consist of alphanumeric characters, '-',
274274
// '_' or '.'. Each value MUST contain a valid string. An SP MAY
275275
// choose to accept binary (non-string) data by using a binary-to-text
276276
// encoding scheme, like base64. An SP SHALL advertise the
277277
// requirements for credentials in documentation. COs SHALL permit
278-
// users to pass through the required credentials. This information is
278+
// passing through the required credentials. This information is
279279
// sensitive and MUST be treated as such (not logged, etc.) by the CO.
280280
// This field is OPTIONAL.
281-
map<string, string> user_credentials = 3;
281+
map<string, string> controller_delete_credentials = 3;
282282
}
283283

284284
message DeleteVolumeResponse {}
@@ -304,18 +304,18 @@ message ControllerPublishVolumeRequest {
304304
// REQUIRED.
305305
bool readonly = 5;
306306

307-
// End user credentials used to authenticate/authorize controller
308-
// publish request.
307+
// Credentials used by Controller plugin to authenticate/authorize
308+
// controller publish request.
309309
// This field contains credential data, for example username and
310310
// password. Each key must consist of alphanumeric characters, '-',
311311
// '_' or '.'. Each value MUST contain a valid string. An SP MAY
312312
// choose to accept binary (non-string) data by using a binary-to-text
313313
// encoding scheme, like base64. An SP SHALL advertise the
314314
// requirements for credentials in documentation. COs SHALL permit
315-
// users to pass through the required credentials. This information is
315+
// passing through the required credentials. This information is
316316
// sensitive and MUST be treated as such (not logged, etc.) by the CO.
317317
// This field is OPTIONAL.
318-
map<string, string> user_credentials = 6;
318+
map<string, string> controller_publish_credentials = 6;
319319

320320
// Attributes of the volume to be used on a node. This field is
321321
// OPTIONAL and MUST match the attributes of the VolumeInfo identified
@@ -345,18 +345,18 @@ message ControllerUnpublishVolumeRequest {
345345
// the volume from all nodes it is published to.
346346
string node_id = 3;
347347

348-
// End user credentials used to authenticate/authorize controller
349-
// unpublish request.
348+
// Credentials used by Controller plugin to authenticate/authorize
349+
// controller unpublish request.
350350
// This field contains credential data, for example username and
351351
// password. Each key must consist of alphanumeric characters, '-',
352352
// '_' or '.'. Each value MUST contain a valid string. An SP MAY
353353
// choose to accept binary (non-string) data by using a binary-to-text
354354
// encoding scheme, like base64. An SP SHALL advertise the
355355
// requirements for credentials in documentation. COs SHALL permit
356-
// users to pass through the required credentials. This information is
356+
// passing through the required credentials. This information is
357357
// sensitive and MUST be treated as such (not logged, etc.) by the CO.
358358
// This field is OPTIONAL.
359-
map<string, string> user_credentials = 4;
359+
map<string, string> controller_unpublish_credentials = 4;
360360
}
361361

362362
message ControllerUnpublishVolumeResponse {}
@@ -526,18 +526,18 @@ message NodePublishVolumeRequest {
526526
// REQUIRED.
527527
bool readonly = 6;
528528

529-
// End user credentials used to authenticate/authorize node
529+
// Credentials used by Node plugin to authenticate/authorize node
530530
// publish request.
531531
// This field contains credential data, for example username and
532532
// password. Each key must consist of alphanumeric characters, '-',
533533
// '_' or '.'. Each value MUST contain a valid string. An SP MAY
534534
// choose to accept binary (non-string) data by using a binary-to-text
535535
// encoding scheme, like base64. An SP SHALL advertise the
536536
// requirements for credentials in documentation. COs SHALL permit
537-
// users to pass through the required credentials. This information is
537+
// passing through the required credentials. This information is
538538
// sensitive and MUST be treated as such (not logged, etc.) by the CO.
539539
// This field is OPTIONAL.
540-
map<string, string> user_credentials = 7;
540+
map<string, string> node_publish_credentials = 7;
541541

542542
// Attributes of the volume to publish. This field is OPTIONAL and
543543
// MUST match the attributes of the VolumeInfo identified by
@@ -560,18 +560,18 @@ message NodeUnpublishVolumeRequest {
560560
// This is a REQUIRED field.
561561
string target_path = 3;
562562

563-
// End user credentials used to authenticate/authorize node
563+
// Credentials used by Node plugin to authenticate/authorize node
564564
// unpublish request.
565565
// This field contains credential data, for example username and
566566
// password. Each key must consist of alphanumeric characters, '-',
567567
// '_' or '.'. Each value MUST contain a valid string. An SP MAY
568568
// choose to accept binary (non-string) data by using a binary-to-text
569569
// encoding scheme, like base64. An SP SHALL advertise the
570570
// requirements for credentials in documentation. COs SHALL permit
571-
// users to pass through the required credentials. This information is
571+
// passing through the required credentials. This information is
572572
// sensitive and MUST be treated as such (not logged, etc.) by the CO.
573573
// This field is OPTIONAL.
574-
map<string, string> user_credentials = 4;
574+
map<string, string> node_unpublish_credentials = 4;
575575
}
576576

577577
message NodeUnpublishVolumeResponse {}

0 commit comments

Comments
 (0)