From f4418ed0ab327d50df4d7b1920d4eb8e502f1dcf Mon Sep 17 00:00:00 2001 From: saad-ali Date: Wed, 21 Feb 2018 19:15:12 -0800 Subject: [PATCH] Clarify wording and naming of credentials in CSI --- csi.proto | 199 ++++++++-------- lib/go/csi/csi.pb.go | 527 +++++++++++++++++++++---------------------- spec.md | 203 +++++++++-------- 3 files changed, 477 insertions(+), 452 deletions(-) diff --git a/csi.proto b/csi.proto index 61bfbc85..6b7c6c04 100644 --- a/csi.proto +++ b/csi.proto @@ -196,18 +196,24 @@ message CreateVolumeRequest { // validating these parameters. COs will treat these as opaque. map parameters = 5; - // Credentials used by Controller plugin to authenticate/authorize - // volume creation request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete volume creation request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map controller_create_credentials = 6; + map controller_create_secrets = 6; } message CreateVolumeResponse { @@ -326,18 +332,24 @@ message DeleteVolumeRequest { // This field is REQUIRED. string volume_id = 2; - // Credentials used by Controller plugin to authenticate/authorize - // volume deletion request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete volume deletion request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map controller_delete_credentials = 3; + map controller_delete_secrets = 3; } message DeleteVolumeResponse {} @@ -363,18 +375,25 @@ message ControllerPublishVolumeRequest { // REQUIRED. bool readonly = 5; - // Credentials used by Controller plugin to authenticate/authorize - // controller publish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete controller publish volume + // request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map controller_publish_credentials = 6; + map controller_publish_secrets = 6; // Attributes of the volume to be used on a node. This field is // OPTIONAL and MUST match the attributes of the Volume identified @@ -405,18 +424,27 @@ message ControllerUnpublishVolumeRequest { // the volume from all nodes it is published to. string node_id = 3; - // Credentials used by Controller plugin to authenticate/authorize - // controller unpublish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete controller unpublish volume + // request. This SHOULD be the same secrets passed to the + // ControllerPublishVolume. + // call for the specified volume. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map controller_unpublish_credentials = 4; + map controller_unpublish_secrets = 4; } message ControllerUnpublishVolumeResponse {} @@ -575,18 +603,24 @@ message NodeStageVolumeRequest { // This is a REQUIRED field. VolumeCapability volume_capability = 5; - // Credentials used by Node plugin to authenticate/authorize node - // stage request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete node stage volume request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map node_stage_credentials = 6; + map node_stage_secrets = 6; // Attributes of the volume to publish. This field is OPTIONAL and // MUST match the attributes of the VolumeInfo identified by @@ -608,19 +642,6 @@ message NodeUnstageVolumeRequest { // path in the root filesystem of the process serving this request. // This is a REQUIRED field. string staging_target_path = 3; - - // Credentials used by Node plugin to authenticate/authorize node - // unstage request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. - // This field is OPTIONAL. - map node_unstage_credentials = 4; } message NodeUnstageVolumeResponse {} @@ -664,19 +685,24 @@ message NodePublishVolumeRequest { // REQUIRED. bool readonly = 7; - // Credentials used by Node plugin to authenticate/authorize node - // publish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete node publish volume request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map node_publish_credentials = 8; - + map node_publish_secrets = 8; // Attributes of the volume to publish. This field is OPTIONAL and // MUST match the attributes of the Volume identified by @@ -698,19 +724,6 @@ message NodeUnpublishVolumeRequest { // path in the root filesystem of the process serving this request. // This is a REQUIRED field. string target_path = 3; - - // Credentials used by Node plugin to authenticate/authorize node - // unpublish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. - // This field is OPTIONAL. - map node_unpublish_credentials = 4; } message NodeUnpublishVolumeResponse {} diff --git a/lib/go/csi/csi.pb.go b/lib/go/csi/csi.pb.go index 99710211..faa85d1f 100644 --- a/lib/go/csi/csi.pb.go +++ b/lib/go/csi/csi.pb.go @@ -538,18 +538,24 @@ type CreateVolumeRequest struct { // This field is OPTIONAL. The Plugin is responsible for parsing and // validating these parameters. COs will treat these as opaque. Parameters map[string]string `protobuf:"bytes,5,rep,name=parameters" json:"parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - // Credentials used by Controller plugin to authenticate/authorize - // volume creation request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete volume creation request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - ControllerCreateCredentials map[string]string `protobuf:"bytes,6,rep,name=controller_create_credentials,json=controllerCreateCredentials" json:"controller_create_credentials,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + ControllerCreateSecrets map[string]string `protobuf:"bytes,6,rep,name=controller_create_secrets,json=controllerCreateSecrets" json:"controller_create_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *CreateVolumeRequest) Reset() { *m = CreateVolumeRequest{} } @@ -592,9 +598,9 @@ func (m *CreateVolumeRequest) GetParameters() map[string]string { return nil } -func (m *CreateVolumeRequest) GetControllerCreateCredentials() map[string]string { +func (m *CreateVolumeRequest) GetControllerCreateSecrets() map[string]string { if m != nil { - return m.ControllerCreateCredentials + return m.ControllerCreateSecrets } return nil } @@ -904,18 +910,24 @@ type DeleteVolumeRequest struct { // The ID of the volume to be deprovisioned. // This field is REQUIRED. VolumeId string `protobuf:"bytes,2,opt,name=volume_id,json=volumeId" json:"volume_id,omitempty"` - // Credentials used by Controller plugin to authenticate/authorize - // volume deletion request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete volume deletion request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - ControllerDeleteCredentials map[string]string `protobuf:"bytes,3,rep,name=controller_delete_credentials,json=controllerDeleteCredentials" json:"controller_delete_credentials,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + ControllerDeleteSecrets map[string]string `protobuf:"bytes,3,rep,name=controller_delete_secrets,json=controllerDeleteSecrets" json:"controller_delete_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *DeleteVolumeRequest) Reset() { *m = DeleteVolumeRequest{} } @@ -937,9 +949,9 @@ func (m *DeleteVolumeRequest) GetVolumeId() string { return "" } -func (m *DeleteVolumeRequest) GetControllerDeleteCredentials() map[string]string { +func (m *DeleteVolumeRequest) GetControllerDeleteSecrets() map[string]string { if m != nil { - return m.ControllerDeleteCredentials + return m.ControllerDeleteSecrets } return nil } @@ -969,18 +981,25 @@ type ControllerPublishVolumeRequest struct { // Whether to publish the volume in readonly mode. This field is // REQUIRED. Readonly bool `protobuf:"varint,5,opt,name=readonly" json:"readonly,omitempty"` - // Credentials used by Controller plugin to authenticate/authorize - // controller publish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete controller publish volume + // request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - ControllerPublishCredentials map[string]string `protobuf:"bytes,6,rep,name=controller_publish_credentials,json=controllerPublishCredentials" json:"controller_publish_credentials,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + ControllerPublishSecrets map[string]string `protobuf:"bytes,6,rep,name=controller_publish_secrets,json=controllerPublishSecrets" json:"controller_publish_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // Attributes of the volume to be used on a node. This field is // OPTIONAL and MUST match the attributes of the Volume identified // by `volume_id`. @@ -1027,9 +1046,9 @@ func (m *ControllerPublishVolumeRequest) GetReadonly() bool { return false } -func (m *ControllerPublishVolumeRequest) GetControllerPublishCredentials() map[string]string { +func (m *ControllerPublishVolumeRequest) GetControllerPublishSecrets() map[string]string { if m != nil { - return m.ControllerPublishCredentials + return m.ControllerPublishSecrets } return nil } @@ -1076,18 +1095,27 @@ type ControllerUnpublishVolumeRequest struct { // the specified node. If the value is unset, the SP MUST unpublish // the volume from all nodes it is published to. NodeId string `protobuf:"bytes,3,opt,name=node_id,json=nodeId" json:"node_id,omitempty"` - // Credentials used by Controller plugin to authenticate/authorize - // controller unpublish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete controller unpublish volume + // request. This SHOULD be the same secrets passed to the + // ControllerPublishVolume. + // call for the specified volume. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - ControllerUnpublishCredentials map[string]string `protobuf:"bytes,4,rep,name=controller_unpublish_credentials,json=controllerUnpublishCredentials" json:"controller_unpublish_credentials,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + ControllerUnpublishSecrets map[string]string `protobuf:"bytes,4,rep,name=controller_unpublish_secrets,json=controllerUnpublishSecrets" json:"controller_unpublish_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *ControllerUnpublishVolumeRequest) Reset() { *m = ControllerUnpublishVolumeRequest{} } @@ -1118,9 +1146,9 @@ func (m *ControllerUnpublishVolumeRequest) GetNodeId() string { return "" } -func (m *ControllerUnpublishVolumeRequest) GetControllerUnpublishCredentials() map[string]string { +func (m *ControllerUnpublishVolumeRequest) GetControllerUnpublishSecrets() map[string]string { if m != nil { - return m.ControllerUnpublishCredentials + return m.ControllerUnpublishSecrets } return nil } @@ -1548,18 +1576,24 @@ type NodeStageVolumeRequest struct { // The capability of the volume the CO expects the volume to have. // This is a REQUIRED field. VolumeCapability *VolumeCapability `protobuf:"bytes,5,opt,name=volume_capability,json=volumeCapability" json:"volume_capability,omitempty"` - // Credentials used by Node plugin to authenticate/authorize node - // stage request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete node stage volume request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - NodeStageCredentials map[string]string `protobuf:"bytes,6,rep,name=node_stage_credentials,json=nodeStageCredentials" json:"node_stage_credentials,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + NodeStageSecrets map[string]string `protobuf:"bytes,6,rep,name=node_stage_secrets,json=nodeStageSecrets" json:"node_stage_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // Attributes of the volume to publish. This field is OPTIONAL and // MUST match the attributes of the VolumeInfo identified by // `volume_id`. @@ -1606,9 +1640,9 @@ func (m *NodeStageVolumeRequest) GetVolumeCapability() *VolumeCapability { return nil } -func (m *NodeStageVolumeRequest) GetNodeStageCredentials() map[string]string { +func (m *NodeStageVolumeRequest) GetNodeStageSecrets() map[string]string { if m != nil { - return m.NodeStageCredentials + return m.NodeStageSecrets } return nil } @@ -1639,18 +1673,6 @@ type NodeUnstageVolumeRequest struct { // path in the root filesystem of the process serving this request. // This is a REQUIRED field. StagingTargetPath string `protobuf:"bytes,3,opt,name=staging_target_path,json=stagingTargetPath" json:"staging_target_path,omitempty"` - // Credentials used by Node plugin to authenticate/authorize node - // unstage request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. - // This field is OPTIONAL. - NodeUnstageCredentials map[string]string `protobuf:"bytes,4,rep,name=node_unstage_credentials,json=nodeUnstageCredentials" json:"node_unstage_credentials,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *NodeUnstageVolumeRequest) Reset() { *m = NodeUnstageVolumeRequest{} } @@ -1679,13 +1701,6 @@ func (m *NodeUnstageVolumeRequest) GetStagingTargetPath() string { return "" } -func (m *NodeUnstageVolumeRequest) GetNodeUnstageCredentials() map[string]string { - if m != nil { - return m.NodeUnstageCredentials - } - return nil -} - type NodeUnstageVolumeResponse struct { } @@ -1727,18 +1742,24 @@ type NodePublishVolumeRequest struct { // Whether to publish the volume in readonly mode. This field is // REQUIRED. Readonly bool `protobuf:"varint,7,opt,name=readonly" json:"readonly,omitempty"` - // Credentials used by Node plugin to authenticate/authorize node - // publish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete node publish volume request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - NodePublishCredentials map[string]string `protobuf:"bytes,8,rep,name=node_publish_credentials,json=nodePublishCredentials" json:"node_publish_credentials,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + NodePublishSecrets map[string]string `protobuf:"bytes,8,rep,name=node_publish_secrets,json=nodePublishSecrets" json:"node_publish_secrets,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // Attributes of the volume to publish. This field is OPTIONAL and // MUST match the attributes of the Volume identified by // `volume_id`. @@ -1799,9 +1820,9 @@ func (m *NodePublishVolumeRequest) GetReadonly() bool { return false } -func (m *NodePublishVolumeRequest) GetNodePublishCredentials() map[string]string { +func (m *NodePublishVolumeRequest) GetNodePublishSecrets() map[string]string { if m != nil { - return m.NodePublishCredentials + return m.NodePublishSecrets } return nil } @@ -1832,18 +1853,6 @@ type NodeUnpublishVolumeRequest struct { // path in the root filesystem of the process serving this request. // This is a REQUIRED field. TargetPath string `protobuf:"bytes,3,opt,name=target_path,json=targetPath" json:"target_path,omitempty"` - // Credentials used by Node plugin to authenticate/authorize node - // unpublish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. - // This field is OPTIONAL. - NodeUnpublishCredentials map[string]string `protobuf:"bytes,4,rep,name=node_unpublish_credentials,json=nodeUnpublishCredentials" json:"node_unpublish_credentials,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *NodeUnpublishVolumeRequest) Reset() { *m = NodeUnpublishVolumeRequest{} } @@ -1872,13 +1881,6 @@ func (m *NodeUnpublishVolumeRequest) GetTargetPath() string { return "" } -func (m *NodeUnpublishVolumeRequest) GetNodeUnpublishCredentials() map[string]string { - if m != nil { - return m.NodeUnpublishCredentials - } - return nil -} - type NodeUnpublishVolumeResponse struct { } @@ -2824,152 +2826,149 @@ var _Node_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("csi.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 2348 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x1a, 0x4d, 0x6f, 0xdb, 0xc8, - 0xd5, 0xd4, 0x87, 0x65, 0x3d, 0xd9, 0x89, 0x3c, 0x76, 0x6c, 0x85, 0x8e, 0x13, 0x87, 0xd9, 0x64, - 0x53, 0x34, 0x2b, 0xb4, 0x5e, 0xec, 0x36, 0xde, 0x6c, 0x02, 0xd8, 0x32, 0x63, 0xab, 0x71, 0x64, - 0x2f, 0x2d, 0x27, 0xdd, 0x6d, 0xb7, 0x5c, 0x5a, 0x1a, 0x3b, 0x6c, 0x24, 0x52, 0x4b, 0x52, 0x46, - 0x84, 0xa2, 0xb7, 0x9e, 0xda, 0xde, 0x7a, 0xe8, 0xa5, 0x68, 0xcf, 0x05, 0x7a, 0xed, 0x69, 0xd1, - 0x4b, 0x81, 0xa2, 0x97, 0x02, 0x3d, 0x15, 0xbd, 0xf6, 0xba, 0xfd, 0x05, 0x3d, 0x16, 0x9c, 0x19, - 0x52, 0x43, 0x6a, 0x48, 0x59, 0xc9, 0x3a, 0xe8, 0xc9, 0xe2, 0xfb, 0x9e, 0x37, 0x6f, 0xde, 0xbc, - 0xf7, 0xc6, 0x50, 0x6c, 0xb9, 0x66, 0xb5, 0xe7, 0xd8, 0x9e, 0x8d, 0xb2, 0x2d, 0xd7, 0x54, 0x56, - 0x61, 0x65, 0x07, 0x7b, 0x87, 0xfd, 0x5e, 0xcf, 0x76, 0x3c, 0xdc, 0x7e, 0x86, 0x1d, 0xd7, 0xb4, - 0x2d, 0x57, 0xc3, 0x5f, 0xf6, 0xb1, 0xeb, 0x29, 0x3f, 0x84, 0x6b, 0x62, 0xb4, 0xdb, 0xb3, 0x2d, - 0x17, 0xa3, 0x07, 0x80, 0xdc, 0x00, 0xa9, 0x9f, 0x31, 0x6c, 0x45, 0x5a, 0xcb, 0xde, 0x2d, 0xad, - 0xcf, 0x56, 0x7d, 0x5d, 0x8c, 0x45, 0x9b, 0x77, 0xe3, 0x42, 0x94, 0x27, 0x50, 0x60, 0xbf, 0xd1, - 0x22, 0xe4, 0xbb, 0xc6, 0x4f, 0x6c, 0xa7, 0x22, 0xad, 0x49, 0x77, 0xf3, 0x1a, 0xfd, 0x20, 0x50, - 0xd3, 0xb2, 0x9d, 0x4a, 0x86, 0x41, 0xfd, 0x0f, 0x1f, 0xda, 0x33, 0xbc, 0xd6, 0x8b, 0x4a, 0x96, - 0x42, 0xc9, 0x87, 0xf2, 0x08, 0x16, 0x77, 0xb0, 0x77, 0xd0, 0xe9, 0x9f, 0x9a, 0x56, 0xdd, 0x3a, - 0xb1, 0xd9, 0x0a, 0xd0, 0x1d, 0x28, 0x30, 0xbb, 0x88, 0xec, 0xb8, 0x59, 0x01, 0x52, 0xf9, 0xa7, - 0x04, 0x57, 0x62, 0x02, 0xd8, 0x1a, 0x11, 0xe4, 0x2c, 0xa3, 0x8b, 0x09, 0x7b, 0x51, 0x23, 0xbf, - 0xd1, 0x6d, 0xb8, 0x74, 0x86, 0xad, 0xb6, 0xed, 0x04, 0x8b, 0x26, 0x26, 0x16, 0xb5, 0x39, 0x0a, - 0x0d, 0x96, 0xb5, 0x0d, 0x33, 0x5d, 0xc3, 0x32, 0x4f, 0xb0, 0xeb, 0x55, 0xb2, 0xc4, 0x29, 0x77, - 0x89, 0x76, 0xa1, 0xa2, 0xea, 0x53, 0x46, 0xaa, 0x5a, 0x9e, 0x33, 0xd0, 0x42, 0x4e, 0xf9, 0x01, - 0xcc, 0x45, 0x50, 0xa8, 0x0c, 0xd9, 0x97, 0x78, 0xc0, 0x0c, 0xf2, 0x7f, 0xfa, 0x3e, 0x39, 0x33, - 0x3a, 0x7d, 0xcc, 0xcc, 0xa0, 0x1f, 0x1f, 0x65, 0xee, 0x4b, 0xca, 0x63, 0xb2, 0x83, 0x54, 0x5b, - 0xcd, 0xe8, 0x19, 0xc7, 0x66, 0xc7, 0xf4, 0x4c, 0xec, 0x4e, 0xea, 0x9f, 0xcf, 0x60, 0x35, 0x41, - 0x0e, 0x73, 0xd3, 0x06, 0xcc, 0xb6, 0x38, 0x78, 0x25, 0x43, 0xd6, 0x7b, 0x85, 0x48, 0x8b, 0xb1, - 0x0d, 0xb4, 0x08, 0xa9, 0xf2, 0x57, 0x09, 0xca, 0x71, 0x12, 0xb4, 0x01, 0x05, 0x17, 0x3b, 0x67, - 0x66, 0x0b, 0x33, 0xc3, 0x56, 0x85, 0xa2, 0xaa, 0x87, 0x94, 0x68, 0x77, 0x4a, 0x0b, 0xe8, 0x65, - 0x0b, 0x0a, 0x0c, 0x8a, 0x3e, 0x84, 0x9c, 0x37, 0xe8, 0x51, 0x11, 0x97, 0xd6, 0x95, 0x54, 0x11, - 0xd5, 0xe6, 0xa0, 0x87, 0x35, 0x42, 0xaf, 0x7c, 0x1b, 0x72, 0xfe, 0x17, 0x2a, 0x41, 0xe1, 0xa8, - 0xf1, 0xa4, 0xb1, 0xff, 0xbc, 0x51, 0x9e, 0x42, 0x4b, 0x80, 0x6a, 0xfb, 0x8d, 0xa6, 0xb6, 0xbf, - 0xb7, 0xa7, 0x6a, 0xfa, 0xa1, 0xaa, 0x3d, 0xab, 0xd7, 0xd4, 0xb2, 0xb4, 0x35, 0x4d, 0x95, 0x28, - 0x1f, 0xc2, 0xec, 0x81, 0x63, 0x1f, 0xe3, 0x49, 0x7d, 0x7b, 0x19, 0xe6, 0x18, 0x1f, 0xf5, 0xa5, - 0xf2, 0xc7, 0x1c, 0x2c, 0xd4, 0x1c, 0x6c, 0x78, 0xf8, 0x99, 0xdd, 0xe9, 0x77, 0x27, 0x15, 0x18, - 0x86, 0x6c, 0x86, 0x0b, 0xd9, 0x0d, 0xb8, 0xe4, 0x3b, 0xbd, 0x65, 0x7a, 0x03, 0xdd, 0x31, 0xac, - 0x53, 0x4c, 0xce, 0x4f, 0x69, 0x1d, 0x11, 0x11, 0x35, 0x86, 0xd2, 0x7c, 0x8c, 0x36, 0xd7, 0xe2, - 0x3f, 0xd1, 0x63, 0x58, 0x38, 0x23, 0x76, 0xe8, 0x91, 0x1d, 0xce, 0x71, 0x3b, 0x4c, 0xed, 0xe4, - 0x76, 0x18, 0x9d, 0x45, 0x21, 0x26, 0x76, 0xd1, 0x2e, 0x40, 0xcf, 0x70, 0x8c, 0x2e, 0xf6, 0xb0, - 0xe3, 0x56, 0xf2, 0xdc, 0x81, 0x10, 0x2c, 0xb6, 0x7a, 0x10, 0x92, 0xd2, 0x03, 0xc1, 0xf1, 0xa2, - 0x9f, 0xc1, 0x6a, 0xcb, 0xb6, 0x3c, 0xc7, 0xee, 0x74, 0xb0, 0xa3, 0xb7, 0x08, 0xb7, 0xff, 0xa7, - 0x8d, 0x2d, 0xcf, 0x34, 0x3a, 0x6e, 0x65, 0x9a, 0x08, 0xdf, 0x48, 0x14, 0x5e, 0x0b, 0xb9, 0x29, - 0xb6, 0x36, 0xe4, 0xa5, 0xda, 0x56, 0x5a, 0xc9, 0x14, 0xf2, 0x43, 0xb8, 0x1c, 0xb3, 0x6e, 0x92, - 0x33, 0x29, 0x37, 0x60, 0x6d, 0x9c, 0xfe, 0x89, 0xce, 0xf8, 0x03, 0x58, 0x8c, 0xae, 0x91, 0x1d, - 0xc9, 0x5b, 0x30, 0x4d, 0x77, 0x81, 0x45, 0x4b, 0x89, 0xdb, 0x2a, 0x8d, 0xa1, 0x94, 0xdf, 0xe5, - 0xa0, 0x1c, 0xdf, 0x3d, 0xb4, 0x01, 0xf9, 0xe3, 0x8e, 0xdd, 0x7a, 0xc9, 0x18, 0x6f, 0x0a, 0xf7, - 0xb8, 0xba, 0xe5, 0x93, 0x50, 0xe8, 0xee, 0x94, 0x46, 0x39, 0x7c, 0xd6, 0xae, 0xdd, 0xb7, 0x3c, - 0x62, 0x66, 0x22, 0xeb, 0x53, 0x9f, 0x64, 0xc8, 0x4a, 0x38, 0xd0, 0x26, 0x94, 0x8c, 0x56, 0x0b, - 0xbb, 0xae, 0xde, 0xb5, 0xdb, 0x41, 0x7c, 0xae, 0x89, 0x05, 0x6c, 0x12, 0xc2, 0xa7, 0x76, 0x1b, - 0x6b, 0x60, 0x84, 0xbf, 0xe5, 0x39, 0x28, 0x71, 0x56, 0xc9, 0x3b, 0x50, 0xe2, 0x34, 0xa1, 0x65, - 0x28, 0x9c, 0xb8, 0x7a, 0x98, 0x10, 0x8a, 0xda, 0xf4, 0x89, 0x4b, 0x8e, 0xf9, 0x0d, 0x28, 0x11, - 0x13, 0xf4, 0x93, 0x8e, 0x71, 0x4a, 0x73, 0x57, 0x51, 0x03, 0x02, 0x7a, 0xec, 0x43, 0xe4, 0xaf, - 0x25, 0x80, 0xa1, 0x4a, 0xb4, 0x01, 0x39, 0x62, 0x22, 0x4d, 0x2b, 0xb7, 0xc7, 0x99, 0x58, 0x25, - 0x76, 0x12, 0x16, 0xe5, 0xf7, 0x12, 0xe4, 0x88, 0x8c, 0x78, 0x6a, 0x39, 0xac, 0x37, 0x76, 0xf6, - 0x54, 0xbd, 0xb1, 0xbf, 0xad, 0xea, 0xcf, 0xb5, 0x7a, 0x53, 0xd5, 0xca, 0x12, 0x5a, 0x81, 0x65, - 0x1e, 0xae, 0xa9, 0x9b, 0xdb, 0xaa, 0xa6, 0xef, 0x37, 0xf6, 0x3e, 0x2d, 0x67, 0x90, 0x0c, 0x4b, - 0x4f, 0x8f, 0xf6, 0x9a, 0xf5, 0x51, 0x5c, 0x16, 0x5d, 0x83, 0x0a, 0x87, 0x63, 0x32, 0x98, 0xd8, - 0x9c, 0x2f, 0x96, 0xc3, 0xd2, 0x9f, 0x0c, 0x99, 0xdf, 0x9a, 0x0b, 0xb7, 0x81, 0x64, 0xb5, 0xe7, - 0x30, 0x17, 0xc9, 0x0e, 0xfe, 0xe5, 0xe7, 0xe0, 0x2f, 0xfb, 0xa6, 0x83, 0xdb, 0xfa, 0xf1, 0xc0, - 0xc3, 0x2e, 0x71, 0x43, 0x56, 0x9b, 0x0b, 0xa0, 0x5b, 0x3e, 0xd0, 0xf7, 0x69, 0xc7, 0xec, 0x9a, - 0x1e, 0xa3, 0xc9, 0x10, 0x1a, 0x20, 0x20, 0x42, 0xa0, 0x7c, 0x25, 0xc1, 0x34, 0xdb, 0x98, 0xdb, - 0x5c, 0x72, 0x8a, 0x88, 0x0c, 0xa0, 0x54, 0xe4, 0x25, 0xc8, 0x98, 0x6d, 0x16, 0xff, 0x19, 0xb3, - 0x8d, 0x1e, 0x00, 0x18, 0x9e, 0xe7, 0x98, 0xc7, 0x7d, 0x9f, 0x85, 0xde, 0xb0, 0x2b, 0xdc, 0x66, - 0x54, 0x37, 0x43, 0x2c, 0xcb, 0x21, 0x43, 0x72, 0xff, 0x10, 0xc7, 0xd0, 0x13, 0x1d, 0xba, 0x3f, - 0x64, 0x60, 0x61, 0x1b, 0x77, 0xf0, 0xeb, 0xe6, 0xe8, 0x15, 0x28, 0xb2, 0xa4, 0x1a, 0x2e, 0x69, - 0x86, 0x02, 0xea, 0xed, 0x58, 0x7e, 0x6b, 0x13, 0x35, 0x91, 0xfc, 0x96, 0xe5, 0xf2, 0x9b, 0xc0, - 0x0a, 0x2e, 0xbf, 0x51, 0x6c, 0x5a, 0x7e, 0x1b, 0xa1, 0x88, 0x26, 0x28, 0xb1, 0x80, 0x89, 0x7c, - 0xb5, 0x04, 0x8b, 0x51, 0x23, 0xd9, 0x3d, 0xf7, 0x9f, 0x1c, 0x5c, 0x1f, 0x2a, 0x3a, 0xe8, 0x1f, - 0x77, 0x4c, 0xf7, 0xc5, 0x05, 0xb8, 0x73, 0x19, 0x0a, 0x96, 0xdd, 0x26, 0xa8, 0x2c, 0x3d, 0xf7, - 0xfe, 0x67, 0xbd, 0x8d, 0xb6, 0x60, 0x3e, 0x7e, 0xb3, 0x0d, 0x2a, 0x39, 0xa2, 0x27, 0xe1, 0x5e, - 0x2b, 0x9f, 0xc5, 0x73, 0xa5, 0x0c, 0x33, 0x0e, 0x36, 0xda, 0xb6, 0xd5, 0x19, 0x54, 0xf2, 0x6b, - 0xd2, 0xdd, 0x19, 0x2d, 0xfc, 0x46, 0xbf, 0x94, 0xe0, 0x3a, 0xb7, 0x91, 0x3d, 0xba, 0x42, 0xc1, - 0x4d, 0xa5, 0xd2, 0x9b, 0x2a, 0xd5, 0x17, 0xa3, 0xe8, 0x91, 0x5d, 0xbd, 0xd6, 0x4a, 0x21, 0x41, - 0x27, 0xe1, 0x6a, 0xb9, 0x53, 0x53, 0xe0, 0x6f, 0xca, 0x74, 0xfd, 0xf4, 0x2b, 0x7e, 0xa6, 0x98, - 0x47, 0x86, 0x60, 0x79, 0x1f, 0x6e, 0x8e, 0x35, 0x75, 0xa2, 0x0b, 0xb3, 0x06, 0x57, 0x84, 0xba, - 0x27, 0x0a, 0xc2, 0xaf, 0x24, 0xb8, 0x91, 0xb8, 0x40, 0x76, 0x63, 0xfe, 0x00, 0x66, 0x83, 0x3d, - 0x32, 0xad, 0x13, 0x9b, 0x75, 0x32, 0x1f, 0xa4, 0x3b, 0x87, 0x95, 0xef, 0x0c, 0xea, 0x97, 0xf4, - 0xd4, 0x31, 0xa5, 0xde, 0x10, 0x22, 0x3f, 0x82, 0x72, 0x9c, 0x60, 0x22, 0xeb, 0xbf, 0xce, 0xf0, - 0x67, 0xf2, 0xc8, 0xea, 0xbd, 0xfd, 0xc3, 0xf2, 0x6b, 0x09, 0xd6, 0xb8, 0x60, 0xee, 0x5b, 0xa2, - 0x70, 0xa6, 0x45, 0x61, 0x3d, 0xe6, 0x31, 0xb1, 0xbd, 0x22, 0x82, 0x91, 0x90, 0xe6, 0xce, 0x8f, - 0x88, 0x48, 0xfe, 0x04, 0x6e, 0x9d, 0x43, 0xcc, 0x44, 0xbe, 0xbe, 0xc5, 0xc7, 0xef, 0x88, 0xe9, - 0x2c, 0x77, 0xfd, 0x3b, 0x03, 0x37, 0x9f, 0x19, 0x1d, 0xb3, 0x1d, 0xd6, 0x5d, 0x6f, 0xd0, 0x5e, - 0xa5, 0xef, 0x48, 0x42, 0xfd, 0x9d, 0x9d, 0xb4, 0xfe, 0x36, 0x45, 0xe7, 0x9f, 0x6e, 0xd8, 0xc7, - 0x54, 0xca, 0xb8, 0xf5, 0x9c, 0x3b, 0x05, 0x7c, 0x23, 0x27, 0xf6, 0x47, 0xa0, 0xa4, 0x59, 0xc4, - 0xce, 0xec, 0x35, 0x28, 0x86, 0xb3, 0x05, 0x22, 0x77, 0x46, 0x1b, 0x02, 0x50, 0x05, 0x0a, 0x5d, - 0xec, 0xba, 0xc6, 0x69, 0x20, 0x3f, 0xf8, 0x54, 0x7e, 0x2e, 0x01, 0xda, 0x33, 0x5d, 0x56, 0x1b, - 0x4e, 0xbc, 0x63, 0x7e, 0xc9, 0x68, 0xbc, 0xd2, 0xb1, 0xe5, 0x39, 0x26, 0x2b, 0x6f, 0xf2, 0x1a, - 0x74, 0x8d, 0x57, 0x2a, 0x85, 0xf8, 0x35, 0x8d, 0xeb, 0x19, 0x8e, 0x67, 0x5a, 0xa7, 0xba, 0x67, - 0xbf, 0xc4, 0x16, 0x3b, 0x4e, 0x73, 0x01, 0xb4, 0xe9, 0x03, 0x95, 0xdf, 0x4a, 0xb0, 0x10, 0x31, - 0x83, 0x2d, 0xeb, 0x3e, 0x14, 0x02, 0xd9, 0x34, 0x0b, 0x5d, 0x27, 0x76, 0x08, 0x48, 0xab, 0x74, - 0x13, 0x02, 0x72, 0xb4, 0x0a, 0x60, 0xe1, 0x57, 0x1e, 0x53, 0x4a, 0x57, 0x5d, 0xf4, 0x21, 0x44, - 0xa1, 0x7c, 0x0f, 0xf2, 0x74, 0x2b, 0xce, 0xd5, 0x1e, 0xfc, 0x2a, 0x03, 0x68, 0x07, 0x7b, 0x61, - 0x05, 0x38, 0xa1, 0x97, 0x12, 0x42, 0x37, 0x33, 0x69, 0xe8, 0xee, 0x44, 0x5a, 0x47, 0x1a, 0xf9, - 0xef, 0x06, 0xb3, 0x94, 0x98, 0x71, 0x69, 0x9d, 0xe3, 0x1b, 0xb6, 0x6e, 0xca, 0x36, 0x2c, 0x44, - 0x14, 0xb2, 0xcd, 0x7a, 0x0f, 0x90, 0x71, 0x66, 0x98, 0x1d, 0xe3, 0xb8, 0x43, 0x57, 0xea, 0x63, - 0x59, 0x0d, 0x3b, 0x1f, 0x62, 0x02, 0x36, 0xe5, 0xfb, 0x7c, 0x2e, 0x67, 0xf2, 0x5e, 0x77, 0x30, - 0x63, 0xf2, 0xc9, 0x6a, 0x44, 0x16, 0xb3, 0x6f, 0x5b, 0x38, 0x9c, 0x59, 0x8b, 0x65, 0x69, 0x36, - 0x07, 0x49, 0x9c, 0xd3, 0xfc, 0x26, 0x03, 0x2b, 0x29, 0xd4, 0xe8, 0x3e, 0x64, 0x9d, 0x5e, 0x8b, - 0x99, 0xfb, 0xce, 0x38, 0xe1, 0x55, 0xed, 0xa0, 0xb6, 0x3b, 0xa5, 0xf9, 0x2c, 0xf2, 0x9f, 0x24, - 0xc8, 0x6a, 0x07, 0x35, 0xf4, 0x30, 0x32, 0xae, 0xf9, 0xd6, 0x79, 0x44, 0xf0, 0x53, 0x1b, 0x5b, - 0x34, 0xb5, 0xa9, 0xc0, 0x62, 0x4d, 0x53, 0x37, 0x9b, 0xaa, 0xbe, 0xad, 0xee, 0xa9, 0x4d, 0x55, - 0x7f, 0xb6, 0xbf, 0x77, 0xf4, 0x54, 0x2d, 0x4b, 0x7e, 0x8f, 0x74, 0x70, 0xb4, 0xb5, 0x57, 0x3f, - 0xdc, 0xd5, 0x8f, 0x1a, 0xc1, 0x2f, 0x86, 0xcd, 0xa0, 0x32, 0xcc, 0xee, 0xd5, 0x0f, 0x9b, 0x0c, - 0x70, 0x58, 0xce, 0xfa, 0x90, 0x1d, 0xb5, 0xa9, 0xd7, 0x36, 0x0f, 0x36, 0x6b, 0xf5, 0xe6, 0xa7, - 0xe5, 0x5c, 0x38, 0xf9, 0xf9, 0x73, 0x1e, 0x96, 0x1a, 0x76, 0x1b, 0x1f, 0x7a, 0xc6, 0xe9, 0x45, - 0xf4, 0x03, 0xfb, 0xb1, 0xba, 0x84, 0x1e, 0x80, 0x7b, 0x44, 0x92, 0x58, 0x6f, 0x7a, 0x39, 0x82, - 0xaa, 0xb0, 0xe0, 0x7a, 0xc6, 0x29, 0xc9, 0x4d, 0x86, 0x73, 0x8a, 0x3d, 0xbd, 0x67, 0x78, 0x2f, - 0x48, 0xe9, 0x5b, 0xd4, 0xe6, 0x19, 0xaa, 0x49, 0x30, 0x07, 0x86, 0xf7, 0x42, 0x5c, 0x28, 0xe7, - 0x27, 0x2b, 0x94, 0x5f, 0xc2, 0x12, 0x29, 0x2c, 0x7c, 0xe9, 0xa2, 0x69, 0xcd, 0x07, 0x69, 0xcb, - 0x09, 0xc1, 0x23, 0x05, 0xc2, 0xa2, 0x25, 0x40, 0xa1, 0x1f, 0x27, 0xd7, 0xba, 0xdf, 0x4d, 0xd3, - 0x73, 0xde, 0x0b, 0xee, 0x0d, 0xeb, 0x39, 0x79, 0x07, 0xae, 0x26, 0x2e, 0xe9, 0xed, 0xd7, 0xc6, - 0x57, 0x61, 0x79, 0xc4, 0x1f, 0xac, 0xce, 0xf9, 0x47, 0x06, 0x2a, 0x3e, 0xee, 0xc8, 0x72, 0x2f, - 0x28, 0xb8, 0x13, 0x62, 0x31, 0x9b, 0x14, 0x8b, 0x2e, 0x54, 0x48, 0x1c, 0xf5, 0xad, 0xd1, 0x48, - 0xca, 0x71, 0xdd, 0x4c, 0x92, 0xd5, 0x3c, 0x62, 0x24, 0x9a, 0x48, 0x88, 0x8e, 0x22, 0xe5, 0x3a, - 0xac, 0xa4, 0xb0, 0x4d, 0xe4, 0xec, 0x15, 0xba, 0xf5, 0x31, 0xd3, 0x98, 0xbb, 0x7f, 0x31, 0x4d, - 0xdd, 0x7d, 0x71, 0xcd, 0xf0, 0x27, 0xc2, 0x5c, 0x52, 0x0d, 0x5d, 0x26, 0x6c, 0xfd, 0xbe, 0xd9, - 0x6c, 0x72, 0x03, 0x4a, 0x3c, 0x5d, 0x9e, 0xd0, 0x81, 0x37, 0x26, 0xdd, 0x4c, 0xbf, 0x7e, 0x5f, - 0x5e, 0x88, 0xf5, 0xe5, 0x41, 0x08, 0x89, 0x3a, 0x98, 0x99, 0x58, 0x08, 0x09, 0xfd, 0xc1, 0x21, - 0xc4, 0x21, 0x24, 0x68, 0xbf, 0xbf, 0x10, 0xa5, 0xa4, 0x22, 0xd1, 0xf6, 0x7e, 0xba, 0xb6, 0xb7, - 0x95, 0x94, 0x58, 0x90, 0xff, 0xdf, 0xb4, 0xec, 0xec, 0xa4, 0x08, 0xfb, 0x6d, 0xe5, 0xef, 0x19, - 0x90, 0xe9, 0x39, 0xba, 0xb8, 0x5e, 0x38, 0x16, 0xa8, 0xd9, 0x91, 0x40, 0xfd, 0x29, 0xc8, 0x2c, - 0x17, 0x25, 0x37, 0xc3, 0x0f, 0xb9, 0x6c, 0xd4, 0x4b, 0x0a, 0xa6, 0xe4, 0x06, 0xb8, 0x62, 0x25, - 0xa0, 0xe5, 0x27, 0xb0, 0x9a, 0xca, 0x3a, 0x91, 0xaf, 0x57, 0x83, 0x04, 0x27, 0x6e, 0x77, 0x3f, - 0x82, 0xb2, 0x8f, 0xde, 0xc1, 0x5e, 0xbd, 0x3d, 0x69, 0x89, 0x7a, 0x0f, 0xe6, 0x39, 0x5e, 0x56, - 0x92, 0x72, 0x63, 0x06, 0x89, 0x1f, 0x33, 0x28, 0xdb, 0x74, 0x5b, 0xdf, 0xb0, 0x2c, 0xfe, 0x9c, - 0x2e, 0x27, 0xa9, 0x20, 0x7e, 0x14, 0x2b, 0x88, 0x69, 0x8b, 0x25, 0x0f, 0x2b, 0x83, 0x31, 0xa5, - 0xf0, 0x5f, 0x24, 0xb8, 0x22, 0xa4, 0x43, 0xeb, 0x7c, 0x11, 0x7c, 0x3d, 0x59, 0x20, 0x5f, 0xfe, - 0x76, 0x69, 0xf5, 0xfb, 0xbd, 0x48, 0xf5, 0x7b, 0x2b, 0x9d, 0x97, 0xaf, 0x7b, 0xdf, 0x4b, 0xa8, - 0x7b, 0x0f, 0x9b, 0x9b, 0x3b, 0xaa, 0x7e, 0xd4, 0xa0, 0x7f, 0x83, 0xba, 0x37, 0xa8, 0x5a, 0xd7, - 0xff, 0x96, 0x81, 0x99, 0x3a, 0x89, 0x18, 0x6f, 0x80, 0x3e, 0x27, 0x0f, 0xe8, 0x23, 0x4f, 0xfd, - 0x68, 0x2d, 0xe8, 0xb2, 0x92, 0xfe, 0x49, 0x40, 0xbe, 0x99, 0x42, 0xc1, 0xa2, 0x67, 0x0a, 0xed, - 0xc2, 0x5c, 0xe4, 0xd5, 0x1b, 0x5d, 0x15, 0xbd, 0x84, 0x53, 0x81, 0x72, 0xf2, 0x23, 0xb9, 0x32, - 0x85, 0xbe, 0xe0, 0x1e, 0xea, 0x23, 0x3d, 0xe2, 0xcd, 0x28, 0x9b, 0x20, 0x7a, 0x64, 0x25, 0x8d, - 0x24, 0xd4, 0xf0, 0x1d, 0xc8, 0x93, 0xf7, 0x58, 0x34, 0x4f, 0xdf, 0x8b, 0xb9, 0x37, 0x5d, 0x19, - 0xf1, 0xa0, 0x80, 0x63, 0xfd, 0x5f, 0x79, 0x80, 0x61, 0x9f, 0x82, 0x54, 0x98, 0xe5, 0x1f, 0xe4, - 0x50, 0x25, 0xe9, 0x1d, 0x52, 0xbe, 0x2a, 0xc0, 0x84, 0x76, 0xa8, 0x30, 0xcb, 0x8f, 0xcd, 0x99, - 0x18, 0xc1, 0xb8, 0x9f, 0x89, 0x11, 0xce, 0xd8, 0xa7, 0xd0, 0x09, 0x2c, 0x27, 0xcc, 0x2e, 0xd1, - 0xad, 0x73, 0x8c, 0x7d, 0xe5, 0x77, 0xce, 0x33, 0xfe, 0x54, 0xa6, 0x50, 0x07, 0xae, 0x26, 0x8e, - 0xcd, 0xd0, 0xed, 0x73, 0x4d, 0x04, 0xe5, 0x3b, 0xe3, 0xc8, 0x42, 0x6d, 0x36, 0xc8, 0xc9, 0xc3, - 0x21, 0x74, 0xe7, 0x7c, 0xf3, 0x2c, 0xf9, 0xdd, 0xb1, 0x74, 0xa1, 0xc2, 0x2d, 0x28, 0x71, 0xc3, - 0x17, 0xb4, 0x3c, 0x3a, 0x8e, 0xa1, 0x22, 0x2b, 0x49, 0x73, 0x1a, 0x2a, 0x83, 0x1b, 0x1f, 0x30, - 0x19, 0xa3, 0x13, 0x0c, 0x26, 0x43, 0x30, 0x69, 0x88, 0xbb, 0x39, 0x96, 0xdf, 0x46, 0xdc, 0x2c, - 0xce, 0xa2, 0x23, 0x6e, 0x4e, 0x48, 0x93, 0xca, 0xd4, 0xfa, 0x7f, 0xb3, 0x90, 0xf3, 0x73, 0x10, - 0x6a, 0xc0, 0xe5, 0x58, 0x8b, 0x80, 0x56, 0x52, 0x1a, 0x29, 0xf9, 0x9a, 0x18, 0x19, 0x2e, 0xa3, - 0x49, 0x2f, 0x85, 0x48, 0x15, 0x8c, 0x56, 0x53, 0x0b, 0x77, 0xf9, 0x7a, 0x12, 0x3a, 0x2e, 0x35, - 0x1a, 0xe5, 0xab, 0xa9, 0xd5, 0x15, 0x27, 0x35, 0x29, 0xb2, 0x3f, 0x83, 0x05, 0xc1, 0xdd, 0x88, - 0x6e, 0x8c, 0xb9, 0xd8, 0xe5, 0xb5, 0x64, 0x82, 0x50, 0xf6, 0xc7, 0x50, 0x0c, 0x2f, 0x47, 0x74, - 0x25, 0x64, 0xe0, 0x2f, 0x5a, 0x79, 0x29, 0x0e, 0x8e, 0x5b, 0x16, 0x0f, 0x83, 0x1b, 0x3c, 0x83, - 0x28, 0x00, 0xd6, 0x92, 0x09, 0x02, 0xd9, 0xc7, 0xd3, 0xe4, 0xff, 0xc4, 0xde, 0xff, 0x5f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x2a, 0x1b, 0xdc, 0x39, 0x34, 0x26, 0x00, 0x00, + // 2291 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x4f, 0x6f, 0xdb, 0xc8, + 0x15, 0x37, 0xf5, 0xc7, 0xb2, 0x9e, 0xac, 0x44, 0x1e, 0x3b, 0xb6, 0x4c, 0xdb, 0xb1, 0xcd, 0x6c, + 0xb2, 0x29, 0x9a, 0x15, 0x5a, 0x2f, 0x76, 0x1b, 0x6f, 0x76, 0x03, 0xd8, 0x32, 0x63, 0x6b, 0x23, + 0xcb, 0x2e, 0x25, 0x3b, 0xdd, 0x6d, 0xb7, 0x5c, 0x5a, 0x1a, 0x3b, 0x6c, 0x24, 0x52, 0x21, 0x29, + 0x23, 0x3e, 0x15, 0x28, 0x0a, 0xf4, 0x52, 0xa0, 0xc7, 0xa2, 0xc0, 0xa2, 0xfd, 0x04, 0x3d, 0xf6, + 0xb4, 0xb7, 0x02, 0x45, 0x3f, 0x41, 0x51, 0xec, 0xad, 0xd7, 0x7e, 0x83, 0xa2, 0xa7, 0x82, 0x33, + 0x43, 0x6a, 0x48, 0x91, 0xb4, 0x95, 0xc4, 0x41, 0x4f, 0x16, 0xdf, 0xbf, 0x79, 0xf3, 0xe6, 0xbd, + 0x37, 0xbf, 0x99, 0x31, 0xe4, 0xdb, 0xb6, 0x5e, 0xe9, 0x5b, 0xa6, 0x63, 0xa2, 0x74, 0xdb, 0xd6, + 0xa5, 0x15, 0x58, 0xda, 0xc5, 0x4e, 0x73, 0xd0, 0xef, 0x9b, 0x96, 0x83, 0x3b, 0xc7, 0xd8, 0xb2, + 0x75, 0xd3, 0xb0, 0x15, 0xfc, 0x72, 0x80, 0x6d, 0x47, 0xfa, 0x29, 0x2c, 0x47, 0xb3, 0xed, 0xbe, + 0x69, 0xd8, 0x18, 0x3d, 0x02, 0x64, 0x7b, 0x4c, 0xf5, 0x9c, 0x71, 0xcb, 0xc2, 0x5a, 0xfa, 0x7e, + 0x61, 0x63, 0xba, 0xe2, 0x8e, 0xc5, 0x54, 0x94, 0x19, 0x3b, 0x6c, 0x44, 0x7a, 0x0a, 0x39, 0xf6, + 0x1b, 0xcd, 0x41, 0xb6, 0xa7, 0xfd, 0xc2, 0xb4, 0xca, 0xc2, 0x9a, 0x70, 0x3f, 0xab, 0xd0, 0x0f, + 0x42, 0xd5, 0x0d, 0xd3, 0x2a, 0xa7, 0x18, 0xd5, 0xfd, 0x70, 0xa9, 0x7d, 0xcd, 0x69, 0x3f, 0x2f, + 0xa7, 0x29, 0x95, 0x7c, 0x48, 0x8f, 0x61, 0x6e, 0x17, 0x3b, 0x87, 0xdd, 0xc1, 0x99, 0x6e, 0xd4, + 0x8c, 0x53, 0x93, 0xcd, 0x00, 0xdd, 0x83, 0x1c, 0xf3, 0x8b, 0xd8, 0x0e, 0xbb, 0xe5, 0x31, 0xa5, + 0x7f, 0x08, 0x70, 0x2b, 0x64, 0x80, 0xcd, 0x11, 0x41, 0xc6, 0xd0, 0x7a, 0x98, 0xa8, 0xe7, 0x15, + 0xf2, 0x1b, 0xdd, 0x85, 0x1b, 0xe7, 0xd8, 0xe8, 0x98, 0x96, 0x37, 0x69, 0xe2, 0x62, 0x5e, 0x29, + 0x52, 0xaa, 0x37, 0xad, 0x1d, 0x98, 0xea, 0x69, 0x86, 0x7e, 0x8a, 0x6d, 0xa7, 0x9c, 0x26, 0x41, + 0xb9, 0x4f, 0x46, 0x8f, 0x1c, 0xa8, 0xb2, 0xcf, 0x44, 0x65, 0xc3, 0xb1, 0x2e, 0x14, 0x5f, 0x53, + 0x7c, 0x04, 0xc5, 0x00, 0x0b, 0x95, 0x20, 0xfd, 0x02, 0x5f, 0x30, 0x87, 0xdc, 0x9f, 0x6e, 0x4c, + 0xce, 0xb5, 0xee, 0x00, 0x33, 0x37, 0xe8, 0xc7, 0x27, 0xa9, 0x87, 0x82, 0xf4, 0x84, 0xac, 0x20, + 0x1d, 0xad, 0xaa, 0xf5, 0xb5, 0x13, 0xbd, 0xab, 0x3b, 0x3a, 0xb6, 0xc7, 0x8d, 0xcf, 0x97, 0xb0, + 0x12, 0x63, 0x87, 0x85, 0x69, 0x13, 0xa6, 0xdb, 0x1c, 0xbd, 0x9c, 0x22, 0xf3, 0xbd, 0x45, 0xac, + 0x85, 0xd4, 0x2e, 0x94, 0x80, 0xa8, 0xf4, 0x37, 0x01, 0x4a, 0x61, 0x11, 0xb4, 0x09, 0x39, 0x1b, + 0x5b, 0xe7, 0x7a, 0x1b, 0x33, 0xc7, 0x56, 0x22, 0x4d, 0x55, 0x9a, 0x54, 0x68, 0x6f, 0x42, 0xf1, + 0xe4, 0x45, 0x03, 0x72, 0x8c, 0x8a, 0x3e, 0x86, 0x8c, 0x73, 0xd1, 0xa7, 0x26, 0x6e, 0x6c, 0x48, + 0x89, 0x26, 0x2a, 0xad, 0x8b, 0x3e, 0x56, 0x88, 0xbc, 0xf4, 0x7d, 0xc8, 0xb8, 0x5f, 0xa8, 0x00, + 0xb9, 0xa3, 0xc6, 0xd3, 0xc6, 0xc1, 0xb3, 0x46, 0x69, 0x02, 0xcd, 0x03, 0xaa, 0x1e, 0x34, 0x5a, + 0xca, 0x41, 0xbd, 0x2e, 0x2b, 0x6a, 0x53, 0x56, 0x8e, 0x6b, 0x55, 0xb9, 0x24, 0x6c, 0x4f, 0xd2, + 0x41, 0xa4, 0x8f, 0x61, 0xfa, 0xd0, 0x32, 0x4f, 0xf0, 0xb8, 0xb1, 0xbd, 0x09, 0x45, 0xa6, 0x47, + 0x63, 0x29, 0x7d, 0x93, 0x81, 0xd9, 0xaa, 0x85, 0x35, 0x07, 0x1f, 0x9b, 0xdd, 0x41, 0x6f, 0x5c, + 0x83, 0x7e, 0xca, 0xa6, 0xb8, 0x94, 0xdd, 0x84, 0x1b, 0x6e, 0xd0, 0xdb, 0xba, 0x73, 0xa1, 0x5a, + 0x9a, 0x71, 0x86, 0x49, 0xfd, 0x14, 0x36, 0x10, 0x31, 0x51, 0x65, 0x2c, 0xc5, 0xe5, 0x28, 0xc5, + 0x36, 0xff, 0x89, 0x9e, 0xc0, 0xec, 0x39, 0xf1, 0x43, 0x0d, 0xac, 0x70, 0x86, 0x5b, 0x61, 0xea, + 0x27, 0xb7, 0xc2, 0xe8, 0x3c, 0x48, 0xd1, 0xb1, 0x8d, 0xf6, 0x00, 0xfa, 0x9a, 0xa5, 0xf5, 0xb0, + 0x83, 0x2d, 0xbb, 0x9c, 0xe5, 0x0a, 0x22, 0x62, 0xb2, 0x95, 0x43, 0x5f, 0x94, 0x16, 0x04, 0xa7, + 0x8b, 0x5e, 0xc2, 0x62, 0xdb, 0x34, 0x1c, 0xcb, 0xec, 0x76, 0xb1, 0xa5, 0xb6, 0x89, 0xb6, 0x6a, + 0xe3, 0xb6, 0x85, 0x1d, 0xbb, 0x3c, 0x49, 0x0c, 0x7f, 0x14, 0x6b, 0xb8, 0xea, 0x6b, 0x52, 0x6e, + 0x93, 0xea, 0xd1, 0x51, 0x16, 0xda, 0xd1, 0x5c, 0xf1, 0x33, 0xb8, 0x19, 0xf2, 0x68, 0x9c, 0x3a, + 0x14, 0x3f, 0x87, 0xe5, 0xa4, 0x71, 0xc7, 0xaa, 0xe9, 0x47, 0x30, 0x17, 0x9c, 0x17, 0x2b, 0xc1, + 0x3b, 0x30, 0x49, 0xa3, 0xce, 0xb2, 0xa3, 0xc0, 0x2d, 0x8d, 0xc2, 0x58, 0xd2, 0x1f, 0x33, 0x50, + 0x0a, 0xaf, 0x16, 0xda, 0x84, 0xec, 0x49, 0xd7, 0x6c, 0xbf, 0x60, 0x8a, 0xeb, 0x91, 0x6b, 0x5a, + 0xd9, 0x76, 0x45, 0x28, 0x75, 0x6f, 0x42, 0xa1, 0x1a, 0xae, 0x6a, 0xcf, 0x1c, 0x18, 0x0e, 0x71, + 0x33, 0x56, 0x75, 0xdf, 0x15, 0x19, 0xaa, 0x12, 0x0d, 0xb4, 0x05, 0x05, 0xad, 0xdd, 0xc6, 0xb6, + 0xad, 0xf6, 0xcc, 0x8e, 0x97, 0x8f, 0x6b, 0xd1, 0x06, 0xb6, 0x88, 0xe0, 0xbe, 0xd9, 0xc1, 0x0a, + 0x68, 0xfe, 0x6f, 0xb1, 0x08, 0x05, 0xce, 0x2b, 0x71, 0x17, 0x0a, 0xdc, 0x48, 0x68, 0x01, 0x72, + 0xa7, 0xb6, 0xea, 0x37, 0x80, 0xbc, 0x32, 0x79, 0x6a, 0x93, 0xb2, 0x5e, 0x85, 0x02, 0x71, 0x41, + 0x3d, 0xed, 0x6a, 0x67, 0xb4, 0x57, 0xe5, 0x15, 0x20, 0xa4, 0x27, 0x2e, 0x45, 0xfc, 0xb7, 0x00, + 0x30, 0x1c, 0x12, 0x6d, 0x42, 0x86, 0xb8, 0x48, 0xdb, 0xc8, 0xdd, 0xcb, 0x5c, 0xac, 0x10, 0x3f, + 0x89, 0x8a, 0xf4, 0x27, 0x01, 0x32, 0xc4, 0x46, 0xb8, 0x95, 0x34, 0x6b, 0x8d, 0xdd, 0xba, 0xac, + 0x36, 0x0e, 0x76, 0x64, 0xf5, 0x99, 0x52, 0x6b, 0xc9, 0x4a, 0x49, 0x40, 0x4b, 0xb0, 0xc0, 0xd3, + 0x15, 0x79, 0x6b, 0x47, 0x56, 0xd4, 0x83, 0x46, 0xfd, 0x8b, 0x52, 0x0a, 0x89, 0x30, 0xbf, 0x7f, + 0x54, 0x6f, 0xd5, 0x46, 0x79, 0x69, 0xb4, 0x0c, 0x65, 0x8e, 0xc7, 0x6c, 0x30, 0xb3, 0x19, 0xd7, + 0x2c, 0xc7, 0xa5, 0x3f, 0x19, 0x33, 0xbb, 0x5d, 0xf4, 0x97, 0x81, 0x74, 0xb1, 0x67, 0x50, 0x0c, + 0x74, 0x03, 0x77, 0xb3, 0xb3, 0xf0, 0xcb, 0x81, 0x6e, 0xe1, 0x8e, 0x7a, 0x72, 0xe1, 0x60, 0x9b, + 0x84, 0x21, 0xad, 0x14, 0x3d, 0xea, 0xb6, 0x4b, 0x74, 0x63, 0xda, 0xd5, 0x7b, 0xba, 0xc3, 0x64, + 0x52, 0x44, 0x06, 0x08, 0x89, 0x08, 0x48, 0xdf, 0x0a, 0x30, 0xc9, 0x16, 0xe6, 0x2e, 0xd7, 0x8c, + 0x02, 0x26, 0x3d, 0x2a, 0x35, 0x79, 0x03, 0x52, 0x7a, 0x87, 0xe5, 0x7f, 0x4a, 0xef, 0xa0, 0x47, + 0x00, 0x9a, 0xe3, 0x58, 0xfa, 0xc9, 0xc0, 0x55, 0xa1, 0x3b, 0xea, 0x12, 0xb7, 0x18, 0x95, 0x2d, + 0x9f, 0xcb, 0x7a, 0xc6, 0x50, 0xdc, 0x2d, 0xe0, 0x10, 0x7b, 0xac, 0xa2, 0xfb, 0x43, 0x0a, 0x66, + 0x77, 0x70, 0x17, 0xbf, 0x6e, 0x4f, 0x5e, 0x82, 0x3c, 0x6b, 0xa2, 0xfe, 0x94, 0xa6, 0x28, 0xa1, + 0xd6, 0x09, 0xf5, 0xb3, 0x0e, 0x19, 0xc6, 0xef, 0x67, 0x69, 0xae, 0x9f, 0x45, 0x78, 0xc0, 0xf5, + 0x33, 0xca, 0x8d, 0xeb, 0x67, 0x01, 0x6e, 0xb0, 0x21, 0x8d, 0x2a, 0x8e, 0x15, 0x9b, 0x79, 0x98, + 0x0b, 0x3a, 0xc6, 0xf6, 0xb1, 0xef, 0x32, 0x70, 0x7b, 0x38, 0xc8, 0xe1, 0xe0, 0xa4, 0xab, 0xdb, + 0xcf, 0xaf, 0x21, 0x7c, 0x0b, 0x90, 0x33, 0xcc, 0x0e, 0x61, 0xa5, 0x69, 0x9d, 0xbb, 0x9f, 0xb5, + 0x0e, 0xda, 0x86, 0x99, 0xf0, 0xce, 0x75, 0x51, 0xce, 0x90, 0x71, 0x62, 0xf6, 0xad, 0xd2, 0x79, + 0xb8, 0x37, 0x8a, 0x30, 0x65, 0x61, 0xad, 0x63, 0x1a, 0xdd, 0x8b, 0x72, 0x76, 0x4d, 0xb8, 0x3f, + 0xa5, 0xf8, 0xdf, 0xe8, 0x97, 0x20, 0x72, 0xeb, 0xd6, 0xa7, 0x13, 0x0c, 0x6d, 0x44, 0x5b, 0x74, + 0x23, 0x4a, 0x0c, 0xc3, 0x28, 0x3b, 0xb0, 0x88, 0xe5, 0x76, 0x0c, 0x1b, 0x9d, 0xfa, 0x13, 0xe4, + 0x0a, 0x23, 0x47, 0xc6, 0xdd, 0xbc, 0xca, 0xb8, 0xf4, 0x2b, 0x5c, 0x36, 0x2c, 0x08, 0x43, 0xb2, + 0xf8, 0x14, 0x56, 0x12, 0x5d, 0x1c, 0x6b, 0x2f, 0xac, 0xc2, 0xad, 0xc8, 0x71, 0xc7, 0xca, 0xb9, + 0x6f, 0x05, 0x58, 0x8d, 0x9d, 0x1c, 0xdb, 0x10, 0x7f, 0x02, 0xd3, 0xde, 0x9a, 0xe8, 0xc6, 0xa9, + 0xc9, 0x0e, 0x26, 0x1f, 0x25, 0x07, 0x86, 0xa1, 0x71, 0x46, 0x75, 0x11, 0x3a, 0x0d, 0x4a, 0xa1, + 0x3f, 0xa4, 0x88, 0x8f, 0xa1, 0x14, 0x16, 0x18, 0xcb, 0xfb, 0xef, 0x52, 0xb0, 0x36, 0xf4, 0xe0, + 0xc8, 0xe8, 0xbf, 0xfb, 0xda, 0xf8, 0x8d, 0x00, 0xcb, 0x5c, 0xf2, 0x0e, 0x8c, 0x70, 0xfa, 0x52, + 0x7c, 0x27, 0x87, 0xa2, 0x15, 0xed, 0x6b, 0x94, 0x40, 0x20, 0x85, 0xb9, 0x3a, 0x09, 0x0b, 0x88, + 0xfb, 0xfc, 0x4a, 0x46, 0xaa, 0x8f, 0x15, 0xdb, 0x3b, 0xb0, 0x9e, 0xe0, 0x2e, 0x6b, 0x4d, 0xff, + 0x4a, 0xc1, 0xfa, 0xb1, 0xd6, 0xd5, 0x3b, 0x3e, 0x8c, 0x7a, 0x83, 0xd3, 0x51, 0xf2, 0x0a, 0xc4, + 0xc0, 0xe7, 0xf4, 0xb8, 0xf0, 0x59, 0x8f, 0xaa, 0x75, 0xba, 0x48, 0x9f, 0x52, 0x2b, 0x97, 0xcd, + 0xe7, 0xca, 0xe5, 0xfe, 0x56, 0x2a, 0xf4, 0x67, 0x20, 0x25, 0x79, 0xc4, 0x6a, 0x74, 0x19, 0xf2, + 0xfe, 0xd5, 0x00, 0xb1, 0x3b, 0xa5, 0x0c, 0x09, 0xa8, 0x0c, 0xb9, 0x1e, 0xb6, 0x6d, 0xed, 0xcc, + 0xb3, 0xef, 0x7d, 0x4a, 0xbf, 0x16, 0x00, 0xd5, 0x75, 0x9b, 0x41, 0xbd, 0xb1, 0x57, 0xcc, 0x45, + 0x80, 0xda, 0x2b, 0x15, 0x1b, 0x8e, 0xa5, 0x33, 0xb4, 0x92, 0x55, 0xa0, 0xa7, 0xbd, 0x92, 0x29, + 0xc5, 0x85, 0x28, 0xb6, 0xa3, 0x59, 0x8e, 0x6e, 0x9c, 0xa9, 0x8e, 0xf9, 0x02, 0x1b, 0xac, 0x7c, + 0x8a, 0x1e, 0xb5, 0xe5, 0x12, 0xa5, 0x6f, 0x04, 0x98, 0x0d, 0xb8, 0xc1, 0xa6, 0xf5, 0x10, 0x72, + 0x9e, 0x6d, 0xda, 0x75, 0x6e, 0x13, 0x3f, 0x22, 0x44, 0x2b, 0x74, 0x11, 0x3c, 0x71, 0xb4, 0x02, + 0x60, 0xe0, 0x57, 0x0e, 0x1b, 0x94, 0xce, 0x3a, 0xef, 0x52, 0xc8, 0x80, 0xe2, 0x03, 0xc8, 0xd2, + 0xa5, 0xb8, 0x12, 0xda, 0xff, 0x6d, 0x0a, 0xd0, 0x2e, 0x76, 0x7c, 0x40, 0x37, 0x66, 0x94, 0x62, + 0x52, 0x37, 0x35, 0x6e, 0xea, 0xee, 0x06, 0x4e, 0x7e, 0x34, 0xf3, 0xdf, 0xf7, 0xae, 0x42, 0x42, + 0xce, 0x25, 0x1d, 0xfc, 0xde, 0xf0, 0x14, 0x26, 0xed, 0xc0, 0x6c, 0x60, 0x40, 0xb6, 0x58, 0x1f, + 0x00, 0xd2, 0xce, 0x35, 0xbd, 0xab, 0x9d, 0x74, 0xe9, 0x4c, 0x5d, 0x2e, 0x83, 0xa4, 0x33, 0x3e, + 0xc7, 0x53, 0x93, 0x3e, 0xe7, 0x7b, 0x37, 0xb3, 0xf7, 0xba, 0xf7, 0x2a, 0x3a, 0xdf, 0xac, 0x46, + 0x6c, 0x31, 0xff, 0x76, 0x22, 0xef, 0x56, 0xd6, 0x42, 0x9d, 0x99, 0x5d, 0x63, 0xc4, 0x5e, 0xb3, + 0xfc, 0x3e, 0x05, 0x4b, 0x09, 0xd2, 0xe8, 0x21, 0xa4, 0xad, 0x7e, 0x9b, 0xb9, 0xfb, 0xde, 0x65, + 0xc6, 0x2b, 0xca, 0x61, 0x75, 0x6f, 0x42, 0x71, 0x55, 0xc4, 0xbf, 0x08, 0x90, 0x56, 0x0e, 0xab, + 0xe8, 0xb3, 0xc0, 0x6d, 0xcb, 0xf7, 0xae, 0x62, 0x82, 0xbf, 0x74, 0x31, 0xa3, 0x2e, 0x5d, 0xca, + 0x30, 0x57, 0x55, 0xe4, 0xad, 0x96, 0xac, 0xee, 0xc8, 0x75, 0xb9, 0x25, 0xab, 0xc7, 0x07, 0xf5, + 0xa3, 0x7d, 0xb9, 0x24, 0xb8, 0x47, 0x9e, 0xc3, 0xa3, 0xed, 0x7a, 0xad, 0xb9, 0xa7, 0x1e, 0x35, + 0xbc, 0x5f, 0x8c, 0x9b, 0x42, 0x25, 0x98, 0xae, 0xd7, 0x9a, 0x2d, 0x46, 0x68, 0x96, 0xd2, 0x2e, + 0x65, 0x57, 0x6e, 0xa9, 0xd5, 0xad, 0xc3, 0xad, 0x6a, 0xad, 0xf5, 0x45, 0x29, 0xe3, 0x5f, 0xdc, + 0xfc, 0x39, 0x0b, 0xf3, 0x0d, 0xb3, 0x83, 0x9b, 0x8e, 0x76, 0x76, 0x1d, 0xf0, 0xfe, 0x20, 0x84, + 0x43, 0x68, 0x01, 0x3c, 0x20, 0x96, 0xa2, 0xc7, 0x4d, 0x86, 0x1f, 0xa8, 0x02, 0xb3, 0xb6, 0xa3, + 0x9d, 0x91, 0xde, 0xa4, 0x59, 0x67, 0xd8, 0x51, 0xfb, 0x9a, 0xf3, 0x9c, 0x20, 0xdb, 0xbc, 0x32, + 0xc3, 0x58, 0x2d, 0xc2, 0x39, 0xd4, 0x9c, 0xe7, 0xd1, 0x38, 0x38, 0x3b, 0x1e, 0x0e, 0x56, 0x01, + 0x11, 0x20, 0xe1, 0x5a, 0x0f, 0x5f, 0xb6, 0xfc, 0x30, 0x69, 0x2a, 0x3e, 0x39, 0x00, 0x08, 0x4a, + 0x46, 0x88, 0x8c, 0x7e, 0x1e, 0x8f, 0x65, 0x13, 0xed, 0x5f, 0x75, 0x53, 0x7b, 0x43, 0xcc, 0xe6, + 0x6e, 0x8a, 0x91, 0x53, 0x79, 0xf7, 0xd8, 0x77, 0x11, 0x16, 0x46, 0x62, 0xc1, 0x70, 0xcd, 0xef, + 0x04, 0x28, 0xbb, 0xbc, 0x23, 0xc3, 0xbe, 0xa6, 0x64, 0x8e, 0xc9, 0xbd, 0x74, 0x4c, 0xee, 0x49, + 0x4b, 0xb0, 0x18, 0xe1, 0x10, 0x73, 0xf7, 0xbf, 0x59, 0xea, 0xee, 0xf5, 0x9d, 0x0d, 0x7f, 0x1c, + 0x59, 0x7b, 0x15, 0x3f, 0xa1, 0x22, 0x8f, 0x45, 0x6f, 0xb7, 0xfa, 0x56, 0xa1, 0xc0, 0xcb, 0x65, + 0x89, 0x1c, 0x38, 0x97, 0x94, 0xe7, 0xe4, 0xeb, 0x1f, 0x53, 0x73, 0xa1, 0x63, 0xea, 0x19, 0xcc, + 0x91, 0xd2, 0x0d, 0x23, 0xfc, 0x29, 0xee, 0x3c, 0x14, 0x1b, 0x0b, 0x8e, 0x11, 0x28, 0x60, 0xd2, + 0x0d, 0x42, 0xc7, 0xd1, 0xaf, 0xa3, 0x4a, 0x38, 0x4f, 0x46, 0xf9, 0x30, 0x79, 0x94, 0x77, 0x55, + 0xc4, 0x32, 0x2d, 0x9d, 0xff, 0x8b, 0x23, 0x2c, 0xab, 0x8c, 0xc8, 0xf3, 0xa7, 0xf4, 0x2b, 0x01, + 0x44, 0x5a, 0x37, 0xd7, 0x77, 0x36, 0x0c, 0x25, 0x66, 0x3a, 0x9c, 0x98, 0xd2, 0x0a, 0x2c, 0x45, + 0xfa, 0xc0, 0x7c, 0xfc, 0x04, 0x4a, 0x2e, 0x7b, 0x17, 0x3b, 0xb5, 0xce, 0xb8, 0xc0, 0xe7, 0x01, + 0xcc, 0x70, 0xba, 0x0c, 0xe8, 0x70, 0x87, 0x55, 0x81, 0x3f, 0xac, 0x4a, 0x3b, 0x34, 0x18, 0x6f, + 0x08, 0xb6, 0xbe, 0xa2, 0xd3, 0x89, 0x83, 0x59, 0x8f, 0x43, 0x30, 0x8b, 0x02, 0x77, 0x71, 0xb8, + 0xf7, 0x5c, 0x02, 0xb0, 0xfe, 0x2a, 0xb0, 0x1d, 0x62, 0x04, 0x5a, 0x6d, 0xf0, 0xd0, 0xea, 0x76, + 0xbc, 0x41, 0x1e, 0x54, 0xf5, 0x28, 0xa6, 0xfa, 0x51, 0x00, 0x53, 0xdd, 0x49, 0xd6, 0xe5, 0xd1, + 0xd4, 0x07, 0x31, 0x68, 0xaa, 0xd9, 0xda, 0xda, 0x95, 0xd5, 0xa3, 0x06, 0xfd, 0xeb, 0xa1, 0x29, + 0x0f, 0x0b, 0x6d, 0xfc, 0x3d, 0x05, 0x53, 0xb5, 0x0e, 0x36, 0x1c, 0xd7, 0xef, 0xaf, 0xc8, 0xab, + 0xea, 0xc8, 0xfb, 0x2f, 0x5a, 0xf3, 0xb0, 0x7b, 0xdc, 0xcb, 0xb1, 0xb8, 0x9e, 0x20, 0xc1, 0xb2, + 0x67, 0x02, 0xed, 0x41, 0x31, 0xf0, 0x14, 0x8a, 0x16, 0xa3, 0x9e, 0x47, 0xa9, 0x41, 0x31, 0xfe, + 0xe5, 0x54, 0x9a, 0x40, 0x5f, 0x73, 0xaf, 0xb7, 0x81, 0x93, 0xc7, 0x7a, 0x50, 0x2d, 0x22, 0x7b, + 0x44, 0x29, 0x49, 0xc4, 0x1f, 0xe1, 0x07, 0x90, 0x25, 0x8f, 0x74, 0x68, 0x86, 0x3e, 0x22, 0x72, + 0x0f, 0x7d, 0x22, 0xe2, 0x49, 0x9e, 0xc6, 0xc6, 0x3f, 0xb3, 0x00, 0x43, 0xf4, 0x8b, 0x64, 0x98, + 0xe6, 0x5f, 0x6d, 0x50, 0x39, 0xee, 0x81, 0x4a, 0x5c, 0x8c, 0xe0, 0xf8, 0x7e, 0xc8, 0x30, 0xcd, + 0xdf, 0xb5, 0x32, 0x33, 0x11, 0xf7, 0xc2, 0xcc, 0x4c, 0xe4, 0xc5, 0xec, 0x04, 0x3a, 0x85, 0x85, + 0x98, 0x1b, 0x30, 0x74, 0xe7, 0x0a, 0x17, 0x87, 0xe2, 0x7b, 0x57, 0xb9, 0x44, 0x93, 0x26, 0x50, + 0x17, 0x16, 0x63, 0x2f, 0x63, 0xd0, 0xdd, 0x2b, 0xdd, 0x2d, 0x89, 0xf7, 0x2e, 0x13, 0xf3, 0x47, + 0x33, 0x41, 0x8c, 0xbf, 0x72, 0x40, 0xf7, 0xae, 0x76, 0x4b, 0x22, 0xbe, 0x7f, 0xa9, 0x9c, 0x3f, + 0xe0, 0x36, 0x14, 0xb8, 0x23, 0x3d, 0x5a, 0x18, 0x3d, 0xe4, 0x53, 0x93, 0xe5, 0xb8, 0xd3, 0x3f, + 0xb5, 0xc1, 0x1d, 0x4a, 0x99, 0x8d, 0xd1, 0x73, 0x31, 0xb3, 0x11, 0x71, 0x7e, 0x0d, 0x87, 0x39, + 0xd4, 0xdf, 0x46, 0xc2, 0x1c, 0xdd, 0x45, 0x47, 0xc2, 0x1c, 0xd3, 0x26, 0xa5, 0x89, 0x8d, 0xff, + 0xa4, 0x21, 0xe3, 0xf6, 0x20, 0xd4, 0x80, 0x9b, 0x21, 0x20, 0x8a, 0x96, 0x12, 0xa0, 0xba, 0xb8, + 0x1c, 0xcd, 0xf4, 0xa7, 0xd1, 0xa2, 0x9b, 0x42, 0x00, 0x2b, 0xa2, 0x15, 0x5f, 0x29, 0x0a, 0xd4, + 0x8a, 0xb7, 0xe3, 0xd8, 0x61, 0xab, 0xc1, 0x2c, 0x5f, 0x49, 0xc4, 0x23, 0x9c, 0xd5, 0xb8, 0xcc, + 0xfe, 0x12, 0x66, 0x23, 0xf6, 0x46, 0xb4, 0xca, 0xb9, 0x13, 0x99, 0xcd, 0x6b, 0xf1, 0x02, 0xbe, + 0xed, 0x4f, 0x21, 0xef, 0x6f, 0x8e, 0xe8, 0x96, 0xaf, 0xc0, 0x6f, 0xb4, 0xe2, 0x7c, 0x98, 0x1c, + 0xf6, 0x2c, 0x9c, 0x06, 0xab, 0xbc, 0x42, 0x54, 0x02, 0xac, 0xc5, 0x0b, 0x78, 0xb6, 0x4f, 0x26, + 0xc9, 0x3f, 0x0f, 0x7d, 0xf8, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x79, 0xc2, 0x03, 0xd6, 0x49, + 0x24, 0x00, 0x00, } diff --git a/spec.md b/spec.md index a73169f6..267e1d49 100644 --- a/spec.md +++ b/spec.md @@ -648,18 +648,24 @@ message CreateVolumeRequest { // validating these parameters. COs will treat these as opaque. map parameters = 5; - // Credentials used by Controller plugin to authenticate/authorize - // volume creation request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete volume creation request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map controller_create_credentials = 6; + map controller_create_secrets = 6; } message CreateVolumeResponse { @@ -802,18 +808,24 @@ message DeleteVolumeRequest { // This field is REQUIRED. string volume_id = 2; - // Credentials used by Controller plugin to authenticate/authorize - // volume deletion request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete volume deletion request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map controller_delete_credentials = 3; + map controller_delete_secrets = 3; } message DeleteVolumeResponse {} @@ -867,18 +879,25 @@ message ControllerPublishVolumeRequest { // REQUIRED. bool readonly = 5; - // Credentials used by Controller plugin to authenticate/authorize - // controller publish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete controller publish volume + // request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map controller_publish_credentials = 6; + map controller_publish_secrets = 6; // Attributes of the volume to be used on a node. This field is // OPTIONAL and MUST match the attributes of the Volume identified @@ -940,18 +959,27 @@ message ControllerUnpublishVolumeRequest { // the volume from all nodes it is published to. string node_id = 3; - // Credentials used by Controller plugin to authenticate/authorize - // controller unpublish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete controller unpublish volume + // request. This SHOULD be the same secrets passed to the + // ControllerPublishVolume. + // call for the specified volume. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map controller_unpublish_credentials = 4; + map controller_unpublish_secrets = 4; } message ControllerUnpublishVolumeResponse {} @@ -1211,18 +1239,24 @@ message NodeStageVolumeRequest { // This is a REQUIRED field. VolumeCapability volume_capability = 5; - // Credentials used by Node plugin to authenticate/authorize node - // stage request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete node stage volume request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map node_stage_credentials = 6; + map node_stage_secrets = 6; // Attributes of the volume to publish. This field is OPTIONAL and // MUST match the attributes of the VolumeInfo identified by @@ -1278,19 +1312,6 @@ message NodeUnstageVolumeRequest { // path in the root filesystem of the process serving this request. // This is a REQUIRED field. string staging_target_path = 3; - - // Credentials used by Node plugin to authenticate/authorize node - // unstage request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. - // This field is OPTIONAL. - map node_unstage_credentials = 4; } message NodeUnstageVolumeResponse {} @@ -1336,7 +1357,7 @@ The following table shows what the Plugin SHOULD return when receiving a second | MULTI_NODE | OK (idempotent) | ALREADY_EXISTS | OK | OK | | Non MULTI_NODE | OK (idempotent) | ALREADY_EXISTS | FAILED_PRECONDITION | FAILED_PRECONDITION| -(`Tn`: target path of the n-th `NodePublishVolume`, `Pn`: other arguments of the n-th `NodePublishVolume` except `node_credentials`) +(`Tn`: target path of the n-th `NodePublishVolume`, `Pn`: other arguments of the n-th `NodePublishVolume` except `node_publish_secrets`) ```protobuf message NodePublishVolumeRequest { @@ -1377,19 +1398,24 @@ message NodePublishVolumeRequest { // REQUIRED. bool readonly = 7; - // Credentials used by Node plugin to authenticate/authorize node - // publish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. + // Secrets required by plugin to complete node publish volume request. + // A secret is a string to string map where the key identifies the + // name of the secret (e.g. "username" or "password"), and the value + // contains the secret data (e.g. "bob" or "abc123"). + // Each key MUST consist of alphanumeric characters, '-', '_' or '.'. + // Each value MUST contain a valid string. An SP MAY choose to accept + // binary (non-string) data by using a binary-to-text encoding scheme, + // like base64. + // An SP SHALL advertise the requirements for required secret keys and + // values in documentation. + // CO SHALL permit passing through the required secrets. + // A CO MAY pass the same secrets to all RPCs, therefore the keys for + // all unique secrets that an SP expects must be unique across all CSI + // operations. + // This information is sensitive and MUST be treated as such (not + // logged, etc.) by the CO. // This field is OPTIONAL. - map node_publish_credentials = 8; - + map node_publish_secrets = 8; // Attributes of the volume to publish. This field is OPTIONAL and // MUST match the attributes of the Volume identified by @@ -1441,19 +1467,6 @@ message NodeUnpublishVolumeRequest { // path in the root filesystem of the process serving this request. // This is a REQUIRED field. string target_path = 3; - - // Credentials used by Node plugin to authenticate/authorize node - // unpublish request. - // This field contains credential data, for example username and - // password. Each key must consist of alphanumeric characters, '-', - // '_' or '.'. Each value MUST contain a valid string. An SP MAY - // choose to accept binary (non-string) data by using a binary-to-text - // encoding scheme, like base64. An SP SHALL advertise the - // requirements for credentials in documentation. COs SHALL permit - // passing through the required credentials. This information is - // sensitive and MUST be treated as such (not logged, etc.) by the CO. - // This field is OPTIONAL. - map node_unpublish_credentials = 4; } message NodeUnpublishVolumeResponse {} @@ -1636,7 +1649,7 @@ Supervised plugins MAY be isolated and/or resource-bounded. * Logging configuration flags and/or variables, including working sample configurations. * Default log destination(s) (where do the logs go if no configuration is specified?) * Log lifecycle management ownership and related guidance (size limits, rate limits, rolling, archiving, expunging, etc.) applicable to the logging mechanism embedded within the Plugin. -* Plugins SHOULD NOT write potentially sensitive data to logs (e.g. `Credentials`). +* Plugins SHOULD NOT write potentially sensitive data to logs (e.g. secrets). ##### Available Services