spec: simplify names of secrets fields

Author: James DeFelice

csi.proto

@@ -218,8 +218,7 @@ message CreateVolumeRequest {
   // Secrets required by plugin to complete volume creation request.
   // This field is OPTIONAL. Refer to the `Secrets Requirements`
   // section on how to use this field.
-  map<string, string> controller_create_secrets = 5
-    [(csi_secret) = true];
+  map<string, string> secrets = 5 [(csi_secret) = true];
 
   // If specified, the new volume will be pre-populated with data from
   // this source. This field is OPTIONAL.
@@ -573,8 +572,7 @@ message DeleteVolumeRequest {
   // Secrets required by plugin to complete volume deletion request.
   // This field is OPTIONAL. Refer to the `Secrets Requirements`
   // section on how to use this field.
-  map<string, string> controller_delete_secrets = 2
-    [(csi_secret) = true];
+  map<string, string> secrets = 2 [(csi_secret) = true];
 }
 
 message DeleteVolumeResponse {
@@ -602,8 +600,7 @@ message ControllerPublishVolumeRequest {
   // Secrets required by plugin to complete controller publish volume
   // request. This field is OPTIONAL. Refer to the
   // `Secrets Requirements` section on how to use this field.
-  map<string, string> controller_publish_secrets = 5
-    [(csi_secret) = true];
+  map<string, string> secrets = 5 [(csi_secret) = true];
 
   // Attributes of the volume to be used on a node. This field is
   // OPTIONAL and MUST match the attributes of the Volume identified
@@ -634,8 +631,7 @@ message ControllerUnpublishVolumeRequest {
   // ControllerPublishVolume call for the specified volume.
   // This field is OPTIONAL. Refer to the `Secrets Requirements`
   // section on how to use this field.
-  map<string, string> controller_unpublish_secrets = 3
-    [(csi_secret) = true];
+  map<string, string> secrets = 3 [(csi_secret) = true];
 }
 
 message ControllerUnpublishVolumeResponse {
@@ -661,8 +657,7 @@ message ValidateVolumeCapabilitiesRequest {
   // Secrets required by plugin to complete volume validation request.
   // This field is OPTIONAL. Refer to the `Secrets Requirements`
   // section on how to use this field.
-  map<string, string> controller_validate_secrets = 5
-    [(csi_secret) = true];
+  map<string, string> secrets = 5 [(csi_secret) = true];
 }
 
 message ValidateVolumeCapabilitiesResponse {
@@ -819,7 +814,7 @@ message CreateSnapshotRequest {
   // Secrets required by plugin to complete snapshot creation request.
   // This field is OPTIONAL. Refer to the `Secrets Requirements`
   // section on how to use this field.
-  map<string, string> create_snapshot_secrets = 3 [(csi_secret) = true];
+  map<string, string> secrets = 3 [(csi_secret) = true];
 
   // Plugin specific parameters passed in as opaque key-value pairs.
   // This field is OPTIONAL. The Plugin is responsible for parsing and
@@ -883,7 +878,7 @@ message DeleteSnapshotRequest {
   // Secrets required by plugin to complete snapshot deletion request.
   // This field is OPTIONAL. Refer to the `Secrets Requirements`
   // section on how to use this field.
-  map<string, string> delete_snapshot_secrets = 2 [(csi_secret) = true];
+  map<string, string> secrets = 2 [(csi_secret) = true];
 }
 
 message DeleteSnapshotResponse {}
@@ -958,7 +953,7 @@ message NodeStageVolumeRequest {
   // Secrets required by plugin to complete node stage volume request.
   // This field is OPTIONAL. Refer to the `Secrets Requirements`
   // section on how to use this field.
-  map<string, string> node_stage_secrets = 5 [(csi_secret) = true];
+  map<string, string> secrets = 5 [(csi_secret) = true];
 
   // Attributes of the volume to publish. This field is OPTIONAL and
   // MUST match the attributes of the `Volume` identified by
@@ -1020,7 +1015,7 @@ message NodePublishVolumeRequest {
   // Secrets required by plugin to complete node publish volume request.
   // This field is OPTIONAL. Refer to the `Secrets Requirements`
   // section on how to use this field.
-  map<string, string> node_publish_secrets = 7 [(csi_secret) = true];
+  map<string, string> secrets = 7 [(csi_secret) = true];
 
   // Attributes of the volume to publish. This field is OPTIONAL and
   // MUST match the attributes of the Volume identified by