From 32aae4c7b0a4ce671c9f8fa8283186af35d0aa71 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 19 May 2021 22:02:04 +0000
Subject: [PATCH 01/22] WIP disk api changes

---
 CONTRIBUTING.md                               |   2 +-
 README.md                                     |   3 +
 client/api/disk/v1beta3/api.pb.go             | 503 +++++++++---------
 client/api/disk/v1beta3/api.proto             |  82 +--
 .../groups/disk/v1beta3/client_generated.go   |  12 +-
 docs/CSI-Proxy.png                            | Bin 0 -> 57158 bytes
 docs/DEVELOPMENT.md                           |  92 ++++
 .../client/dummy/v1/client_generated.go       |   2 +-
 .../server/dummy/api_group_generated.go       |   2 +-
 .../dummy/internal/v1/server_generated.go     |   2 +-
 internal/os/disk/api.go                       | 109 ++--
 internal/server/disk/internal/types.go        |  39 +-
 .../server/disk/internal/types_generated.go   |   3 +
 .../disk/internal/v1alpha1/conversion.go      |  40 +-
 .../internal/v1alpha1/conversion_generated.go |  17 +-
 .../disk/internal/v1beta1/conversion.go       |  88 +--
 .../internal/v1beta1/conversion_generated.go  |  54 +-
 .../disk/internal/v1beta2/conversion.go       |  88 +--
 .../internal/v1beta2/conversion_generated.go  |  54 +-
 .../disk/internal/v1beta3/conversion.go       |  86 ++-
 .../internal/v1beta3/conversion_generated.go  | 158 +++---
 .../disk/internal/v1beta3/server_generated.go |  36 +-
 internal/server/disk/server.go                |  82 ++-
 .../client/api/disk/v1beta3/api.pb.go         | 503 +++++++++---------
 .../client/api/disk/v1beta3/api.proto         |  82 +--
 .../groups/disk/v1beta3/client_generated.go   |  12 +-
 26 files changed, 1138 insertions(+), 1013 deletions(-)
 create mode 100644 docs/CSI-Proxy.png
 create mode 100644 docs/DEVELOPMENT.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d4f6a705..c5c27cbf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ _As contributors and maintainers of this project, and in the interest of fosteri
 
 ## Getting Started
 
-We have full documentation on how to get started contributing here:
+We have full documentation on how to get started contributing here: [Development.md](./docs/DEVELOPMENT.md)
 
 <!---
 If your repo has certain guidelines for contribution, put them here ahead of the general k8s resources
diff --git a/README.md b/README.md
index f87ec49c..60c5cacc 100644
--- a/README.md
+++ b/README.md
@@ -192,6 +192,9 @@ You can reach the maintainers of this project at:
 
 - [Google Compute Engine Persistent Disk CSI Driver](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver)
 
+### Development
+
+See [Development.md](./docs/DEVELOPMENT.md)
 
 ### Code of conduct
 
diff --git a/client/api/disk/v1beta3/api.pb.go b/client/api/disk/v1beta3/api.pb.go
index 8e9a8de4..7f7ca84e 100644
--- a/client/api/disk/v1beta3/api.pb.go
+++ b/client/api/disk/v1beta3/api.pb.go
@@ -138,8 +138,8 @@ type ListDiskLocationsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of disk device IDs and <adapter, bus, target, lun ID> associated with each disk device
-	DiskLocations map[string]*DiskLocation `protobuf:"bytes,1,rep,name=disk_locations,json=diskLocations,proto3" json:"disk_locations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Map of disk device number and <adapter, bus, target, lun ID> associated with each disk device.
+	DiskLocations map[uint32]*DiskLocation `protobuf:"bytes,1,rep,name=disk_locations,json=diskLocations,proto3" json:"disk_locations,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *ListDiskLocationsResponse) Reset() {
@@ -174,7 +174,7 @@ func (*ListDiskLocationsResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *ListDiskLocationsResponse) GetDiskLocations() map[string]*DiskLocation {
+func (x *ListDiskLocationsResponse) GetDiskLocations() map[uint32]*DiskLocation {
 	if x != nil {
 		return x.DiskLocations
 	}
@@ -186,8 +186,8 @@ type PartitionDiskRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Disk device ID of the disk to partition
-	DiskID string `protobuf:"bytes,1,opt,name=diskID,proto3" json:"diskID,omitempty"`
+	// Disk device number of the disk to partition.
+	DiskNumber uint32 `protobuf:"varint,1,opt,name=disk_number,json=diskNumber,proto3" json:"disk_number,omitempty"`
 }
 
 func (x *PartitionDiskRequest) Reset() {
@@ -222,11 +222,11 @@ func (*PartitionDiskRequest) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *PartitionDiskRequest) GetDiskID() string {
+func (x *PartitionDiskRequest) GetDiskNumber() uint32 {
 	if x != nil {
-		return x.DiskID
+		return x.DiskNumber
 	}
-	return ""
+	return 0
 }
 
 type PartitionDiskResponse struct {
@@ -386,7 +386,7 @@ type DiskIDs struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of Disk ID types and Disk ID values
+	// Map of Disk ID types and Disk ID values.
 	Identifiers map[string]string `protobuf:"bytes,1,rep,name=identifiers,proto3" json:"identifiers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
@@ -434,8 +434,8 @@ type ListDiskIDsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of disk device numbers and IDs <page83> associated with each disk device
-	DiskIDs map[string]*DiskIDs `protobuf:"bytes,1,rep,name=diskIDs,proto3" json:"diskIDs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Map of disk device numbers and IDs <page83> associated with each disk device.
+	DiskIds map[uint32]*DiskIDs `protobuf:"bytes,1,rep,name=disk_ids,json=diskIds,proto3" json:"disk_ids,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *ListDiskIDsResponse) Reset() {
@@ -470,24 +470,24 @@ func (*ListDiskIDsResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *ListDiskIDsResponse) GetDiskIDs() map[string]*DiskIDs {
+func (x *ListDiskIDsResponse) GetDiskIds() map[uint32]*DiskIDs {
 	if x != nil {
-		return x.DiskIDs
+		return x.DiskIds
 	}
 	return nil
 }
 
-type DiskStatsRequest struct {
+type GetDiskStatsRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Disk device ID of the disk to get the size from
-	DiskID string `protobuf:"bytes,1,opt,name=diskID,proto3" json:"diskID,omitempty"`
+	// Disk device number of the disk to get the stats from.
+	DiskNumber uint32 `protobuf:"varint,1,opt,name=disk_number,json=diskNumber,proto3" json:"disk_number,omitempty"`
 }
 
-func (x *DiskStatsRequest) Reset() {
-	*x = DiskStatsRequest{}
+func (x *GetDiskStatsRequest) Reset() {
+	*x = GetDiskStatsRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -495,13 +495,13 @@ func (x *DiskStatsRequest) Reset() {
 	}
 }
 
-func (x *DiskStatsRequest) String() string {
+func (x *GetDiskStatsRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DiskStatsRequest) ProtoMessage() {}
+func (*GetDiskStatsRequest) ProtoMessage() {}
 
-func (x *DiskStatsRequest) ProtoReflect() protoreflect.Message {
+func (x *GetDiskStatsRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -513,29 +513,29 @@ func (x *DiskStatsRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DiskStatsRequest.ProtoReflect.Descriptor instead.
-func (*DiskStatsRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetDiskStatsRequest.ProtoReflect.Descriptor instead.
+func (*GetDiskStatsRequest) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *DiskStatsRequest) GetDiskID() string {
+func (x *GetDiskStatsRequest) GetDiskNumber() uint32 {
 	if x != nil {
-		return x.DiskID
+		return x.DiskNumber
 	}
-	return ""
+	return 0
 }
 
-type DiskStatsResponse struct {
+type GetDiskStatsResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	//Total size of the volume
-	DiskSize int64 `protobuf:"varint,1,opt,name=diskSize,proto3" json:"diskSize,omitempty"`
+	// Total size of the volume.
+	TotalBytes int64 `protobuf:"varint,1,opt,name=total_bytes,json=totalBytes,proto3" json:"total_bytes,omitempty"`
 }
 
-func (x *DiskStatsResponse) Reset() {
-	*x = DiskStatsResponse{}
+func (x *GetDiskStatsResponse) Reset() {
+	*x = GetDiskStatsResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -543,13 +543,13 @@ func (x *DiskStatsResponse) Reset() {
 	}
 }
 
-func (x *DiskStatsResponse) String() string {
+func (x *GetDiskStatsResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DiskStatsResponse) ProtoMessage() {}
+func (*GetDiskStatsResponse) ProtoMessage() {}
 
-func (x *DiskStatsResponse) ProtoReflect() protoreflect.Message {
+func (x *GetDiskStatsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -561,31 +561,31 @@ func (x *DiskStatsResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DiskStatsResponse.ProtoReflect.Descriptor instead.
-func (*DiskStatsResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetDiskStatsResponse.ProtoReflect.Descriptor instead.
+func (*GetDiskStatsResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{11}
 }
 
-func (x *DiskStatsResponse) GetDiskSize() int64 {
+func (x *GetDiskStatsResponse) GetTotalBytes() int64 {
 	if x != nil {
-		return x.DiskSize
+		return x.TotalBytes
 	}
 	return 0
 }
 
-type SetAttachStateRequest struct {
+type SetDiskStateRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Disk device ID (number) of the disk which state will change
-	DiskID string `protobuf:"bytes,1,opt,name=diskID,proto3" json:"diskID,omitempty"`
-	// Online state to set for the disk. true for online, false for offline
-	IsOnline bool `protobuf:"varint,2,opt,name=isOnline,proto3" json:"isOnline,omitempty"`
+	// Disk device number of the disk.
+	DiskNumber uint32 `protobuf:"varint,1,opt,name=disk_number,json=diskNumber,proto3" json:"disk_number,omitempty"`
+	// Online state to set for the disk. true for online, false for offline.
+	IsOnline bool `protobuf:"varint,2,opt,name=is_online,json=isOnline,proto3" json:"is_online,omitempty"`
 }
 
-func (x *SetAttachStateRequest) Reset() {
-	*x = SetAttachStateRequest{}
+func (x *SetDiskStateRequest) Reset() {
+	*x = SetDiskStateRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -593,13 +593,13 @@ func (x *SetAttachStateRequest) Reset() {
 	}
 }
 
-func (x *SetAttachStateRequest) String() string {
+func (x *SetDiskStateRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SetAttachStateRequest) ProtoMessage() {}
+func (*SetDiskStateRequest) ProtoMessage() {}
 
-func (x *SetAttachStateRequest) ProtoReflect() protoreflect.Message {
+func (x *SetDiskStateRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -611,33 +611,33 @@ func (x *SetAttachStateRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SetAttachStateRequest.ProtoReflect.Descriptor instead.
-func (*SetAttachStateRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use SetDiskStateRequest.ProtoReflect.Descriptor instead.
+func (*SetDiskStateRequest) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *SetAttachStateRequest) GetDiskID() string {
+func (x *SetDiskStateRequest) GetDiskNumber() uint32 {
 	if x != nil {
-		return x.DiskID
+		return x.DiskNumber
 	}
-	return ""
+	return 0
 }
 
-func (x *SetAttachStateRequest) GetIsOnline() bool {
+func (x *SetDiskStateRequest) GetIsOnline() bool {
 	if x != nil {
 		return x.IsOnline
 	}
 	return false
 }
 
-type SetAttachStateResponse struct {
+type SetDiskStateResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *SetAttachStateResponse) Reset() {
-	*x = SetAttachStateResponse{}
+func (x *SetDiskStateResponse) Reset() {
+	*x = SetDiskStateResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -645,13 +645,13 @@ func (x *SetAttachStateResponse) Reset() {
 	}
 }
 
-func (x *SetAttachStateResponse) String() string {
+func (x *SetDiskStateResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SetAttachStateResponse) ProtoMessage() {}
+func (*SetDiskStateResponse) ProtoMessage() {}
 
-func (x *SetAttachStateResponse) ProtoReflect() protoreflect.Message {
+func (x *SetDiskStateResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -663,22 +663,22 @@ func (x *SetAttachStateResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SetAttachStateResponse.ProtoReflect.Descriptor instead.
-func (*SetAttachStateResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use SetDiskStateResponse.ProtoReflect.Descriptor instead.
+func (*SetDiskStateResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{13}
 }
 
-type GetAttachStateRequest struct {
+type GetDiskStateRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Disk device ID (number) of the disk
-	DiskID string `protobuf:"bytes,1,opt,name=diskID,proto3" json:"diskID,omitempty"`
+	// Disk device number of the disk.
+	DiskNumber uint32 `protobuf:"varint,1,opt,name=disk_number,json=diskNumber,proto3" json:"disk_number,omitempty"`
 }
 
-func (x *GetAttachStateRequest) Reset() {
-	*x = GetAttachStateRequest{}
+func (x *GetDiskStateRequest) Reset() {
+	*x = GetDiskStateRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -686,13 +686,13 @@ func (x *GetAttachStateRequest) Reset() {
 	}
 }
 
-func (x *GetAttachStateRequest) String() string {
+func (x *GetDiskStateRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetAttachStateRequest) ProtoMessage() {}
+func (*GetDiskStateRequest) ProtoMessage() {}
 
-func (x *GetAttachStateRequest) ProtoReflect() protoreflect.Message {
+func (x *GetDiskStateRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -704,29 +704,29 @@ func (x *GetAttachStateRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetAttachStateRequest.ProtoReflect.Descriptor instead.
-func (*GetAttachStateRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetDiskStateRequest.ProtoReflect.Descriptor instead.
+func (*GetDiskStateRequest) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{14}
 }
 
-func (x *GetAttachStateRequest) GetDiskID() string {
+func (x *GetDiskStateRequest) GetDiskNumber() uint32 {
 	if x != nil {
-		return x.DiskID
+		return x.DiskNumber
 	}
-	return ""
+	return 0
 }
 
-type GetAttachStateResponse struct {
+type GetDiskStateResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Online state of the disk. true for online, false for offline
-	IsOnline bool `protobuf:"varint,1,opt,name=isOnline,proto3" json:"isOnline,omitempty"`
+	// Online state of the disk. true for online, false for offline.
+	IsOnline bool `protobuf:"varint,1,opt,name=is_online,json=isOnline,proto3" json:"is_online,omitempty"`
 }
 
-func (x *GetAttachStateResponse) Reset() {
-	*x = GetAttachStateResponse{}
+func (x *GetDiskStateResponse) Reset() {
+	*x = GetDiskStateResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -734,13 +734,13 @@ func (x *GetAttachStateResponse) Reset() {
 	}
 }
 
-func (x *GetAttachStateResponse) String() string {
+func (x *GetDiskStateResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetAttachStateResponse) ProtoMessage() {}
+func (*GetDiskStateResponse) ProtoMessage() {}
 
-func (x *GetAttachStateResponse) ProtoReflect() protoreflect.Message {
+func (x *GetDiskStateResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -752,12 +752,12 @@ func (x *GetAttachStateResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetAttachStateResponse.ProtoReflect.Descriptor instead.
-func (*GetAttachStateResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetDiskStateResponse.ProtoReflect.Descriptor instead.
+func (*GetDiskStateResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{15}
 }
 
-func (x *GetAttachStateResponse) GetIsOnline() bool {
+func (x *GetDiskStateResponse) GetIsOnline() bool {
 	if x != nil {
 		return x.IsOnline
 	}
@@ -790,96 +790,99 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_r
 	0x74, 0x72, 0x79, 0x52, 0x0d, 0x64, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x73, 0x1a, 0x57, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
 	0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2b, 0x0a, 0x05, 0x76, 0x61,
+	0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2b, 0x0a, 0x05, 0x76, 0x61,
 	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x76, 0x31, 0x62, 0x65,
 	0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2e, 0x0a, 0x14, 0x50,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x37, 0x0a, 0x14, 0x50,
 	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x22, 0x17, 0x0a, 0x15, 0x50,
-	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x10, 0x0a, 0x0e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x44,
-	0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x8e, 0x01,
-	0x0a, 0x07, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x12, 0x43, 0x0a, 0x0b, 0x69, 0x64, 0x65,
-	0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73,
-	0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x0b, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x1a, 0x3e,
-	0x0a, 0x10, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa8,
-	0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x1a, 0x4c, 0x0a, 0x0c, 0x44,
-	0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76,
-	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2a, 0x0a, 0x10, 0x44, 0x69, 0x73,
-	0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a,
-	0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64,
-	0x69, 0x73, 0x6b, 0x49, 0x44, 0x22, 0x2f, 0x0a, 0x11, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61,
-	0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69,
-	0x73, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x69,
-	0x73, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x4b, 0x0a, 0x15, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74,
-	0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x16, 0x0a, 0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x22, 0x18, 0x0a, 0x16, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x0a,
-	0x15, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x22, 0x34,
-	0x0a, 0x16, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x4f, 0x6e,
-	0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e,
-	0x6c, 0x69, 0x6e, 0x65, 0x32, 0xaf, 0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c, 0x0a,
-	0x11, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73,
-	0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
-	0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d, 0x50,
-	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e, 0x76,
-	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76, 0x31,
-	0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44,
-	0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b, 0x0a,
-	0x06, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x17, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c, 0x69,
-	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62, 0x65,
-	0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x44, 0x0a, 0x09, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74,
-	0x61, 0x74, 0x73, 0x12, 0x19, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69,
-	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61,
-	0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x0e,
-	0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1e,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61,
-	0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61,
-	0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x53, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x12, 0x1e, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65,
-	0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65,
-	0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d,
-	0x63, 0x73, 0x69, 0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c,
-	0x69, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31,
-	0x62, 0x65, 0x74, 0x61, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62,
+	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75,
+	0x6d, 0x62, 0x65, 0x72, 0x22, 0x17, 0x0a, 0x15, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x0f, 0x0a,
+	0x0d, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x10,
+	0x0a, 0x0e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x14, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x8e, 0x01, 0x0a, 0x07, 0x44, 0x69, 0x73, 0x6b, 0x49,
+	0x44, 0x73, 0x12, 0x43, 0x0a, 0x0b, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x69, 0x64, 0x65, 0x6e,
+	0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x1a, 0x3e, 0x0a, 0x10, 0x49, 0x64, 0x65, 0x6e, 0x74,
+	0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa9, 0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x44, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
+	0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x69,
+	0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x4c, 0x0a, 0x0c, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74,
+	0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69,
+	0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
+	0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x37, 0x0a, 0x14, 0x47,
+	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74,
+	0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42,
+	0x79, 0x74, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x13, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64,
+	0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09,
+	0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x65, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b,
+	0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64,
+	0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x33, 0x0a, 0x14, 0x47, 0x65, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x32, 0xac,
+	0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x44,
+	0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76,
+	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c,
+	0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69,
+	0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
+	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x63, 0x61,
+	0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63,
+	0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x76, 0x31, 0x62, 0x65,
+	0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69,
+	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44,
+	0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73,
+	0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69,
+	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d,
+	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
+	0x4d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12,
+	0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73,
+	0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e,
+	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d,
+	0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c,
+	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76,
+	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a,
+	0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65,
+	0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d, 0x63, 0x73, 0x69, 0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -906,36 +909,36 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_g
 	(*ListDiskIDsRequest)(nil),        // 7: v1beta3.ListDiskIDsRequest
 	(*DiskIDs)(nil),                   // 8: v1beta3.DiskIDs
 	(*ListDiskIDsResponse)(nil),       // 9: v1beta3.ListDiskIDsResponse
-	(*DiskStatsRequest)(nil),          // 10: v1beta3.DiskStatsRequest
-	(*DiskStatsResponse)(nil),         // 11: v1beta3.DiskStatsResponse
-	(*SetAttachStateRequest)(nil),     // 12: v1beta3.SetAttachStateRequest
-	(*SetAttachStateResponse)(nil),    // 13: v1beta3.SetAttachStateResponse
-	(*GetAttachStateRequest)(nil),     // 14: v1beta3.GetAttachStateRequest
-	(*GetAttachStateResponse)(nil),    // 15: v1beta3.GetAttachStateResponse
+	(*GetDiskStatsRequest)(nil),       // 10: v1beta3.GetDiskStatsRequest
+	(*GetDiskStatsResponse)(nil),      // 11: v1beta3.GetDiskStatsResponse
+	(*SetDiskStateRequest)(nil),       // 12: v1beta3.SetDiskStateRequest
+	(*SetDiskStateResponse)(nil),      // 13: v1beta3.SetDiskStateResponse
+	(*GetDiskStateRequest)(nil),       // 14: v1beta3.GetDiskStateRequest
+	(*GetDiskStateResponse)(nil),      // 15: v1beta3.GetDiskStateResponse
 	nil,                               // 16: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
 	nil,                               // 17: v1beta3.DiskIDs.IdentifiersEntry
-	nil,                               // 18: v1beta3.ListDiskIDsResponse.DiskIDsEntry
+	nil,                               // 18: v1beta3.ListDiskIDsResponse.DiskIdsEntry
 }
 var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_depIdxs = []int32{
 	16, // 0: v1beta3.ListDiskLocationsResponse.disk_locations:type_name -> v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
 	17, // 1: v1beta3.DiskIDs.identifiers:type_name -> v1beta3.DiskIDs.IdentifiersEntry
-	18, // 2: v1beta3.ListDiskIDsResponse.diskIDs:type_name -> v1beta3.ListDiskIDsResponse.DiskIDsEntry
+	18, // 2: v1beta3.ListDiskIDsResponse.disk_ids:type_name -> v1beta3.ListDiskIDsResponse.DiskIdsEntry
 	1,  // 3: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry.value:type_name -> v1beta3.DiskLocation
-	8,  // 4: v1beta3.ListDiskIDsResponse.DiskIDsEntry.value:type_name -> v1beta3.DiskIDs
+	8,  // 4: v1beta3.ListDiskIDsResponse.DiskIdsEntry.value:type_name -> v1beta3.DiskIDs
 	0,  // 5: v1beta3.Disk.ListDiskLocations:input_type -> v1beta3.ListDiskLocationsRequest
 	3,  // 6: v1beta3.Disk.PartitionDisk:input_type -> v1beta3.PartitionDiskRequest
 	5,  // 7: v1beta3.Disk.Rescan:input_type -> v1beta3.RescanRequest
 	7,  // 8: v1beta3.Disk.ListDiskIDs:input_type -> v1beta3.ListDiskIDsRequest
-	10, // 9: v1beta3.Disk.DiskStats:input_type -> v1beta3.DiskStatsRequest
-	12, // 10: v1beta3.Disk.SetAttachState:input_type -> v1beta3.SetAttachStateRequest
-	14, // 11: v1beta3.Disk.GetAttachState:input_type -> v1beta3.GetAttachStateRequest
+	10, // 9: v1beta3.Disk.GetDiskStats:input_type -> v1beta3.GetDiskStatsRequest
+	12, // 10: v1beta3.Disk.SetDiskState:input_type -> v1beta3.SetDiskStateRequest
+	14, // 11: v1beta3.Disk.GetDiskState:input_type -> v1beta3.GetDiskStateRequest
 	2,  // 12: v1beta3.Disk.ListDiskLocations:output_type -> v1beta3.ListDiskLocationsResponse
 	4,  // 13: v1beta3.Disk.PartitionDisk:output_type -> v1beta3.PartitionDiskResponse
 	6,  // 14: v1beta3.Disk.Rescan:output_type -> v1beta3.RescanResponse
 	9,  // 15: v1beta3.Disk.ListDiskIDs:output_type -> v1beta3.ListDiskIDsResponse
-	11, // 16: v1beta3.Disk.DiskStats:output_type -> v1beta3.DiskStatsResponse
-	13, // 17: v1beta3.Disk.SetAttachState:output_type -> v1beta3.SetAttachStateResponse
-	15, // 18: v1beta3.Disk.GetAttachState:output_type -> v1beta3.GetAttachStateResponse
+	11, // 16: v1beta3.Disk.GetDiskStats:output_type -> v1beta3.GetDiskStatsResponse
+	13, // 17: v1beta3.Disk.SetDiskState:output_type -> v1beta3.SetDiskStateResponse
+	15, // 18: v1beta3.Disk.GetDiskState:output_type -> v1beta3.GetDiskStateResponse
 	12, // [12:19] is the sub-list for method output_type
 	5,  // [5:12] is the sub-list for method input_type
 	5,  // [5:5] is the sub-list for extension type_name
@@ -1070,7 +1073,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DiskStatsRequest); i {
+			switch v := v.(*GetDiskStatsRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1082,7 +1085,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DiskStatsResponse); i {
+			switch v := v.(*GetDiskStatsResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1094,7 +1097,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SetAttachStateRequest); i {
+			switch v := v.(*SetDiskStateRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1106,7 +1109,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SetAttachStateResponse); i {
+			switch v := v.(*SetDiskStateResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1118,7 +1121,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAttachStateRequest); i {
+			switch v := v.(*GetDiskStateRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1130,7 +1133,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAttachStateResponse); i {
+			switch v := v.(*GetDiskStateResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1175,21 +1178,21 @@ const _ = grpc.SupportPackageIsVersion6
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type DiskClient interface {
 	// ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all
-	// disk devices enumerated by the host
+	// disk devices enumerated by the host.
 	ListDiskLocations(ctx context.Context, in *ListDiskLocationsRequest, opts ...grpc.CallOption) (*ListDiskLocationsResponse, error)
 	// PartitionDisk initializes and partitions a disk device (if the disk has not
-	// been partitioned already) and returns the resulting volume device ID
+	// been partitioned already) and returns the resulting volume device ID.
 	PartitionDisk(ctx context.Context, in *PartitionDiskRequest, opts ...grpc.CallOption) (*PartitionDiskResponse, error)
-	// Rescan refreshes the host's storage cache
+	// Rescan refreshes the host's storage cache.
 	Rescan(ctx context.Context, in *RescanRequest, opts ...grpc.CallOption) (*RescanResponse, error)
-	// ListDiskIDs returns a map of DiskID objects where the key is the disk number
+	// ListDiskIDs returns a map of DiskID objects where the key is the disk number.
 	ListDiskIDs(ctx context.Context, in *ListDiskIDsRequest, opts ...grpc.CallOption) (*ListDiskIDsResponse, error)
-	// DiskStats returns the stats for the disk
-	DiskStats(ctx context.Context, in *DiskStatsRequest, opts ...grpc.CallOption) (*DiskStatsResponse, error)
-	// SetAttachState sets the offline/online state of a disk
-	SetAttachState(ctx context.Context, in *SetAttachStateRequest, opts ...grpc.CallOption) (*SetAttachStateResponse, error)
-	// GetAttachState gets the offline/online state of a disk
-	GetAttachState(ctx context.Context, in *GetAttachStateRequest, opts ...grpc.CallOption) (*GetAttachStateResponse, error)
+	// GetDiskStats returns the stats of a disk.
+	GetDiskStats(ctx context.Context, in *GetDiskStatsRequest, opts ...grpc.CallOption) (*GetDiskStatsResponse, error)
+	// SetDiskState sets the offline/online state of a disk.
+	SetDiskState(ctx context.Context, in *SetDiskStateRequest, opts ...grpc.CallOption) (*SetDiskStateResponse, error)
+	// GetDiskState gets the offline/online state of a disk.
+	GetDiskState(ctx context.Context, in *GetDiskStateRequest, opts ...grpc.CallOption) (*GetDiskStateResponse, error)
 }
 
 type diskClient struct {
@@ -1236,27 +1239,27 @@ func (c *diskClient) ListDiskIDs(ctx context.Context, in *ListDiskIDsRequest, op
 	return out, nil
 }
 
-func (c *diskClient) DiskStats(ctx context.Context, in *DiskStatsRequest, opts ...grpc.CallOption) (*DiskStatsResponse, error) {
-	out := new(DiskStatsResponse)
-	err := c.cc.Invoke(ctx, "/v1beta3.Disk/DiskStats", in, out, opts...)
+func (c *diskClient) GetDiskStats(ctx context.Context, in *GetDiskStatsRequest, opts ...grpc.CallOption) (*GetDiskStatsResponse, error) {
+	out := new(GetDiskStatsResponse)
+	err := c.cc.Invoke(ctx, "/v1beta3.Disk/GetDiskStats", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *diskClient) SetAttachState(ctx context.Context, in *SetAttachStateRequest, opts ...grpc.CallOption) (*SetAttachStateResponse, error) {
-	out := new(SetAttachStateResponse)
-	err := c.cc.Invoke(ctx, "/v1beta3.Disk/SetAttachState", in, out, opts...)
+func (c *diskClient) SetDiskState(ctx context.Context, in *SetDiskStateRequest, opts ...grpc.CallOption) (*SetDiskStateResponse, error) {
+	out := new(SetDiskStateResponse)
+	err := c.cc.Invoke(ctx, "/v1beta3.Disk/SetDiskState", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *diskClient) GetAttachState(ctx context.Context, in *GetAttachStateRequest, opts ...grpc.CallOption) (*GetAttachStateResponse, error) {
-	out := new(GetAttachStateResponse)
-	err := c.cc.Invoke(ctx, "/v1beta3.Disk/GetAttachState", in, out, opts...)
+func (c *diskClient) GetDiskState(ctx context.Context, in *GetDiskStateRequest, opts ...grpc.CallOption) (*GetDiskStateResponse, error) {
+	out := new(GetDiskStateResponse)
+	err := c.cc.Invoke(ctx, "/v1beta3.Disk/GetDiskState", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1266,21 +1269,21 @@ func (c *diskClient) GetAttachState(ctx context.Context, in *GetAttachStateReque
 // DiskServer is the server API for Disk service.
 type DiskServer interface {
 	// ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all
-	// disk devices enumerated by the host
+	// disk devices enumerated by the host.
 	ListDiskLocations(context.Context, *ListDiskLocationsRequest) (*ListDiskLocationsResponse, error)
 	// PartitionDisk initializes and partitions a disk device (if the disk has not
-	// been partitioned already) and returns the resulting volume device ID
+	// been partitioned already) and returns the resulting volume device ID.
 	PartitionDisk(context.Context, *PartitionDiskRequest) (*PartitionDiskResponse, error)
-	// Rescan refreshes the host's storage cache
+	// Rescan refreshes the host's storage cache.
 	Rescan(context.Context, *RescanRequest) (*RescanResponse, error)
-	// ListDiskIDs returns a map of DiskID objects where the key is the disk number
+	// ListDiskIDs returns a map of DiskID objects where the key is the disk number.
 	ListDiskIDs(context.Context, *ListDiskIDsRequest) (*ListDiskIDsResponse, error)
-	// DiskStats returns the stats for the disk
-	DiskStats(context.Context, *DiskStatsRequest) (*DiskStatsResponse, error)
-	// SetAttachState sets the offline/online state of a disk
-	SetAttachState(context.Context, *SetAttachStateRequest) (*SetAttachStateResponse, error)
-	// GetAttachState gets the offline/online state of a disk
-	GetAttachState(context.Context, *GetAttachStateRequest) (*GetAttachStateResponse, error)
+	// GetDiskStats returns the stats of a disk.
+	GetDiskStats(context.Context, *GetDiskStatsRequest) (*GetDiskStatsResponse, error)
+	// SetDiskState sets the offline/online state of a disk.
+	SetDiskState(context.Context, *SetDiskStateRequest) (*SetDiskStateResponse, error)
+	// GetDiskState gets the offline/online state of a disk.
+	GetDiskState(context.Context, *GetDiskStateRequest) (*GetDiskStateResponse, error)
 }
 
 // UnimplementedDiskServer can be embedded to have forward compatible implementations.
@@ -1299,14 +1302,14 @@ func (*UnimplementedDiskServer) Rescan(context.Context, *RescanRequest) (*Rescan
 func (*UnimplementedDiskServer) ListDiskIDs(context.Context, *ListDiskIDsRequest) (*ListDiskIDsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListDiskIDs not implemented")
 }
-func (*UnimplementedDiskServer) DiskStats(context.Context, *DiskStatsRequest) (*DiskStatsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DiskStats not implemented")
+func (*UnimplementedDiskServer) GetDiskStats(context.Context, *GetDiskStatsRequest) (*GetDiskStatsResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetDiskStats not implemented")
 }
-func (*UnimplementedDiskServer) SetAttachState(context.Context, *SetAttachStateRequest) (*SetAttachStateResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetAttachState not implemented")
+func (*UnimplementedDiskServer) SetDiskState(context.Context, *SetDiskStateRequest) (*SetDiskStateResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SetDiskState not implemented")
 }
-func (*UnimplementedDiskServer) GetAttachState(context.Context, *GetAttachStateRequest) (*GetAttachStateResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetAttachState not implemented")
+func (*UnimplementedDiskServer) GetDiskState(context.Context, *GetDiskStateRequest) (*GetDiskStateResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetDiskState not implemented")
 }
 
 func RegisterDiskServer(s *grpc.Server, srv DiskServer) {
@@ -1385,56 +1388,56 @@ func _Disk_ListDiskIDs_Handler(srv interface{}, ctx context.Context, dec func(in
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Disk_DiskStats_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DiskStatsRequest)
+func _Disk_GetDiskStats_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDiskStatsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(DiskServer).DiskStats(ctx, in)
+		return srv.(DiskServer).GetDiskStats(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/v1beta3.Disk/DiskStats",
+		FullMethod: "/v1beta3.Disk/GetDiskStats",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DiskServer).DiskStats(ctx, req.(*DiskStatsRequest))
+		return srv.(DiskServer).GetDiskStats(ctx, req.(*GetDiskStatsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Disk_SetAttachState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetAttachStateRequest)
+func _Disk_SetDiskState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetDiskStateRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(DiskServer).SetAttachState(ctx, in)
+		return srv.(DiskServer).SetDiskState(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/v1beta3.Disk/SetAttachState",
+		FullMethod: "/v1beta3.Disk/SetDiskState",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DiskServer).SetAttachState(ctx, req.(*SetAttachStateRequest))
+		return srv.(DiskServer).SetDiskState(ctx, req.(*SetDiskStateRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Disk_GetAttachState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetAttachStateRequest)
+func _Disk_GetDiskState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDiskStateRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(DiskServer).GetAttachState(ctx, in)
+		return srv.(DiskServer).GetDiskState(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/v1beta3.Disk/GetAttachState",
+		FullMethod: "/v1beta3.Disk/GetDiskState",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DiskServer).GetAttachState(ctx, req.(*GetAttachStateRequest))
+		return srv.(DiskServer).GetDiskState(ctx, req.(*GetDiskStateRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1460,16 +1463,16 @@ var _Disk_serviceDesc = grpc.ServiceDesc{
 			Handler:    _Disk_ListDiskIDs_Handler,
 		},
 		{
-			MethodName: "DiskStats",
-			Handler:    _Disk_DiskStats_Handler,
+			MethodName: "GetDiskStats",
+			Handler:    _Disk_GetDiskStats_Handler,
 		},
 		{
-			MethodName: "SetAttachState",
-			Handler:    _Disk_SetAttachState_Handler,
+			MethodName: "SetDiskState",
+			Handler:    _Disk_SetDiskState_Handler,
 		},
 		{
-			MethodName: "GetAttachState",
-			Handler:    _Disk_GetAttachState_Handler,
+			MethodName: "GetDiskState",
+			Handler:    _Disk_GetDiskState_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
diff --git a/client/api/disk/v1beta3/api.proto b/client/api/disk/v1beta3/api.proto
index 89234524..1a5ab1e3 100644
--- a/client/api/disk/v1beta3/api.proto
+++ b/client/api/disk/v1beta3/api.proto
@@ -6,31 +6,31 @@ option go_package = "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3
 
 service Disk {
     // ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all
-    // disk devices enumerated by the host
+    // disk devices enumerated by the host.
     rpc ListDiskLocations(ListDiskLocationsRequest) returns (ListDiskLocationsResponse) {}
 
     // PartitionDisk initializes and partitions a disk device (if the disk has not
-    // been partitioned already) and returns the resulting volume device ID
+    // been partitioned already) and returns the resulting volume device ID.
     rpc PartitionDisk(PartitionDiskRequest) returns (PartitionDiskResponse) {}
 
-    // Rescan refreshes the host's storage cache
+    // Rescan refreshes the host's storage cache.
     rpc Rescan(RescanRequest) returns (RescanResponse) {}
 
-    // ListDiskIDs returns a map of DiskID objects where the key is the disk number
+    // ListDiskIDs returns a map of DiskID objects where the key is the disk number.
     rpc ListDiskIDs(ListDiskIDsRequest) returns (ListDiskIDsResponse) {}
 
-    // DiskStats returns the stats for the disk
-    rpc DiskStats(DiskStatsRequest) returns (DiskStatsResponse) {}
+    // GetDiskStats returns the stats of a disk.
+    rpc GetDiskStats(GetDiskStatsRequest) returns (GetDiskStatsResponse) {}
 
-    // SetAttachState sets the offline/online state of a disk
-    rpc SetAttachState(SetAttachStateRequest) returns (SetAttachStateResponse) {}
+    // SetDiskState sets the offline/online state of a disk.
+    rpc SetDiskState(SetDiskStateRequest) returns (SetDiskStateResponse) {}
 
-    // GetAttachState gets the offline/online state of a disk
-    rpc GetAttachState(GetAttachStateRequest) returns (GetAttachStateResponse) {}
+    // GetDiskState gets the offline/online state of a disk.
+    rpc GetDiskState(GetDiskStateRequest) returns (GetDiskStateResponse) {}
 }
 
 message ListDiskLocationsRequest {
-    // Intentionally empty
+    // Intentionally empty.
 }
 
 message DiskLocation {
@@ -41,69 +41,69 @@ message DiskLocation {
 }
 
 message ListDiskLocationsResponse {
-    // Map of disk device IDs and <adapter, bus, target, lun ID> associated with each disk device
-    map <string, DiskLocation> disk_locations = 1;
+    // Map of disk device number and <adapter, bus, target, lun ID> associated with each disk device.
+    map <uint32, DiskLocation> disk_locations = 1;
 }
 
 message PartitionDiskRequest {
-    // Disk device ID of the disk to partition
-    string diskID = 1;
+    // Disk device number of the disk to partition.
+    uint32 disk_number = 1;
 }
 
 message PartitionDiskResponse {
-    // Intentionally empty
+    // Intentionally empty.
 }
 
 message RescanRequest {
-    // Intentionally empty
+    // Intentionally empty.
 }
 
 message RescanResponse {
-    // Intentionally empty
+    // Intentionally empty.
 }
 
 message ListDiskIDsRequest {
-    // Intentionally empty
+    // Intentionally empty.
 }
 
 message DiskIDs {
-    // Map of Disk ID types and Disk ID values
+    // Map of Disk ID types and Disk ID values.
     map <string, string> identifiers = 1;
 }
 
 message ListDiskIDsResponse {
-    // Map of disk device numbers and IDs <page83> associated with each disk device
-    map <string, DiskIDs> diskIDs = 1;
+    // Map of disk device numbers and IDs <page83> associated with each disk device.
+    map <uint32, DiskIDs> disk_ids = 1;
 }
 
-message DiskStatsRequest {
-    // Disk device ID of the disk to get the size from
-    string diskID = 1;
+message GetDiskStatsRequest {
+    // Disk device number of the disk to get the stats from.
+    uint32 disk_number = 1;
 }
 
-message DiskStatsResponse {
-    //Total size of the volume
-    int64 diskSize = 1;
+message GetDiskStatsResponse {
+    // Total size of the volume.
+    int64 total_bytes = 1;
 }
 
-message SetAttachStateRequest {
-    // Disk device ID (number) of the disk which state will change
-    string diskID = 1;
+message SetDiskStateRequest {
+    // Disk device number of the disk.
+    uint32 disk_number = 1;
 
-    // Online state to set for the disk. true for online, false for offline
-    bool isOnline = 2;
+    // Online state to set for the disk. true for online, false for offline.
+    bool is_online = 2;
 }
 
-message SetAttachStateResponse {
+message SetDiskStateResponse {
+    // Intentionally empty.
 }
 
-message GetAttachStateRequest {
-    // Disk device ID (number) of the disk
-    string diskID = 1;
+message GetDiskStateRequest {
+    // Disk device number of the disk.
+    uint32 disk_number = 1;
 }
 
-message GetAttachStateResponse {
-    // Online state of the disk. true for online, false for offline
-    bool isOnline = 1;
+message GetDiskStateResponse {
+    // Online state of the disk. true for online, false for offline.
+    bool is_online = 1;
 }
-
diff --git a/client/groups/disk/v1beta3/client_generated.go b/client/groups/disk/v1beta3/client_generated.go
index e16f595a..37b2393d 100644
--- a/client/groups/disk/v1beta3/client_generated.go
+++ b/client/groups/disk/v1beta3/client_generated.go
@@ -65,12 +65,12 @@ func (w *Client) Close() error {
 // ensures we implement all the required methods
 var _ v1beta3.DiskClient = &Client{}
 
-func (w *Client) DiskStats(context context.Context, request *v1beta3.DiskStatsRequest, opts ...grpc.CallOption) (*v1beta3.DiskStatsResponse, error) {
-	return w.client.DiskStats(context, request, opts...)
+func (w *Client) GetDiskState(context context.Context, request *v1beta3.GetDiskStateRequest, opts ...grpc.CallOption) (*v1beta3.GetDiskStateResponse, error) {
+	return w.client.GetDiskState(context, request, opts...)
 }
 
-func (w *Client) GetAttachState(context context.Context, request *v1beta3.GetAttachStateRequest, opts ...grpc.CallOption) (*v1beta3.GetAttachStateResponse, error) {
-	return w.client.GetAttachState(context, request, opts...)
+func (w *Client) GetDiskStats(context context.Context, request *v1beta3.GetDiskStatsRequest, opts ...grpc.CallOption) (*v1beta3.GetDiskStatsResponse, error) {
+	return w.client.GetDiskStats(context, request, opts...)
 }
 
 func (w *Client) ListDiskIDs(context context.Context, request *v1beta3.ListDiskIDsRequest, opts ...grpc.CallOption) (*v1beta3.ListDiskIDsResponse, error) {
@@ -89,6 +89,6 @@ func (w *Client) Rescan(context context.Context, request *v1beta3.RescanRequest,
 	return w.client.Rescan(context, request, opts...)
 }
 
-func (w *Client) SetAttachState(context context.Context, request *v1beta3.SetAttachStateRequest, opts ...grpc.CallOption) (*v1beta3.SetAttachStateResponse, error) {
-	return w.client.SetAttachState(context, request, opts...)
+func (w *Client) SetDiskState(context context.Context, request *v1beta3.SetDiskStateRequest, opts ...grpc.CallOption) (*v1beta3.SetDiskStateResponse, error) {
+	return w.client.SetDiskState(context, request, opts...)
 }
diff --git a/docs/CSI-Proxy.png b/docs/CSI-Proxy.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce9436f559f1db89bcd9be0ccf24301bd4750864
GIT binary patch
literal 57158
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
J@2Sqa{{?=8T897t

literal 0
HcmV?d00001

diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
new file mode 100644
index 00000000..9f1b3a02
--- /dev/null
+++ b/docs/DEVELOPMENT.md
@@ -0,0 +1,92 @@
+# Development
+
+## Code generation
+
+This project uses:
+
+- `protoc` to generate `pb.go` files from `proto` files, this is used in the client module only
+- `csi-proxy-api-gen` to generate `_generated.go` files, it's used both in the client module and in the server module
+
+Read the [`Makefile`](./Makefile) for more details and the descriptions below to understand what targets to call
+
+## High Level Overview
+
+![CSI Proxy](./CSI-Proxy.png)
+
+## Code structure
+
+- `client` - Client module (used by the drivers)
+  - `api` - Client API, versioned and compiled from `api.proto` files
+  - `groups` - Client API factory, the drivers will interact with methods of the wanted group/version from this folder, these methods use the structs defined in `client/api`
+- `internal` - Server side code
+  - `server.go` - Server entry point, invoked by the `csi-proxy` binary
+  - `server/<group>/internal/<version>/server_generated.go` - First gRPC layer, once the gRPC server receives a request, it'll send it to these GRPC handlers, these handlers will convert a client versioned request e.g. a request from `v1beta2` or `v1beta3` to an internal server representation (see `internal/types.go`) that doesn't have specific information about the version of a client.
+  - `server/<group>/internal/types.go` - All requests regardless of the client version used are converted into the structs declared here, structs of these types are what the server is aware of.
+  - `server/<group>/internal/types_generated.go` - The API exposed by the server API handler, it needs to match requests that may come from any client version.
+  - `server/<group>/server.go` - Server API handlers that implements `types_generated.go` and perform server side validations, once client requests are converted into the internal server structs they go through methods exposed here and invoke `os/<group>` methods.
+  - `os/<group>/` - The internal server implementation of the csi-proxy API.
+
+Additional notes about some autogenerated files:
+
+- `internal/server/<group>/internal/<version>/conversion_generated.go` - In the First gRPC layer requests may come from different versioned clients, the server works with internal structs that don't have any info about a specific client request, there's the need of conversion functions that remap properties from a client to the internal server structs, this file has functions with autogenerated mappings (overrides can be specified through `conversion.go` see #138)
+  - NOTE: some of the functions may be declared but may not be used, this happens if there's an override in `conversion.go` for that function.
+- `internal/server/<group>/api_group_generated.go` - Creates server handlers for all the known API versions for the `<group>`
+
+## Making changes to the client module
+
+Some notes about changing code to the client module:
+
+- APIs that were already released should be considered immutable, if the protoc compiler overwrites changes in released APIs we should undo these changes.
+
+When there are changes to the to client module:
+
+- Remove the `vendor` directory
+- If a `client/api/<group>/api.pb.go` needs to be regenerated, delete it first
+- If a `client/groups/<group>/<version>/client_generated.go` needs to be regenerated, delete it first
+- Compile the proto files `make generate-protobuf` (there will be a lot of warnings and an error, just make sure that your desired protobuf was generated)
+- Generate `client_generated.go` with `make generate-csi-proxy-api-gen`
+- Compiling the proto files overwrote the `pb.go` files for older files, make sure you undo those changes because we consider released `api.proto` and `api.pb.go` files immutable.
+
+```shell
+# for example when I was working on making changes to the v1beta3 volume API
+# I had to do the following to restore the changes protoc made to the other APIs
+git restore client/api/volume/v1beta{1,2} client/api/{disk,iscsi,system,smb,filesystem}
+```
+
+- Finally after checking that only `client/api/<group>/<version>/api.pb.go` and `client/groups/<group>/<version>/client_generated.go` were created/modified, sync these files to the vendor folder with `go mod vendor`
+
+## Making changes to the server module
+
+Some notes about making changes to the server module:
+
+- Make sure that the `vendor` folder is up to date with the latest code from the client code.
+- Always remember to delete a file that was generated otherwise it won't be generated again even if there
+  are changes that should make it autogenerate.
+- Autogenerated files shouldn't be edited by hand, instead if there's a special conversion from a specific
+  client API version to an internal server version use the `conversion.go` file
+
+When there are changes to the server module:
+
+- Delete the autogenerated files, for example when I was working on
+  making changes to the volume API I deleted all the `_generated.go` files
+
+```shell
+find internal/server/volume -name "*_generated.go" | xargs rm
+```
+
+- Generate the `_generated.go` files with `make generated-csi-proxy-api-gen`
+- Update the unit tests in `internal/server/<group>/server_test.go`
+- Update the integration tests in `integrationtests/`
+
+## Bumping versions
+
+- Copy all the non-generated client files from the desired groups e.g. from `v1beta2` to `v1beta3` and run the compiler
+  (see [#making changes to the client module](#making-changes-to-the-client-module)), **remember not to overwrite old API files!**
+- Copy server API handlers for the desired group e.g. `internal/server/<group>/internal/<version>/conversion.go`, **remember to delete the auto generated files first!**
+
+If there are any non-backward compatible changes (for example renaming a parameter or a method)
+
+- Make sure that `types.go` reflects what we should know of the internal server structs
+- Remap old parameters in previous API versions e.g. let's say that we make a remap in `v1beta3` then we need to updated `v1alpha1`, `v1beta1`, etc. using the `conversion.go` file. (see #138)
+- Update `internal/<group>/server.go` if there are new methods, the old methods should forward the request (see #138)
+
diff --git a/integrationtests/apigroups/client/dummy/v1/client_generated.go b/integrationtests/apigroups/client/dummy/v1/client_generated.go
index 7eed6341..e97fbecd 100644
--- a/integrationtests/apigroups/client/dummy/v1/client_generated.go
+++ b/integrationtests/apigroups/client/dummy/v1/client_generated.go
@@ -9,7 +9,7 @@ import (
 	"github.com/Microsoft/go-winio"
 	"github.com/kubernetes-csi/csi-proxy/client"
 	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
-	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1"
+	v1 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1"
 	"google.golang.org/grpc"
 )
 
diff --git a/integrationtests/apigroups/server/dummy/api_group_generated.go b/integrationtests/apigroups/server/dummy/api_group_generated.go
index 1bb67d46..8a8ea9bb 100644
--- a/integrationtests/apigroups/server/dummy/api_group_generated.go
+++ b/integrationtests/apigroups/server/dummy/api_group_generated.go
@@ -5,7 +5,7 @@ package dummy
 import (
 	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
 	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
-	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1"
+	v1 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1"
 	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1alpha1"
 	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1alpha2"
 	srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types"
diff --git a/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go b/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go
index 349566d1..cac51292 100644
--- a/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go
+++ b/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
-	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1"
+	v1 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1"
 	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
 	"google.golang.org/grpc"
 )
diff --git a/internal/os/disk/api.go b/internal/os/disk/api.go
index 6abcde08..f6af5800 100644
--- a/internal/os/disk/api.go
+++ b/internal/os/disk/api.go
@@ -1,5 +1,3 @@
-// +build windows
-
 package disk
 
 import (
@@ -26,19 +24,54 @@ const (
 	IOCTL_STORAGE_QUERY_PROPERTY    = 0x002d1400
 )
 
-// Implements the OS API calls related to Disk Devices. All code here should be very simple
+// API declares the interface exposed by the internal API
+type API interface {
+	// ListDiskLocations - constructs a map with the disk number as the key and the DiskLocation structure
+	// as the value. The DiskLocation struct has various fields like the Adapter, Bus, Target and LUNID.
+	ListDiskLocations() (map[uint32]shared.DiskLocation, error)
+	// IsDiskInitialized returns true if the disk identified by `diskNumber` is initialized.
+	IsDiskInitialized(diskNumber uint32) (bool, error)
+	// InitializeDisk initializes the disk `diskNumber`
+	InitializeDisk(diskNumber uint32) error
+	// PartitionsExist checks if the disk `diskNumber` has any partitions.
+	PartitionsExist(diskNumber uint32) (bool, error)
+	// CreatePartitoin creates a partition in disk `diskNumber`
+	CreatePartition(diskNumber uint32) error
+	// Rescan updates the host storage cache (re-enumerates disk, partition and volume objects)
+	Rescan() error
+	// GetDiskNumberByName gets a disk number by `diskName`.
+	GetDiskNumberByName(diskName string) (uint32, error)
+	// ListDiskIDs list all disks by disk number.
+	ListDiskIDs() (map[uint32]shared.DiskIDs, error)
+	// GetDiskStats gets the disk stats of the disk `diskNumber`.
+	GetDiskStats(diskNumber uint32) (int64, error)
+	// SetDiskState sets the offline/online state of the disk `diskNumber`.
+	SetDiskState(diskNumber uint32, isOnline bool) error
+	// GetDiskState gets the offline/online state of the disk `diskNumber`.
+	GetDiskState(diskNumber uint32) (bool, error)
+}
+
+// DiskAPI implements the OS API calls related to Disk Devices. All code here should be very simple
 // pass-through to the OS APIs or cmdlets. Any logic around the APIs/cmdlet invocation
 // should go in internal/server/filesystem/disk.go so that logic can be easily unit-tested
 // without requiring specific OS environments.
-type APIImplementor struct{}
+type DiskAPI struct{}
 
-func New() APIImplementor {
-	return APIImplementor{}
+// ensure that DiskAPI implements the exposed API
+var _ API = &DiskAPI{}
+
+func New() DiskAPI {
+	return DiskAPI{}
 }
 
 // ListDiskLocations - constructs a map with the disk number as the key and the DiskLocation structure
 // as the value. The DiskLocation struct has various fields like the Adapter, Bus, Target and LUNID.
-func (APIImplementor) ListDiskLocations() (map[string]shared.DiskLocation, error) {
+func (DiskAPI) ListDiskLocations() (map[uint32]shared.DiskLocation, error) {
+	// sample response
+	// [{
+	//    "number":  0,
+	//    "location":  "PCI Slot 3 : Adapter 0 : Port 0 : Target 1 : LUN 0"
+	// }, ...]
 	cmd := fmt.Sprintf("Get-Disk | select number, location | ConvertTo-Json")
 	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
 	if err != nil {
@@ -51,10 +84,10 @@ func (APIImplementor) ListDiskLocations() (map[string]shared.DiskLocation, error
 		return nil, err
 	}
 
-	m := make(map[string]shared.DiskLocation)
+	m := make(map[uint32]shared.DiskLocation)
 	for _, v := range getDisk {
 		str := v["location"].(string)
-		num := fmt.Sprintf("%d", int(v["number"].(float64)))
+		num := v["number"].(uint32)
 
 		found := false
 		s := strings.Split(str, ":")
@@ -86,7 +119,7 @@ func (APIImplementor) ListDiskLocations() (map[string]shared.DiskLocation, error
 	return m, nil
 }
 
-func (APIImplementor) Rescan() error {
+func (DiskAPI) Rescan() error {
 	cmd := "Update-HostStorageCache"
 	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
 	if err != nil {
@@ -95,11 +128,11 @@ func (APIImplementor) Rescan() error {
 	return nil
 }
 
-func (APIImplementor) IsDiskInitialized(diskID string) (bool, error) {
-	cmd := fmt.Sprintf("Get-Disk -Number %s | Where partitionstyle -eq 'raw'", diskID)
+func (DiskAPI) IsDiskInitialized(diskNumber uint32) (bool, error) {
+	cmd := fmt.Sprintf("Get-Disk -Number %d | Where partitionstyle -eq 'raw'", diskNumber)
 	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
 	if err != nil {
-		return false, fmt.Errorf("error checking initialized status of disk %s: %v, %v", diskID, out, err)
+		return false, fmt.Errorf("error checking initialized status of disk %d: %v, %v", diskNumber, out, err)
 	}
 	if len(out) == 0 {
 		// disks with raw initialization not detected
@@ -108,20 +141,20 @@ func (APIImplementor) IsDiskInitialized(diskID string) (bool, error) {
 	return false, nil
 }
 
-func (APIImplementor) InitializeDisk(diskID string) error {
-	cmd := fmt.Sprintf("Initialize-Disk -Number %s -PartitionStyle GPT", diskID)
+func (DiskAPI) InitializeDisk(diskNumber uint32) error {
+	cmd := fmt.Sprintf("Initialize-Disk -Number %d -PartitionStyle GPT", diskNumber)
 	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
 	if err != nil {
-		return fmt.Errorf("error initializing disk %s: %v, %v", diskID, out, err)
+		return fmt.Errorf("error initializing disk %d: %v, %v", diskNumber, out, err)
 	}
 	return nil
 }
 
-func (APIImplementor) PartitionsExist(diskID string) (bool, error) {
-	cmd := fmt.Sprintf("Get-Partition | Where DiskNumber -eq %s", diskID)
+func (DiskAPI) PartitionsExist(diskNumber uint32) (bool, error) {
+	cmd := fmt.Sprintf("Get-Partition | Where DiskNumber -eq %d", diskNumber)
 	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
 	if err != nil {
-		return false, fmt.Errorf("error checking presence of partitions on disk %s: %v, %v", diskID, out, err)
+		return false, fmt.Errorf("error checking presence of partitions on disk %d: %v, %v", diskNumber, out, err)
 	}
 	if len(out) > 0 {
 		// disk has partitions in it
@@ -130,21 +163,21 @@ func (APIImplementor) PartitionsExist(diskID string) (bool, error) {
 	return false, nil
 }
 
-func (APIImplementor) CreatePartition(diskID string) error {
-	cmd := fmt.Sprintf("New-Partition -DiskNumber %s -UseMaximumSize", diskID)
+func (DiskAPI) CreatePartition(diskNumber uint32) error {
+	cmd := fmt.Sprintf("New-Partition -DiskNumber %d -UseMaximumSize", diskNumber)
 	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
 	if err != nil {
-		return fmt.Errorf("error creating parition on disk %s: %v, %v", diskID, out, err)
+		return fmt.Errorf("error creating parition on disk %d: %v, %v", diskNumber, out, err)
 	}
 	return nil
 }
 
-func (imp APIImplementor) GetDiskNumberByName(diskName string) (string, error) {
+func (imp DiskAPI) GetDiskNumberByName(diskName string) (uint32, error) {
 	diskNumber, err := imp.GetDiskNumberWithID(diskName)
-	return strconv.FormatUint(uint64(diskNumber), 10), err
+	return diskNumber, err
 }
 
-func (APIImplementor) GetDiskNumber(disk syscall.Handle) (uint32, error) {
+func (DiskAPI) GetDiskNumber(disk syscall.Handle) (uint32, error) {
 	var bytes uint32
 	devNum := StorageDeviceNumber{}
 	buflen := uint32(unsafe.Sizeof(devNum.DeviceType)) + uint32(unsafe.Sizeof(devNum.DeviceNumber)) + uint32(unsafe.Sizeof(devNum.PartitionNumber))
@@ -154,7 +187,7 @@ func (APIImplementor) GetDiskNumber(disk syscall.Handle) (uint32, error) {
 	return devNum.DeviceNumber, err
 }
 
-func (APIImplementor) DiskHasPage83ID(disk syscall.Handle, matchID string) (bool, error) {
+func (DiskAPI) DiskHasPage83ID(disk syscall.Handle, matchID string) (bool, error) {
 	query := StoragePropertyQuery{}
 
 	bufferSize := uint32(4 * 1024)
@@ -200,7 +233,7 @@ func (APIImplementor) DiskHasPage83ID(disk syscall.Handle, matchID string) (bool
 	return false, nil
 }
 
-func (APIImplementor) GetDiskPage83ID(disk syscall.Handle) (string, error) {
+func (DiskAPI) GetDiskPage83ID(disk syscall.Handle) (string, error) {
 	query := StoragePropertyQuery{}
 
 	bufferSize := uint32(4 * 1024)
@@ -242,7 +275,7 @@ func (APIImplementor) GetDiskPage83ID(disk syscall.Handle) (string, error) {
 	return "", nil
 }
 
-func (imp APIImplementor) GetDiskNumberWithID(page83ID string) (uint32, error) {
+func (imp DiskAPI) GetDiskNumberWithID(page83ID string) (uint32, error) {
 	out, err := exec.Command("powershell.exe", "(get-disk | select Path) | ConvertTo-Json").CombinedOutput()
 	if err != nil {
 		return 0, fmt.Errorf("Could not query disk paths")
@@ -269,7 +302,7 @@ func (imp APIImplementor) GetDiskNumberWithID(page83ID string) (uint32, error) {
 
 // ListDiskIDs - constructs a map with the disk number as the key and the DiskID structure
 // as the value. The DiskID struct has a field for the page83 ID.
-func (imp APIImplementor) ListDiskIDs() (map[string]shared.DiskIDs, error) {
+func (imp DiskAPI) ListDiskIDs() (map[uint32]shared.DiskIDs, error) {
 	out, err := exec.Command("powershell.exe", "(get-disk | select Path, SerialNumber) | ConvertTo-Json").CombinedOutput()
 	if err != nil {
 		return nil, fmt.Errorf("Could not query disk paths")
@@ -279,7 +312,7 @@ func (imp APIImplementor) ListDiskIDs() (map[string]shared.DiskIDs, error) {
 	disks := []Disk{}
 	json.Unmarshal([]byte(outString), &disks)
 
-	m := make(map[string]shared.DiskIDs)
+	m := make(map[uint32]shared.DiskIDs)
 
 	for i := range disks {
 		h, err := syscall.Open(disks[i].Path, syscall.O_RDONLY, 0)
@@ -297,19 +330,17 @@ func (imp APIImplementor) ListDiskIDs() (map[string]shared.DiskIDs, error) {
 			return m, fmt.Errorf("Could not get disk number: %v", err)
 		}
 
-		diskNumString := strconv.FormatUint(uint64(diskNumber), 10)
-
 		diskIDs := make(map[string]string)
 		diskIDs["page83"] = page83
 		diskIDs["serialNumber"] = disks[i].SerialNumber
-		m[diskNumString] = shared.DiskIDs{Identifiers: diskIDs}
+		m[diskNumber] = shared.DiskIDs{Identifiers: diskIDs}
 	}
 
 	return m, nil
 }
 
-func (imp APIImplementor) DiskStats(diskID string) (int64, error) {
-	cmd := fmt.Sprintf("(Get-Disk -Number %s).Size", diskID)
+func (imp DiskAPI) GetDiskStats(diskNumber uint32) (int64, error) {
+	cmd := fmt.Sprintf("(Get-Disk -Number %d).Size", diskNumber)
 	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
 	if err != nil || len(out) == 0 {
 		return -1, fmt.Errorf("error getting size of disk. cmd: %s, output: %s, error: %v", cmd, string(out), err)
@@ -330,8 +361,8 @@ func (imp APIImplementor) DiskStats(diskID string) (int64, error) {
 	return diskSize, nil
 }
 
-func (imp APIImplementor) SetAttachState(diskID string, isOnline bool) error {
-	cmd := fmt.Sprintf("(Get-Disk -Number %s) | Set-Disk -IsOffline $%t", diskID, !isOnline)
+func (imp DiskAPI) SetDiskState(diskNumber uint32, isOnline bool) error {
+	cmd := fmt.Sprintf("(Get-Disk -Number %d) | Set-Disk -IsOffline $%t", diskNumber, !isOnline)
 	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
 	if err != nil {
 		return fmt.Errorf("error setting disk attach state. cmd: %s, output: %s, error: %v", cmd, string(out), err)
@@ -340,8 +371,8 @@ func (imp APIImplementor) SetAttachState(diskID string, isOnline bool) error {
 	return nil
 }
 
-func (imp APIImplementor) GetAttachState(diskID string) (bool, error) {
-	cmd := fmt.Sprintf("(Get-Disk -Number %s) | Select-Object -ExpandProperty IsOffline", diskID)
+func (imp DiskAPI) GetDiskState(diskNumber uint32) (bool, error) {
+	cmd := fmt.Sprintf("(Get-Disk -Number %d) | Select-Object -ExpandProperty IsOffline", diskNumber)
 	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
 	if err != nil {
 		return false, fmt.Errorf("error getting disk state. cmd: %s, output: %s, error: %v", cmd, string(out), err)
diff --git a/internal/server/disk/internal/types.go b/internal/server/disk/internal/types.go
index fbc913ef..a588df3f 100644
--- a/internal/server/disk/internal/types.go
+++ b/internal/server/disk/internal/types.go
@@ -12,12 +12,12 @@ type ListDiskLocationsRequest struct {
 
 type ListDiskLocationsResponse struct {
 	// Map of disk device IDs and <adapter, bus, target, lun ID> associated with each disk device
-	DiskLocations map[string]*DiskLocation
+	DiskLocations map[uint32]*DiskLocation
 }
 
 type PartitionDiskRequest struct {
 	// Disk device ID of the disk to partition
-	DiskID string
+	DiskNumber uint32
 }
 
 type PartitionDiskResponse struct {
@@ -35,7 +35,7 @@ type GetDiskNumberByNameRequest struct {
 }
 
 type GetDiskNumberByNameResponse struct {
-	DiskNumber string
+	DiskNumber uint32
 }
 
 type DiskIDs struct {
@@ -48,9 +48,40 @@ type ListDiskIDsRequest struct {
 
 type ListDiskIDsResponse struct {
 	// Map of disk device numbers and IDs <page83> associated with each disk device
-	DiskIDs map[string]*DiskIDs
+	DiskNumbers map[uint32]*DiskIDs
+}
+
+type GetDiskStatsRequest struct {
+	DiskNumber uint32
+}
+
+type GetDiskStatsResponse struct {
+	TotalBytes int64
+}
+
+type SetDiskStateRequest struct {
+	// Disk device ID of the disk which state will change
+	DiskNumber uint32
+
+	// Online state to set for the disk. true for online, false for offline
+	IsOnline bool
 }
 
+type SetDiskStateResponse struct {
+}
+
+type GetDiskStateRequest struct {
+	// Disk device ID of the disk
+	DiskNumber uint32
+}
+
+type GetDiskStateResponse struct {
+	// Online state of the disk. true for online, false for offline
+	IsOnline bool
+}
+
+// These structs are used in pre v1beta3 API versions
+
 type DiskStatsRequest struct {
 	DiskID string
 }
diff --git a/internal/server/disk/internal/types_generated.go b/internal/server/disk/internal/types_generated.go
index 81cfa160..1cb032c3 100644
--- a/internal/server/disk/internal/types_generated.go
+++ b/internal/server/disk/internal/types_generated.go
@@ -18,9 +18,12 @@ type ServerInterface interface {
 	DiskStats(context.Context, *DiskStatsRequest, apiversion.Version) (*DiskStatsResponse, error)
 	GetAttachState(context.Context, *GetAttachStateRequest, apiversion.Version) (*GetAttachStateResponse, error)
 	GetDiskNumberByName(context.Context, *GetDiskNumberByNameRequest, apiversion.Version) (*GetDiskNumberByNameResponse, error)
+	GetDiskState(context.Context, *GetDiskStateRequest, apiversion.Version) (*GetDiskStateResponse, error)
+	GetDiskStats(context.Context, *GetDiskStatsRequest, apiversion.Version) (*GetDiskStatsResponse, error)
 	ListDiskIDs(context.Context, *ListDiskIDsRequest, apiversion.Version) (*ListDiskIDsResponse, error)
 	ListDiskLocations(context.Context, *ListDiskLocationsRequest, apiversion.Version) (*ListDiskLocationsResponse, error)
 	PartitionDisk(context.Context, *PartitionDiskRequest, apiversion.Version) (*PartitionDiskResponse, error)
 	Rescan(context.Context, *RescanRequest, apiversion.Version) (*RescanResponse, error)
 	SetAttachState(context.Context, *SetAttachStateRequest, apiversion.Version) (*SetAttachStateResponse, error)
+	SetDiskState(context.Context, *SetDiskStateRequest, apiversion.Version) (*SetDiskStateResponse, error)
 }
diff --git a/internal/server/disk/internal/v1alpha1/conversion.go b/internal/server/disk/internal/v1alpha1/conversion.go
index deab7c9f..addff864 100644
--- a/internal/server/disk/internal/v1alpha1/conversion.go
+++ b/internal/server/disk/internal/v1alpha1/conversion.go
@@ -2,24 +2,24 @@ package v1alpha1
 
 // Add manual conversion functions here to override automatic conversion functions
 
-import (
-	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
-	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
-)
+// import (
+// 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
+// 	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+// )
 
-func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*v1alpha1.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(v1alpha1.DiskLocation)
-			if err := Convert_internal_DiskLocation_To_v1alpha1_DiskLocation(val, newVal); err != nil {
-				return err
-			}
-			(*out)[key] = newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
+// func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error {
+// 	if in.DiskLocations != nil {
+// 		in, out := &in.DiskLocations, &out.DiskLocations
+// 		*out = make(map[string]*v1alpha1.DiskLocation, len(*in))
+// 		for key, val := range *in {
+// 			newVal := new(v1alpha1.DiskLocation)
+// 			if err := Convert_internal_DiskLocation_To_v1alpha1_DiskLocation(val, newVal); err != nil {
+// 				return err
+// 			}
+// 			(*out)[key] = newVal
+// 		}
+// 	} else {
+// 		out.DiskLocations = nil
+// 	}
+// 	return nil
+// }
diff --git a/internal/server/disk/internal/v1alpha1/conversion_generated.go b/internal/server/disk/internal/v1alpha1/conversion_generated.go
index 52ff3b31..1b81b498 100644
--- a/internal/server/disk/internal/v1alpha1/conversion_generated.go
+++ b/internal/server/disk/internal/v1alpha1/conversion_generated.go
@@ -54,7 +54,7 @@ func Convert_internal_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByName
 }
 
 func autoConvert_v1alpha1_GetDiskNumberByNameResponse_To_internal_GetDiskNumberByNameResponse(in *v1alpha1.GetDiskNumberByNameResponse, out *internal.GetDiskNumberByNameResponse) error {
-	out.DiskNumber = in.DiskNumber
+	out.DiskNumber = uint32(in.DiskNumber)
 	return nil
 }
 
@@ -64,7 +64,7 @@ func Convert_v1alpha1_GetDiskNumberByNameResponse_To_internal_GetDiskNumberByNam
 }
 
 func autoConvert_internal_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(in *internal.GetDiskNumberByNameResponse, out *v1alpha1.GetDiskNumberByNameResponse) error {
-	out.DiskNumber = in.DiskNumber
+	out.DiskNumber = string(in.DiskNumber)
 	return nil
 }
 
@@ -94,13 +94,13 @@ func Convert_internal_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequ
 func autoConvert_v1alpha1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1alpha1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
 	if in.DiskLocations != nil {
 		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*internal.DiskLocation, len(*in))
+		*out = make(map[uint32]*internal.DiskLocation, len(*in))
 		for key, val := range *in {
 			newVal := new(*internal.DiskLocation)
 			if err := Convert_v1alpha1_DiskLocation_To_internal_DiskLocation(*&val, *newVal); err != nil {
 				return err
 			}
-			(*out)[key] = *newVal
+			(*out)[uint32(key)] = *newVal
 		}
 	} else {
 		out.DiskLocations = nil
@@ -122,7 +122,7 @@ func autoConvert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocation
 			if err := Convert_internal_DiskLocation_To_v1alpha1_DiskLocation(*&val, *newVal); err != nil {
 				return err
 			}
-			(*out)[key] = *newVal
+			(*out)[string(key)] = *newVal
 		}
 	} else {
 		out.DiskLocations = nil
@@ -130,8 +130,12 @@ func autoConvert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocation
 	return nil
 }
 
+// Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse is an autogenerated conversion function.
+func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error {
+	return autoConvert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in, out)
+}
+
 func autoConvert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1alpha1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
-	out.DiskID = in.DiskID
 	return nil
 }
 
@@ -141,7 +145,6 @@ func Convert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *
 }
 
 func autoConvert_internal_PartitionDiskRequest_To_v1alpha1_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1alpha1.PartitionDiskRequest) error {
-	out.DiskID = in.DiskID
 	return nil
 }
 
diff --git a/internal/server/disk/internal/v1beta1/conversion.go b/internal/server/disk/internal/v1beta1/conversion.go
index 7b338c6e..f348cb82 100644
--- a/internal/server/disk/internal/v1beta1/conversion.go
+++ b/internal/server/disk/internal/v1beta1/conversion.go
@@ -2,51 +2,51 @@ package v1beta1
 
 // Add manual conversion functions here to override automatic conversion functions
 
-import (
-	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
-	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
-)
+// import (
+// 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
+// 	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+// )
 
-func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*v1beta1.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(v1beta1.DiskLocation)
-			if err := Convert_internal_DiskLocation_To_v1beta1_DiskLocation(val, newVal); err != nil {
-				return err
-			}
-			(*out)[key] = newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
+// func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error {
+// 	if in.DiskLocations != nil {
+// 		in, out := &in.DiskLocations, &out.DiskLocations
+// 		*out = make(map[string]*v1beta1.DiskLocation, len(*in))
+// 		for key, val := range *in {
+// 			newVal := new(v1beta1.DiskLocation)
+// 			if err := Convert_internal_DiskLocation_To_v1beta1_DiskLocation(val, newVal); err != nil {
+// 				return err
+// 			}
+// 			(*out)[key] = newVal
+// 		}
+// 	} else {
+// 		out.DiskLocations = nil
+// 	}
+// 	return nil
+// }
 
-func Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error {
-	if in.DiskIDs != nil {
-		in, out := &in.DiskIDs, &out.DiskIDs
-		*out = make(map[string]*v1beta1.DiskIDs, len(*in))
-		for key, val := range *in {
-			newVal := new(v1beta1.DiskIDs)
-			if err := Convert_internal_DiskIDs_To_v1beta1_DiskIDs(val, newVal); err != nil {
-				return err
-			}
-			(*out)[key] = newVal
-		}
-	} else {
-		out.DiskIDs = nil
-	}
-	return nil
-}
+// func Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error {
+// 	if in.DiskIDs != nil {
+// 		in, out := &in.DiskIDs, &out.DiskIDs
+// 		*out = make(map[string]*v1beta1.DiskIDs, len(*in))
+// 		for key, val := range *in {
+// 			newVal := new(v1beta1.DiskIDs)
+// 			if err := Convert_internal_DiskIDs_To_v1beta1_DiskIDs(val, newVal); err != nil {
+// 				return err
+// 			}
+// 			(*out)[key] = newVal
+// 		}
+// 	} else {
+// 		out.DiskIDs = nil
+// 	}
+// 	return nil
+// }
 
-func Convert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta1.DiskStatsResponse) error {
-	out.DiskSize = in.DiskSize
-	return nil
-}
+// func Convert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta1.DiskStatsResponse) error {
+// 	out.DiskSize = in.DiskSize
+// 	return nil
+// }
 
-func Convert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta1.DiskStatsRequest, out *internal.DiskStatsRequest) error {
-	out.DiskID = in.DiskID
-	return nil
-}
+// func Convert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta1.DiskStatsRequest, out *internal.DiskStatsRequest) error {
+// 	out.DiskID = in.DiskID
+// 	return nil
+// }
diff --git a/internal/server/disk/internal/v1beta1/conversion_generated.go b/internal/server/disk/internal/v1beta1/conversion_generated.go
index 7ebc70c2..95238e23 100644
--- a/internal/server/disk/internal/v1beta1/conversion_generated.go
+++ b/internal/server/disk/internal/v1beta1/conversion_generated.go
@@ -60,6 +60,11 @@ func autoConvert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1bet
 	return nil
 }
 
+// Convert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest is an autogenerated conversion function.
+func Convert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta1.DiskStatsRequest, out *internal.DiskStatsRequest) error {
+	return autoConvert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest(in, out)
+}
+
 func autoConvert_internal_DiskStatsRequest_To_v1beta1_DiskStatsRequest(in *internal.DiskStatsRequest, out *v1beta1.DiskStatsRequest) error {
 	out.DiskID = in.DiskID
 	return nil
@@ -85,6 +90,11 @@ func autoConvert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in *int
 	return nil
 }
 
+// Convert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse is an autogenerated conversion function.
+func Convert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta1.DiskStatsResponse) error {
+	return autoConvert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in, out)
+}
+
 func autoConvert_v1beta1_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in *v1beta1.ListDiskIDsRequest, out *internal.ListDiskIDsRequest) error {
 	return nil
 }
@@ -104,19 +114,6 @@ func Convert_internal_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest(in *inter
 }
 
 func autoConvert_v1beta1_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta1.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error {
-	if in.DiskIDs != nil {
-		in, out := &in.DiskIDs, &out.DiskIDs
-		*out = make(map[string]*internal.DiskIDs, len(*in))
-		for key, val := range *in {
-			newVal := new(*internal.DiskIDs)
-			if err := Convert_v1beta1_DiskIDs_To_internal_DiskIDs(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.DiskIDs = nil
-	}
 	return nil
 }
 
@@ -126,22 +123,14 @@ func Convert_v1beta1_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1b
 }
 
 func autoConvert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error {
-	if in.DiskIDs != nil {
-		in, out := &in.DiskIDs, &out.DiskIDs
-		*out = make(map[string]*v1beta1.DiskIDs, len(*in))
-		for key, val := range *in {
-			newVal := new(*v1beta1.DiskIDs)
-			if err := Convert_internal_DiskIDs_To_v1beta1_DiskIDs(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.DiskIDs = nil
-	}
 	return nil
 }
 
+// Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse is an autogenerated conversion function.
+func Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error {
+	return autoConvert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in, out)
+}
+
 func autoConvert_v1beta1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta1.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error {
 	return nil
 }
@@ -163,13 +152,13 @@ func Convert_internal_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsReque
 func autoConvert_v1beta1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
 	if in.DiskLocations != nil {
 		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*internal.DiskLocation, len(*in))
+		*out = make(map[uint32]*internal.DiskLocation, len(*in))
 		for key, val := range *in {
 			newVal := new(*internal.DiskLocation)
 			if err := Convert_v1beta1_DiskLocation_To_internal_DiskLocation(*&val, *newVal); err != nil {
 				return err
 			}
-			(*out)[key] = *newVal
+			(*out)[uint32(key)] = *newVal
 		}
 	} else {
 		out.DiskLocations = nil
@@ -191,7 +180,7 @@ func autoConvert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocations
 			if err := Convert_internal_DiskLocation_To_v1beta1_DiskLocation(*&val, *newVal); err != nil {
 				return err
 			}
-			(*out)[key] = *newVal
+			(*out)[string(key)] = *newVal
 		}
 	} else {
 		out.DiskLocations = nil
@@ -199,8 +188,12 @@ func autoConvert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocations
 	return nil
 }
 
+// Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse is an autogenerated conversion function.
+func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error {
+	return autoConvert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in, out)
+}
+
 func autoConvert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
-	out.DiskID = in.DiskID
 	return nil
 }
 
@@ -210,7 +203,6 @@ func Convert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v
 }
 
 func autoConvert_internal_PartitionDiskRequest_To_v1beta1_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta1.PartitionDiskRequest) error {
-	out.DiskID = in.DiskID
 	return nil
 }
 
diff --git a/internal/server/disk/internal/v1beta2/conversion.go b/internal/server/disk/internal/v1beta2/conversion.go
index 7196a59c..285efa05 100644
--- a/internal/server/disk/internal/v1beta2/conversion.go
+++ b/internal/server/disk/internal/v1beta2/conversion.go
@@ -2,51 +2,51 @@ package v1beta2
 
 // Add manual conversion functions here to override automatic conversion functions
 
-import (
-	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
-	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
-)
+// import (
+// 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
+// 	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+// )
 
-func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*v1beta2.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(v1beta2.DiskLocation)
-			if err := Convert_internal_DiskLocation_To_v1beta2_DiskLocation(val, newVal); err != nil {
-				return err
-			}
-			(*out)[key] = newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
+// func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error {
+// 	if in.DiskLocations != nil {
+// 		in, out := &in.DiskLocations, &out.DiskLocations
+// 		*out = make(map[string]*v1beta2.DiskLocation, len(*in))
+// 		for key, val := range *in {
+// 			newVal := new(v1beta2.DiskLocation)
+// 			if err := Convert_internal_DiskLocation_To_v1beta2_DiskLocation(val, newVal); err != nil {
+// 				return err
+// 			}
+// 			(*out)[key] = newVal
+// 		}
+// 	} else {
+// 		out.DiskLocations = nil
+// 	}
+// 	return nil
+// }
 
-func Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error {
-	if in.DiskIDs != nil {
-		in, out := &in.DiskIDs, &out.DiskIDs
-		*out = make(map[string]*v1beta2.DiskIDs, len(*in))
-		for key, val := range *in {
-			newVal := new(v1beta2.DiskIDs)
-			if err := Convert_internal_DiskIDs_To_v1beta2_DiskIDs(val, newVal); err != nil {
-				return err
-			}
-			(*out)[key] = newVal
-		}
-	} else {
-		out.DiskIDs = nil
-	}
-	return nil
-}
+// func Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error {
+// 	if in.DiskIDs != nil {
+// 		in, out := &in.DiskIDs, &out.DiskIDs
+// 		*out = make(map[string]*v1beta2.DiskIDs, len(*in))
+// 		for key, val := range *in {
+// 			newVal := new(v1beta2.DiskIDs)
+// 			if err := Convert_internal_DiskIDs_To_v1beta2_DiskIDs(val, newVal); err != nil {
+// 				return err
+// 			}
+// 			(*out)[key] = newVal
+// 		}
+// 	} else {
+// 		out.DiskIDs = nil
+// 	}
+// 	return nil
+// }
 
-func Convert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta2.DiskStatsResponse) error {
-	out.DiskSize = in.DiskSize
-	return nil
-}
+// func Convert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta2.DiskStatsResponse) error {
+// 	out.DiskSize = in.DiskSize
+// 	return nil
+// }
 
-func Convert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta2.DiskStatsRequest, out *internal.DiskStatsRequest) error {
-	out.DiskID = in.DiskID
-	return nil
-}
+// func Convert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta2.DiskStatsRequest, out *internal.DiskStatsRequest) error {
+// 	out.DiskID = in.DiskID
+// 	return nil
+// }
diff --git a/internal/server/disk/internal/v1beta2/conversion_generated.go b/internal/server/disk/internal/v1beta2/conversion_generated.go
index 22a830ae..324c6441 100644
--- a/internal/server/disk/internal/v1beta2/conversion_generated.go
+++ b/internal/server/disk/internal/v1beta2/conversion_generated.go
@@ -60,6 +60,11 @@ func autoConvert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1bet
 	return nil
 }
 
+// Convert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest is an autogenerated conversion function.
+func Convert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta2.DiskStatsRequest, out *internal.DiskStatsRequest) error {
+	return autoConvert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest(in, out)
+}
+
 func autoConvert_internal_DiskStatsRequest_To_v1beta2_DiskStatsRequest(in *internal.DiskStatsRequest, out *v1beta2.DiskStatsRequest) error {
 	out.DiskID = in.DiskID
 	return nil
@@ -85,6 +90,11 @@ func autoConvert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in *int
 	return nil
 }
 
+// Convert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse is an autogenerated conversion function.
+func Convert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta2.DiskStatsResponse) error {
+	return autoConvert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in, out)
+}
+
 func autoConvert_v1beta2_GetAttachStateRequest_To_internal_GetAttachStateRequest(in *v1beta2.GetAttachStateRequest, out *internal.GetAttachStateRequest) error {
 	out.DiskID = in.DiskID
 	return nil
@@ -144,19 +154,6 @@ func Convert_internal_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest(in *inter
 }
 
 func autoConvert_v1beta2_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta2.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error {
-	if in.DiskIDs != nil {
-		in, out := &in.DiskIDs, &out.DiskIDs
-		*out = make(map[string]*internal.DiskIDs, len(*in))
-		for key, val := range *in {
-			newVal := new(*internal.DiskIDs)
-			if err := Convert_v1beta2_DiskIDs_To_internal_DiskIDs(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.DiskIDs = nil
-	}
 	return nil
 }
 
@@ -166,22 +163,14 @@ func Convert_v1beta2_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1b
 }
 
 func autoConvert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error {
-	if in.DiskIDs != nil {
-		in, out := &in.DiskIDs, &out.DiskIDs
-		*out = make(map[string]*v1beta2.DiskIDs, len(*in))
-		for key, val := range *in {
-			newVal := new(*v1beta2.DiskIDs)
-			if err := Convert_internal_DiskIDs_To_v1beta2_DiskIDs(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.DiskIDs = nil
-	}
 	return nil
 }
 
+// Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse is an autogenerated conversion function.
+func Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error {
+	return autoConvert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in, out)
+}
+
 func autoConvert_v1beta2_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta2.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error {
 	return nil
 }
@@ -203,13 +192,13 @@ func Convert_internal_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsReque
 func autoConvert_v1beta2_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta2.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
 	if in.DiskLocations != nil {
 		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*internal.DiskLocation, len(*in))
+		*out = make(map[uint32]*internal.DiskLocation, len(*in))
 		for key, val := range *in {
 			newVal := new(*internal.DiskLocation)
 			if err := Convert_v1beta2_DiskLocation_To_internal_DiskLocation(*&val, *newVal); err != nil {
 				return err
 			}
-			(*out)[key] = *newVal
+			(*out)[uint32(key)] = *newVal
 		}
 	} else {
 		out.DiskLocations = nil
@@ -231,7 +220,7 @@ func autoConvert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocations
 			if err := Convert_internal_DiskLocation_To_v1beta2_DiskLocation(*&val, *newVal); err != nil {
 				return err
 			}
-			(*out)[key] = *newVal
+			(*out)[string(key)] = *newVal
 		}
 	} else {
 		out.DiskLocations = nil
@@ -239,8 +228,12 @@ func autoConvert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocations
 	return nil
 }
 
+// Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse is an autogenerated conversion function.
+func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error {
+	return autoConvert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in, out)
+}
+
 func autoConvert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta2.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
-	out.DiskID = in.DiskID
 	return nil
 }
 
@@ -250,7 +243,6 @@ func Convert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v
 }
 
 func autoConvert_internal_PartitionDiskRequest_To_v1beta2_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta2.PartitionDiskRequest) error {
-	out.DiskID = in.DiskID
 	return nil
 }
 
diff --git a/internal/server/disk/internal/v1beta3/conversion.go b/internal/server/disk/internal/v1beta3/conversion.go
index 450bd111..42012fdc 100644
--- a/internal/server/disk/internal/v1beta3/conversion.go
+++ b/internal/server/disk/internal/v1beta3/conversion.go
@@ -1,52 +1,44 @@
 package v1beta3
 
-// Add manual conversion functions here to override automatic conversion functions
+// import (
+// 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
+// 	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+// )
 
-import (
-	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
-	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
-)
+// // Add manual conversion functions here to override automatic conversion functions
 
-func Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*v1beta3.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(v1beta3.DiskLocation)
-			if err := Convert_internal_DiskLocation_To_v1beta3_DiskLocation(val, newVal); err != nil {
-				return err
-			}
-			(*out)[key] = newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
+// func Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error {
+// 	if in.DiskLocations != nil {
+// 		in, out := &in.DiskLocations, &out.DiskLocations
+// 		*out = make(map[uint32]*v1beta3.DiskLocation, len(*in))
+// 		for key, val := range *in {
+// 			newVal := new(v1beta3.DiskLocation)
+// 			// override (auto generated code has (*&val, *newVal))
+// 			if err := Convert_internal_DiskLocation_To_v1beta3_DiskLocation(val, newVal); err != nil {
+// 				return err
+// 			}
+// 			(*out)[key] = newVal
+// 		}
+// 	} else {
+// 		out.DiskLocations = nil
+// 	}
+// 	return nil
+// }
 
-func Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error {
-	if in.DiskIDs != nil {
-		in, out := &in.DiskIDs, &out.DiskIDs
-		*out = make(map[string]*v1beta3.DiskIDs, len(*in))
-		for key, val := range *in {
-			newVal := new(v1beta3.DiskIDs)
-			if err := Convert_internal_DiskIDs_To_v1beta3_DiskIDs(val, newVal); err != nil {
-				return err
-			}
-			(*out)[key] = newVal
-		}
-	} else {
-		out.DiskIDs = nil
-	}
-	return nil
-}
-
-func Convert_internal_DiskStatsResponse_To_v1beta3_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta3.DiskStatsResponse) error {
-	out.DiskSize = in.DiskSize
-	return nil
-}
-
-func Convert_v1beta3_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta3.DiskStatsRequest, out *internal.DiskStatsRequest) error {
-	out.DiskID = in.DiskID
-	return nil
-}
+// func Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error {
+// 	if in.DiskNumbers != nil {
+// 		in, out := &in.DiskNumbers, &out.DiskNumbers
+// 		*out = make(map[uint32]*v1beta3.DiskIDs, len(*in))
+// 		for key, val := range *in {
+// 			newVal := new(v1beta3.DiskIDs)
+// 			// override
+// 			if err := Convert_internal_DiskIDs_To_v1beta3_DiskIDs(val, newVal); err != nil {
+// 				return err
+// 			}
+// 			(*out)[key] = newVal
+// 		}
+// 	} else {
+// 		out.DiskNumbers = nil
+// 	}
+// 	return nil
+// }
diff --git a/internal/server/disk/internal/v1beta3/conversion_generated.go b/internal/server/disk/internal/v1beta3/conversion_generated.go
index 9932ebd8..fb12d86c 100644
--- a/internal/server/disk/internal/v1beta3/conversion_generated.go
+++ b/internal/server/disk/internal/v1beta3/conversion_generated.go
@@ -55,74 +55,84 @@ func Convert_internal_DiskLocation_To_v1beta3_DiskLocation(in *internal.DiskLoca
 	return autoConvert_internal_DiskLocation_To_v1beta3_DiskLocation(in, out)
 }
 
-func autoConvert_v1beta3_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta3.DiskStatsRequest, out *internal.DiskStatsRequest) error {
-	out.DiskID = in.DiskID
+func autoConvert_v1beta3_GetDiskStateRequest_To_internal_GetDiskStateRequest(in *v1beta3.GetDiskStateRequest, out *internal.GetDiskStateRequest) error {
+	out.DiskNumber = in.DiskNumber
 	return nil
 }
 
-func autoConvert_internal_DiskStatsRequest_To_v1beta3_DiskStatsRequest(in *internal.DiskStatsRequest, out *v1beta3.DiskStatsRequest) error {
-	out.DiskID = in.DiskID
+// Convert_v1beta3_GetDiskStateRequest_To_internal_GetDiskStateRequest is an autogenerated conversion function.
+func Convert_v1beta3_GetDiskStateRequest_To_internal_GetDiskStateRequest(in *v1beta3.GetDiskStateRequest, out *internal.GetDiskStateRequest) error {
+	return autoConvert_v1beta3_GetDiskStateRequest_To_internal_GetDiskStateRequest(in, out)
+}
+
+func autoConvert_internal_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest(in *internal.GetDiskStateRequest, out *v1beta3.GetDiskStateRequest) error {
+	out.DiskNumber = in.DiskNumber
 	return nil
 }
 
-// Convert_internal_DiskStatsRequest_To_v1beta3_DiskStatsRequest is an autogenerated conversion function.
-func Convert_internal_DiskStatsRequest_To_v1beta3_DiskStatsRequest(in *internal.DiskStatsRequest, out *v1beta3.DiskStatsRequest) error {
-	return autoConvert_internal_DiskStatsRequest_To_v1beta3_DiskStatsRequest(in, out)
+// Convert_internal_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest is an autogenerated conversion function.
+func Convert_internal_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest(in *internal.GetDiskStateRequest, out *v1beta3.GetDiskStateRequest) error {
+	return autoConvert_internal_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest(in, out)
 }
 
-func autoConvert_v1beta3_DiskStatsResponse_To_internal_DiskStatsResponse(in *v1beta3.DiskStatsResponse, out *internal.DiskStatsResponse) error {
-	out.DiskSize = in.DiskSize
+func autoConvert_v1beta3_GetDiskStateResponse_To_internal_GetDiskStateResponse(in *v1beta3.GetDiskStateResponse, out *internal.GetDiskStateResponse) error {
+	out.IsOnline = in.IsOnline
 	return nil
 }
 
-// Convert_v1beta3_DiskStatsResponse_To_internal_DiskStatsResponse is an autogenerated conversion function.
-func Convert_v1beta3_DiskStatsResponse_To_internal_DiskStatsResponse(in *v1beta3.DiskStatsResponse, out *internal.DiskStatsResponse) error {
-	return autoConvert_v1beta3_DiskStatsResponse_To_internal_DiskStatsResponse(in, out)
+// Convert_v1beta3_GetDiskStateResponse_To_internal_GetDiskStateResponse is an autogenerated conversion function.
+func Convert_v1beta3_GetDiskStateResponse_To_internal_GetDiskStateResponse(in *v1beta3.GetDiskStateResponse, out *internal.GetDiskStateResponse) error {
+	return autoConvert_v1beta3_GetDiskStateResponse_To_internal_GetDiskStateResponse(in, out)
 }
 
-func autoConvert_internal_DiskStatsResponse_To_v1beta3_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta3.DiskStatsResponse) error {
-	out.DiskSize = in.DiskSize
+func autoConvert_internal_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(in *internal.GetDiskStateResponse, out *v1beta3.GetDiskStateResponse) error {
+	out.IsOnline = in.IsOnline
 	return nil
 }
 
-func autoConvert_v1beta3_GetAttachStateRequest_To_internal_GetAttachStateRequest(in *v1beta3.GetAttachStateRequest, out *internal.GetAttachStateRequest) error {
-	out.DiskID = in.DiskID
+// Convert_internal_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse is an autogenerated conversion function.
+func Convert_internal_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(in *internal.GetDiskStateResponse, out *v1beta3.GetDiskStateResponse) error {
+	return autoConvert_internal_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(in, out)
+}
+
+func autoConvert_v1beta3_GetDiskStatsRequest_To_internal_GetDiskStatsRequest(in *v1beta3.GetDiskStatsRequest, out *internal.GetDiskStatsRequest) error {
+	out.DiskNumber = in.DiskNumber
 	return nil
 }
 
-// Convert_v1beta3_GetAttachStateRequest_To_internal_GetAttachStateRequest is an autogenerated conversion function.
-func Convert_v1beta3_GetAttachStateRequest_To_internal_GetAttachStateRequest(in *v1beta3.GetAttachStateRequest, out *internal.GetAttachStateRequest) error {
-	return autoConvert_v1beta3_GetAttachStateRequest_To_internal_GetAttachStateRequest(in, out)
+// Convert_v1beta3_GetDiskStatsRequest_To_internal_GetDiskStatsRequest is an autogenerated conversion function.
+func Convert_v1beta3_GetDiskStatsRequest_To_internal_GetDiskStatsRequest(in *v1beta3.GetDiskStatsRequest, out *internal.GetDiskStatsRequest) error {
+	return autoConvert_v1beta3_GetDiskStatsRequest_To_internal_GetDiskStatsRequest(in, out)
 }
 
-func autoConvert_internal_GetAttachStateRequest_To_v1beta3_GetAttachStateRequest(in *internal.GetAttachStateRequest, out *v1beta3.GetAttachStateRequest) error {
-	out.DiskID = in.DiskID
+func autoConvert_internal_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest(in *internal.GetDiskStatsRequest, out *v1beta3.GetDiskStatsRequest) error {
+	out.DiskNumber = in.DiskNumber
 	return nil
 }
 
-// Convert_internal_GetAttachStateRequest_To_v1beta3_GetAttachStateRequest is an autogenerated conversion function.
-func Convert_internal_GetAttachStateRequest_To_v1beta3_GetAttachStateRequest(in *internal.GetAttachStateRequest, out *v1beta3.GetAttachStateRequest) error {
-	return autoConvert_internal_GetAttachStateRequest_To_v1beta3_GetAttachStateRequest(in, out)
+// Convert_internal_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest is an autogenerated conversion function.
+func Convert_internal_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest(in *internal.GetDiskStatsRequest, out *v1beta3.GetDiskStatsRequest) error {
+	return autoConvert_internal_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest(in, out)
 }
 
-func autoConvert_v1beta3_GetAttachStateResponse_To_internal_GetAttachStateResponse(in *v1beta3.GetAttachStateResponse, out *internal.GetAttachStateResponse) error {
-	out.IsOnline = in.IsOnline
+func autoConvert_v1beta3_GetDiskStatsResponse_To_internal_GetDiskStatsResponse(in *v1beta3.GetDiskStatsResponse, out *internal.GetDiskStatsResponse) error {
+	out.TotalBytes = in.TotalBytes
 	return nil
 }
 
-// Convert_v1beta3_GetAttachStateResponse_To_internal_GetAttachStateResponse is an autogenerated conversion function.
-func Convert_v1beta3_GetAttachStateResponse_To_internal_GetAttachStateResponse(in *v1beta3.GetAttachStateResponse, out *internal.GetAttachStateResponse) error {
-	return autoConvert_v1beta3_GetAttachStateResponse_To_internal_GetAttachStateResponse(in, out)
+// Convert_v1beta3_GetDiskStatsResponse_To_internal_GetDiskStatsResponse is an autogenerated conversion function.
+func Convert_v1beta3_GetDiskStatsResponse_To_internal_GetDiskStatsResponse(in *v1beta3.GetDiskStatsResponse, out *internal.GetDiskStatsResponse) error {
+	return autoConvert_v1beta3_GetDiskStatsResponse_To_internal_GetDiskStatsResponse(in, out)
 }
 
-func autoConvert_internal_GetAttachStateResponse_To_v1beta3_GetAttachStateResponse(in *internal.GetAttachStateResponse, out *v1beta3.GetAttachStateResponse) error {
-	out.IsOnline = in.IsOnline
+func autoConvert_internal_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(in *internal.GetDiskStatsResponse, out *v1beta3.GetDiskStatsResponse) error {
+	out.TotalBytes = in.TotalBytes
 	return nil
 }
 
-// Convert_internal_GetAttachStateResponse_To_v1beta3_GetAttachStateResponse is an autogenerated conversion function.
-func Convert_internal_GetAttachStateResponse_To_v1beta3_GetAttachStateResponse(in *internal.GetAttachStateResponse, out *v1beta3.GetAttachStateResponse) error {
-	return autoConvert_internal_GetAttachStateResponse_To_v1beta3_GetAttachStateResponse(in, out)
+// Convert_internal_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse is an autogenerated conversion function.
+func Convert_internal_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(in *internal.GetDiskStatsResponse, out *v1beta3.GetDiskStatsResponse) error {
+	return autoConvert_internal_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(in, out)
 }
 
 func autoConvert_v1beta3_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in *v1beta3.ListDiskIDsRequest, out *internal.ListDiskIDsRequest) error {
@@ -144,19 +154,6 @@ func Convert_internal_ListDiskIDsRequest_To_v1beta3_ListDiskIDsRequest(in *inter
 }
 
 func autoConvert_v1beta3_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta3.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error {
-	if in.DiskIDs != nil {
-		in, out := &in.DiskIDs, &out.DiskIDs
-		*out = make(map[string]*internal.DiskIDs, len(*in))
-		for key, val := range *in {
-			newVal := new(*internal.DiskIDs)
-			if err := Convert_v1beta3_DiskIDs_To_internal_DiskIDs(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.DiskIDs = nil
-	}
 	return nil
 }
 
@@ -166,22 +163,14 @@ func Convert_v1beta3_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1b
 }
 
 func autoConvert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error {
-	if in.DiskIDs != nil {
-		in, out := &in.DiskIDs, &out.DiskIDs
-		*out = make(map[string]*v1beta3.DiskIDs, len(*in))
-		for key, val := range *in {
-			newVal := new(*v1beta3.DiskIDs)
-			if err := Convert_internal_DiskIDs_To_v1beta3_DiskIDs(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.DiskIDs = nil
-	}
 	return nil
 }
 
+// Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse is an autogenerated conversion function.
+func Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error {
+	return autoConvert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in, out)
+}
+
 func autoConvert_v1beta3_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta3.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error {
 	return nil
 }
@@ -203,7 +192,7 @@ func Convert_internal_ListDiskLocationsRequest_To_v1beta3_ListDiskLocationsReque
 func autoConvert_v1beta3_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta3.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
 	if in.DiskLocations != nil {
 		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*internal.DiskLocation, len(*in))
+		*out = make(map[uint32]*internal.DiskLocation, len(*in))
 		for key, val := range *in {
 			newVal := new(*internal.DiskLocation)
 			if err := Convert_v1beta3_DiskLocation_To_internal_DiskLocation(*&val, *newVal); err != nil {
@@ -225,7 +214,7 @@ func Convert_v1beta3_ListDiskLocationsResponse_To_internal_ListDiskLocationsResp
 func autoConvert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error {
 	if in.DiskLocations != nil {
 		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*v1beta3.DiskLocation, len(*in))
+		*out = make(map[uint32]*v1beta3.DiskLocation, len(*in))
 		for key, val := range *in {
 			newVal := new(*v1beta3.DiskLocation)
 			if err := Convert_internal_DiskLocation_To_v1beta3_DiskLocation(*&val, *newVal); err != nil {
@@ -239,8 +228,13 @@ func autoConvert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocations
 	return nil
 }
 
+// Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse is an autogenerated conversion function.
+func Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error {
+	return autoConvert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in, out)
+}
+
 func autoConvert_v1beta3_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta3.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
-	out.DiskID = in.DiskID
+	out.DiskNumber = in.DiskNumber
 	return nil
 }
 
@@ -250,7 +244,7 @@ func Convert_v1beta3_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v
 }
 
 func autoConvert_internal_PartitionDiskRequest_To_v1beta3_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta3.PartitionDiskRequest) error {
-	out.DiskID = in.DiskID
+	out.DiskNumber = in.DiskNumber
 	return nil
 }
 
@@ -313,42 +307,42 @@ func Convert_internal_RescanResponse_To_v1beta3_RescanResponse(in *internal.Resc
 	return autoConvert_internal_RescanResponse_To_v1beta3_RescanResponse(in, out)
 }
 
-func autoConvert_v1beta3_SetAttachStateRequest_To_internal_SetAttachStateRequest(in *v1beta3.SetAttachStateRequest, out *internal.SetAttachStateRequest) error {
-	out.DiskID = in.DiskID
+func autoConvert_v1beta3_SetDiskStateRequest_To_internal_SetDiskStateRequest(in *v1beta3.SetDiskStateRequest, out *internal.SetDiskStateRequest) error {
+	out.DiskNumber = in.DiskNumber
 	out.IsOnline = in.IsOnline
 	return nil
 }
 
-// Convert_v1beta3_SetAttachStateRequest_To_internal_SetAttachStateRequest is an autogenerated conversion function.
-func Convert_v1beta3_SetAttachStateRequest_To_internal_SetAttachStateRequest(in *v1beta3.SetAttachStateRequest, out *internal.SetAttachStateRequest) error {
-	return autoConvert_v1beta3_SetAttachStateRequest_To_internal_SetAttachStateRequest(in, out)
+// Convert_v1beta3_SetDiskStateRequest_To_internal_SetDiskStateRequest is an autogenerated conversion function.
+func Convert_v1beta3_SetDiskStateRequest_To_internal_SetDiskStateRequest(in *v1beta3.SetDiskStateRequest, out *internal.SetDiskStateRequest) error {
+	return autoConvert_v1beta3_SetDiskStateRequest_To_internal_SetDiskStateRequest(in, out)
 }
 
-func autoConvert_internal_SetAttachStateRequest_To_v1beta3_SetAttachStateRequest(in *internal.SetAttachStateRequest, out *v1beta3.SetAttachStateRequest) error {
-	out.DiskID = in.DiskID
+func autoConvert_internal_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest(in *internal.SetDiskStateRequest, out *v1beta3.SetDiskStateRequest) error {
+	out.DiskNumber = in.DiskNumber
 	out.IsOnline = in.IsOnline
 	return nil
 }
 
-// Convert_internal_SetAttachStateRequest_To_v1beta3_SetAttachStateRequest is an autogenerated conversion function.
-func Convert_internal_SetAttachStateRequest_To_v1beta3_SetAttachStateRequest(in *internal.SetAttachStateRequest, out *v1beta3.SetAttachStateRequest) error {
-	return autoConvert_internal_SetAttachStateRequest_To_v1beta3_SetAttachStateRequest(in, out)
+// Convert_internal_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest is an autogenerated conversion function.
+func Convert_internal_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest(in *internal.SetDiskStateRequest, out *v1beta3.SetDiskStateRequest) error {
+	return autoConvert_internal_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest(in, out)
 }
 
-func autoConvert_v1beta3_SetAttachStateResponse_To_internal_SetAttachStateResponse(in *v1beta3.SetAttachStateResponse, out *internal.SetAttachStateResponse) error {
+func autoConvert_v1beta3_SetDiskStateResponse_To_internal_SetDiskStateResponse(in *v1beta3.SetDiskStateResponse, out *internal.SetDiskStateResponse) error {
 	return nil
 }
 
-// Convert_v1beta3_SetAttachStateResponse_To_internal_SetAttachStateResponse is an autogenerated conversion function.
-func Convert_v1beta3_SetAttachStateResponse_To_internal_SetAttachStateResponse(in *v1beta3.SetAttachStateResponse, out *internal.SetAttachStateResponse) error {
-	return autoConvert_v1beta3_SetAttachStateResponse_To_internal_SetAttachStateResponse(in, out)
+// Convert_v1beta3_SetDiskStateResponse_To_internal_SetDiskStateResponse is an autogenerated conversion function.
+func Convert_v1beta3_SetDiskStateResponse_To_internal_SetDiskStateResponse(in *v1beta3.SetDiskStateResponse, out *internal.SetDiskStateResponse) error {
+	return autoConvert_v1beta3_SetDiskStateResponse_To_internal_SetDiskStateResponse(in, out)
 }
 
-func autoConvert_internal_SetAttachStateResponse_To_v1beta3_SetAttachStateResponse(in *internal.SetAttachStateResponse, out *v1beta3.SetAttachStateResponse) error {
+func autoConvert_internal_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(in *internal.SetDiskStateResponse, out *v1beta3.SetDiskStateResponse) error {
 	return nil
 }
 
-// Convert_internal_SetAttachStateResponse_To_v1beta3_SetAttachStateResponse is an autogenerated conversion function.
-func Convert_internal_SetAttachStateResponse_To_v1beta3_SetAttachStateResponse(in *internal.SetAttachStateResponse, out *v1beta3.SetAttachStateResponse) error {
-	return autoConvert_internal_SetAttachStateResponse_To_v1beta3_SetAttachStateResponse(in, out)
+// Convert_internal_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse is an autogenerated conversion function.
+func Convert_internal_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(in *internal.SetDiskStateResponse, out *v1beta3.SetDiskStateResponse) error {
+	return autoConvert_internal_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(in, out)
 }
diff --git a/internal/server/disk/internal/v1beta3/server_generated.go b/internal/server/disk/internal/v1beta3/server_generated.go
index 01096bce..ab510464 100644
--- a/internal/server/disk/internal/v1beta3/server_generated.go
+++ b/internal/server/disk/internal/v1beta3/server_generated.go
@@ -27,38 +27,38 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) {
 	v1beta3.RegisterDiskServer(grpcServer, s)
 }
 
-func (s *versionedAPI) DiskStats(context context.Context, versionedRequest *v1beta3.DiskStatsRequest) (*v1beta3.DiskStatsResponse, error) {
-	request := &internal.DiskStatsRequest{}
-	if err := Convert_v1beta3_DiskStatsRequest_To_internal_DiskStatsRequest(versionedRequest, request); err != nil {
+func (s *versionedAPI) GetDiskState(context context.Context, versionedRequest *v1beta3.GetDiskStateRequest) (*v1beta3.GetDiskStateResponse, error) {
+	request := &internal.GetDiskStateRequest{}
+	if err := Convert_v1beta3_GetDiskStateRequest_To_internal_GetDiskStateRequest(versionedRequest, request); err != nil {
 		return nil, err
 	}
 
-	response, err := s.apiGroupServer.DiskStats(context, request, version)
+	response, err := s.apiGroupServer.GetDiskState(context, request, version)
 	if err != nil {
 		return nil, err
 	}
 
-	versionedResponse := &v1beta3.DiskStatsResponse{}
-	if err := Convert_internal_DiskStatsResponse_To_v1beta3_DiskStatsResponse(response, versionedResponse); err != nil {
+	versionedResponse := &v1beta3.GetDiskStateResponse{}
+	if err := Convert_internal_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(response, versionedResponse); err != nil {
 		return nil, err
 	}
 
 	return versionedResponse, err
 }
 
-func (s *versionedAPI) GetAttachState(context context.Context, versionedRequest *v1beta3.GetAttachStateRequest) (*v1beta3.GetAttachStateResponse, error) {
-	request := &internal.GetAttachStateRequest{}
-	if err := Convert_v1beta3_GetAttachStateRequest_To_internal_GetAttachStateRequest(versionedRequest, request); err != nil {
+func (s *versionedAPI) GetDiskStats(context context.Context, versionedRequest *v1beta3.GetDiskStatsRequest) (*v1beta3.GetDiskStatsResponse, error) {
+	request := &internal.GetDiskStatsRequest{}
+	if err := Convert_v1beta3_GetDiskStatsRequest_To_internal_GetDiskStatsRequest(versionedRequest, request); err != nil {
 		return nil, err
 	}
 
-	response, err := s.apiGroupServer.GetAttachState(context, request, version)
+	response, err := s.apiGroupServer.GetDiskStats(context, request, version)
 	if err != nil {
 		return nil, err
 	}
 
-	versionedResponse := &v1beta3.GetAttachStateResponse{}
-	if err := Convert_internal_GetAttachStateResponse_To_v1beta3_GetAttachStateResponse(response, versionedResponse); err != nil {
+	versionedResponse := &v1beta3.GetDiskStatsResponse{}
+	if err := Convert_internal_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(response, versionedResponse); err != nil {
 		return nil, err
 	}
 
@@ -141,19 +141,19 @@ func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1beta3
 	return versionedResponse, err
 }
 
-func (s *versionedAPI) SetAttachState(context context.Context, versionedRequest *v1beta3.SetAttachStateRequest) (*v1beta3.SetAttachStateResponse, error) {
-	request := &internal.SetAttachStateRequest{}
-	if err := Convert_v1beta3_SetAttachStateRequest_To_internal_SetAttachStateRequest(versionedRequest, request); err != nil {
+func (s *versionedAPI) SetDiskState(context context.Context, versionedRequest *v1beta3.SetDiskStateRequest) (*v1beta3.SetDiskStateResponse, error) {
+	request := &internal.SetDiskStateRequest{}
+	if err := Convert_v1beta3_SetDiskStateRequest_To_internal_SetDiskStateRequest(versionedRequest, request); err != nil {
 		return nil, err
 	}
 
-	response, err := s.apiGroupServer.SetAttachState(context, request, version)
+	response, err := s.apiGroupServer.SetDiskState(context, request, version)
 	if err != nil {
 		return nil, err
 	}
 
-	versionedResponse := &v1beta3.SetAttachStateResponse{}
-	if err := Convert_internal_SetAttachStateResponse_To_v1beta3_SetAttachStateResponse(response, versionedResponse); err != nil {
+	versionedResponse := &v1beta3.SetDiskStateResponse{}
+	if err := Convert_internal_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(response, versionedResponse); err != nil {
 		return nil, err
 	}
 
diff --git a/internal/server/disk/server.go b/internal/server/disk/server.go
index 9f9b5955..1516c30f 100644
--- a/internal/server/disk/server.go
+++ b/internal/server/disk/server.go
@@ -5,30 +5,16 @@ import (
 	"fmt"
 
 	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
+	"github.com/kubernetes-csi/csi-proxy/internal/os/disk"
 	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
-	shared "github.com/kubernetes-csi/csi-proxy/internal/shared/disk"
 	"k8s.io/klog/v2"
 )
 
 type Server struct {
-	hostAPI API
+	hostAPI disk.API
 }
 
-type API interface {
-	ListDiskLocations() (map[string]shared.DiskLocation, error)
-	IsDiskInitialized(diskID string) (bool, error)
-	InitializeDisk(diskID string) error
-	PartitionsExist(diskID string) (bool, error)
-	CreatePartition(diskID string) error
-	Rescan() error
-	GetDiskNumberByName(diskName string) (string, error)
-	ListDiskIDs() (map[string]shared.DiskIDs, error)
-	DiskStats(diskID string) (int64, error)
-	SetAttachState(diskID string, isOnline bool) error
-	GetAttachState(diskID string) (bool, error)
-}
-
-func NewServer(hostAPI API) (*Server, error) {
+func NewServer(hostAPI disk.API) (*Server, error) {
 	return &Server{
 		hostAPI: hostAPI,
 	}, nil
@@ -43,7 +29,7 @@ func (s *Server) ListDiskLocations(context context.Context, request *internal.Li
 		return response, err
 	}
 
-	response.DiskLocations = make(map[string]*internal.DiskLocation)
+	response.DiskLocations = make(map[uint32]*internal.DiskLocation)
 	for k, v := range m {
 		d := &internal.DiskLocation{}
 		d.Adapter = v.Adapter
@@ -56,41 +42,41 @@ func (s *Server) ListDiskLocations(context context.Context, request *internal.Li
 }
 
 func (s *Server) PartitionDisk(context context.Context, request *internal.PartitionDiskRequest, version apiversion.Version) (*internal.PartitionDiskResponse, error) {
-	klog.V(4).Infof("calling PartitionDisk with diskID %q", request.DiskID)
+	klog.V(4).Infof("calling PartitionDisk with diskNumber=%d", request.DiskNumber)
 	response := &internal.PartitionDiskResponse{}
-	diskID := request.DiskID
+	diskNumber := request.DiskNumber
 
-	initialized, err := s.hostAPI.IsDiskInitialized(diskID)
+	initialized, err := s.hostAPI.IsDiskInitialized(diskNumber)
 	if err != nil {
 		klog.Errorf("failed check IsDiskInitialized %v", err)
 		return response, err
 	}
 	if !initialized {
-		klog.V(4).Infof("Initializing disk %s", diskID)
-		err = s.hostAPI.InitializeDisk(diskID)
+		klog.V(4).Infof("Initializing disk %d", diskNumber)
+		err = s.hostAPI.InitializeDisk(diskNumber)
 		if err != nil {
 			klog.Errorf("failed InitializeDisk %v", err)
 			return response, err
 		}
 	} else {
-		klog.V(4).Infof("Disk %s already initialized", diskID)
+		klog.V(4).Infof("Disk %d already initialized", diskNumber)
 	}
 
-	klog.V(4).Infof("Checking if disk %s is partitioned", diskID)
-	partitioned, err := s.hostAPI.PartitionsExist(diskID)
+	klog.V(4).Infof("Checking if disk %d is partitioned", diskNumber)
+	partitioned, err := s.hostAPI.PartitionsExist(diskNumber)
 	if err != nil {
 		klog.Errorf("failed check PartitionsExist %v", err)
 		return response, err
 	}
 	if !partitioned {
-		klog.V(4).Infof("Creating partition on disk %s", diskID)
-		err = s.hostAPI.CreatePartition(diskID)
+		klog.V(4).Infof("Creating partition on disk %d", diskNumber)
+		err = s.hostAPI.CreatePartition(diskNumber)
 		if err != nil {
 			klog.Errorf("failed CreatePartition %v", err)
 			return response, err
 		}
 	} else {
-		klog.V(4).Infof("Disk %s already partitioned", diskID)
+		klog.V(4).Infof("Disk %d already partitioned", diskNumber)
 	}
 	return response, nil
 }
@@ -133,7 +119,7 @@ func (s *Server) ListDiskIDs(context context.Context, request *internal.ListDisk
 		klog.Errorf("failed ListDiskIDs %v", err)
 		return nil, err
 	}
-	responseDiskIDs := make(map[string]*internal.DiskIDs)
+	responseDiskIDs := make(map[uint32]*internal.DiskIDs)
 
 	// Convert from shared to internal type
 	for k, v := range diskIDs {
@@ -143,63 +129,63 @@ func (s *Server) ListDiskIDs(context context.Context, request *internal.ListDisk
 		}
 		responseDiskIDs[k] = &diskIDs
 	}
-	response.DiskIDs = responseDiskIDs
+	response.DiskNumbers = responseDiskIDs
 	return response, nil
 }
 
-func (s *Server) DiskStats(context context.Context, request *internal.DiskStatsRequest, version apiversion.Version) (*internal.DiskStatsResponse, error) {
-	klog.V(4).Infof("calling GetDiskStats with diskID %q", request.DiskID)
+func (s *Server) GetDiskStats(context context.Context, request *internal.GetDiskStatsRequest, version apiversion.Version) (*internal.GetDiskStatsResponse, error) {
+	klog.V(4).Infof("calling GetDiskStats with diskNumber=%d", request.DiskNumber)
 	minimumVersion := apiversion.NewVersionOrPanic("v1beta1")
 	if version.Compare(minimumVersion) < 0 {
 		return nil, fmt.Errorf("GetDiskStats requires CSI-Proxy API version v1beta1 or greater")
 	}
-	diskID := request.DiskID
+	diskNumber := request.DiskNumber
 
-	diskSize, err := s.hostAPI.DiskStats(diskID)
+	diskSize, err := s.hostAPI.GetDiskStats(diskNumber)
 	if err != nil {
 		klog.Errorf("failed GetDiskStats %v", err)
 		return nil, err
 	}
 
-	response := &internal.DiskStatsResponse{
+	response := &internal.GetDiskStatsResponse{
 		DiskSize: diskSize,
 	}
 
 	return response, nil
 }
 
-func (s *Server) SetAttachState(_ context.Context, request *internal.SetAttachStateRequest, version apiversion.Version) (*internal.SetAttachStateResponse, error) {
-	klog.V(4).Infof("calling SetAttachState with diskID %q and isOnline %v", request.DiskID, request.IsOnline)
+func (s *Server) SetDiskState(_ context.Context, request *internal.SetDiskStateRequest, version apiversion.Version) (*internal.SetDiskStateResponse, error) {
+	klog.V(4).Infof("calling SetDiskState with diskNumber %q and isOnline %v", request.DiskNumber, request.IsOnline)
 	minimumVersion := apiversion.NewVersionOrPanic("v1beta2")
 	if version.Compare(minimumVersion) < 0 {
-		return nil, fmt.Errorf("SetAttachState requires CSI-Proxy API version v1beta2 or greater")
+		return nil, fmt.Errorf("SetDiskState requires CSI-Proxy API version v1beta2 or greater")
 	}
 
-	err := s.hostAPI.SetAttachState(request.DiskID, request.IsOnline)
+	err := s.hostAPI.SetDiskState(request.DiskNumber, request.IsOnline)
 	if err != nil {
-		klog.Errorf("failed SetAttachState %v", err)
+		klog.Errorf("failed SetDiskState %v", err)
 		return nil, err
 	}
 
-	response := &internal.SetAttachStateResponse{}
+	response := &internal.SetDiskStateResponse{}
 
 	return response, nil
 }
 
-func (s *Server) GetAttachState(_ context.Context, request *internal.GetAttachStateRequest, version apiversion.Version) (*internal.GetAttachStateResponse, error) {
-	klog.V(4).Infof("calling GetAttachState with diskID %q", request.DiskID)
+func (s *Server) GetDiskState(_ context.Context, request *internal.GetDiskStateRequest, version apiversion.Version) (*internal.GetDiskStateResponse, error) {
+	klog.V(4).Infof("calling GetDiskState with diskNumber %q", request.DiskNumber)
 	minimumVersion := apiversion.NewVersionOrPanic("v1beta2")
 	if version.Compare(minimumVersion) < 0 {
-		return nil, fmt.Errorf("GetAttachState requires CSI-Proxy API version v1beta2 or greater")
+		return nil, fmt.Errorf("GetDiskState requires CSI-Proxy API version v1beta2 or greater")
 	}
 
-	isOnline, err := s.hostAPI.GetAttachState(request.DiskID)
+	isOnline, err := s.hostAPI.GetDiskState(request.DiskNumber)
 	if err != nil {
-		klog.Errorf("failed GetAttachState %v", err)
+		klog.Errorf("failed GetDiskState %v", err)
 		return nil, err
 	}
 
-	response := &internal.GetAttachStateResponse{IsOnline: isOnline}
+	response := &internal.GetDiskStateResponse{IsOnline: isOnline}
 
 	return response, nil
 }
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
index 8e9a8de4..7f7ca84e 100644
--- a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
@@ -138,8 +138,8 @@ type ListDiskLocationsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of disk device IDs and <adapter, bus, target, lun ID> associated with each disk device
-	DiskLocations map[string]*DiskLocation `protobuf:"bytes,1,rep,name=disk_locations,json=diskLocations,proto3" json:"disk_locations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Map of disk device number and <adapter, bus, target, lun ID> associated with each disk device.
+	DiskLocations map[uint32]*DiskLocation `protobuf:"bytes,1,rep,name=disk_locations,json=diskLocations,proto3" json:"disk_locations,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *ListDiskLocationsResponse) Reset() {
@@ -174,7 +174,7 @@ func (*ListDiskLocationsResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *ListDiskLocationsResponse) GetDiskLocations() map[string]*DiskLocation {
+func (x *ListDiskLocationsResponse) GetDiskLocations() map[uint32]*DiskLocation {
 	if x != nil {
 		return x.DiskLocations
 	}
@@ -186,8 +186,8 @@ type PartitionDiskRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Disk device ID of the disk to partition
-	DiskID string `protobuf:"bytes,1,opt,name=diskID,proto3" json:"diskID,omitempty"`
+	// Disk device number of the disk to partition.
+	DiskNumber uint32 `protobuf:"varint,1,opt,name=disk_number,json=diskNumber,proto3" json:"disk_number,omitempty"`
 }
 
 func (x *PartitionDiskRequest) Reset() {
@@ -222,11 +222,11 @@ func (*PartitionDiskRequest) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *PartitionDiskRequest) GetDiskID() string {
+func (x *PartitionDiskRequest) GetDiskNumber() uint32 {
 	if x != nil {
-		return x.DiskID
+		return x.DiskNumber
 	}
-	return ""
+	return 0
 }
 
 type PartitionDiskResponse struct {
@@ -386,7 +386,7 @@ type DiskIDs struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of Disk ID types and Disk ID values
+	// Map of Disk ID types and Disk ID values.
 	Identifiers map[string]string `protobuf:"bytes,1,rep,name=identifiers,proto3" json:"identifiers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
@@ -434,8 +434,8 @@ type ListDiskIDsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of disk device numbers and IDs <page83> associated with each disk device
-	DiskIDs map[string]*DiskIDs `protobuf:"bytes,1,rep,name=diskIDs,proto3" json:"diskIDs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Map of disk device numbers and IDs <page83> associated with each disk device.
+	DiskIds map[uint32]*DiskIDs `protobuf:"bytes,1,rep,name=disk_ids,json=diskIds,proto3" json:"disk_ids,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *ListDiskIDsResponse) Reset() {
@@ -470,24 +470,24 @@ func (*ListDiskIDsResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *ListDiskIDsResponse) GetDiskIDs() map[string]*DiskIDs {
+func (x *ListDiskIDsResponse) GetDiskIds() map[uint32]*DiskIDs {
 	if x != nil {
-		return x.DiskIDs
+		return x.DiskIds
 	}
 	return nil
 }
 
-type DiskStatsRequest struct {
+type GetDiskStatsRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Disk device ID of the disk to get the size from
-	DiskID string `protobuf:"bytes,1,opt,name=diskID,proto3" json:"diskID,omitempty"`
+	// Disk device number of the disk to get the stats from.
+	DiskNumber uint32 `protobuf:"varint,1,opt,name=disk_number,json=diskNumber,proto3" json:"disk_number,omitempty"`
 }
 
-func (x *DiskStatsRequest) Reset() {
-	*x = DiskStatsRequest{}
+func (x *GetDiskStatsRequest) Reset() {
+	*x = GetDiskStatsRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -495,13 +495,13 @@ func (x *DiskStatsRequest) Reset() {
 	}
 }
 
-func (x *DiskStatsRequest) String() string {
+func (x *GetDiskStatsRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DiskStatsRequest) ProtoMessage() {}
+func (*GetDiskStatsRequest) ProtoMessage() {}
 
-func (x *DiskStatsRequest) ProtoReflect() protoreflect.Message {
+func (x *GetDiskStatsRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -513,29 +513,29 @@ func (x *DiskStatsRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DiskStatsRequest.ProtoReflect.Descriptor instead.
-func (*DiskStatsRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetDiskStatsRequest.ProtoReflect.Descriptor instead.
+func (*GetDiskStatsRequest) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *DiskStatsRequest) GetDiskID() string {
+func (x *GetDiskStatsRequest) GetDiskNumber() uint32 {
 	if x != nil {
-		return x.DiskID
+		return x.DiskNumber
 	}
-	return ""
+	return 0
 }
 
-type DiskStatsResponse struct {
+type GetDiskStatsResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	//Total size of the volume
-	DiskSize int64 `protobuf:"varint,1,opt,name=diskSize,proto3" json:"diskSize,omitempty"`
+	// Total size of the volume.
+	TotalBytes int64 `protobuf:"varint,1,opt,name=total_bytes,json=totalBytes,proto3" json:"total_bytes,omitempty"`
 }
 
-func (x *DiskStatsResponse) Reset() {
-	*x = DiskStatsResponse{}
+func (x *GetDiskStatsResponse) Reset() {
+	*x = GetDiskStatsResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -543,13 +543,13 @@ func (x *DiskStatsResponse) Reset() {
 	}
 }
 
-func (x *DiskStatsResponse) String() string {
+func (x *GetDiskStatsResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DiskStatsResponse) ProtoMessage() {}
+func (*GetDiskStatsResponse) ProtoMessage() {}
 
-func (x *DiskStatsResponse) ProtoReflect() protoreflect.Message {
+func (x *GetDiskStatsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -561,31 +561,31 @@ func (x *DiskStatsResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DiskStatsResponse.ProtoReflect.Descriptor instead.
-func (*DiskStatsResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetDiskStatsResponse.ProtoReflect.Descriptor instead.
+func (*GetDiskStatsResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{11}
 }
 
-func (x *DiskStatsResponse) GetDiskSize() int64 {
+func (x *GetDiskStatsResponse) GetTotalBytes() int64 {
 	if x != nil {
-		return x.DiskSize
+		return x.TotalBytes
 	}
 	return 0
 }
 
-type SetAttachStateRequest struct {
+type SetDiskStateRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Disk device ID (number) of the disk which state will change
-	DiskID string `protobuf:"bytes,1,opt,name=diskID,proto3" json:"diskID,omitempty"`
-	// Online state to set for the disk. true for online, false for offline
-	IsOnline bool `protobuf:"varint,2,opt,name=isOnline,proto3" json:"isOnline,omitempty"`
+	// Disk device number of the disk.
+	DiskNumber uint32 `protobuf:"varint,1,opt,name=disk_number,json=diskNumber,proto3" json:"disk_number,omitempty"`
+	// Online state to set for the disk. true for online, false for offline.
+	IsOnline bool `protobuf:"varint,2,opt,name=is_online,json=isOnline,proto3" json:"is_online,omitempty"`
 }
 
-func (x *SetAttachStateRequest) Reset() {
-	*x = SetAttachStateRequest{}
+func (x *SetDiskStateRequest) Reset() {
+	*x = SetDiskStateRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -593,13 +593,13 @@ func (x *SetAttachStateRequest) Reset() {
 	}
 }
 
-func (x *SetAttachStateRequest) String() string {
+func (x *SetDiskStateRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SetAttachStateRequest) ProtoMessage() {}
+func (*SetDiskStateRequest) ProtoMessage() {}
 
-func (x *SetAttachStateRequest) ProtoReflect() protoreflect.Message {
+func (x *SetDiskStateRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -611,33 +611,33 @@ func (x *SetAttachStateRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SetAttachStateRequest.ProtoReflect.Descriptor instead.
-func (*SetAttachStateRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use SetDiskStateRequest.ProtoReflect.Descriptor instead.
+func (*SetDiskStateRequest) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *SetAttachStateRequest) GetDiskID() string {
+func (x *SetDiskStateRequest) GetDiskNumber() uint32 {
 	if x != nil {
-		return x.DiskID
+		return x.DiskNumber
 	}
-	return ""
+	return 0
 }
 
-func (x *SetAttachStateRequest) GetIsOnline() bool {
+func (x *SetDiskStateRequest) GetIsOnline() bool {
 	if x != nil {
 		return x.IsOnline
 	}
 	return false
 }
 
-type SetAttachStateResponse struct {
+type SetDiskStateResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *SetAttachStateResponse) Reset() {
-	*x = SetAttachStateResponse{}
+func (x *SetDiskStateResponse) Reset() {
+	*x = SetDiskStateResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -645,13 +645,13 @@ func (x *SetAttachStateResponse) Reset() {
 	}
 }
 
-func (x *SetAttachStateResponse) String() string {
+func (x *SetDiskStateResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SetAttachStateResponse) ProtoMessage() {}
+func (*SetDiskStateResponse) ProtoMessage() {}
 
-func (x *SetAttachStateResponse) ProtoReflect() protoreflect.Message {
+func (x *SetDiskStateResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -663,22 +663,22 @@ func (x *SetAttachStateResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SetAttachStateResponse.ProtoReflect.Descriptor instead.
-func (*SetAttachStateResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use SetDiskStateResponse.ProtoReflect.Descriptor instead.
+func (*SetDiskStateResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{13}
 }
 
-type GetAttachStateRequest struct {
+type GetDiskStateRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Disk device ID (number) of the disk
-	DiskID string `protobuf:"bytes,1,opt,name=diskID,proto3" json:"diskID,omitempty"`
+	// Disk device number of the disk.
+	DiskNumber uint32 `protobuf:"varint,1,opt,name=disk_number,json=diskNumber,proto3" json:"disk_number,omitempty"`
 }
 
-func (x *GetAttachStateRequest) Reset() {
-	*x = GetAttachStateRequest{}
+func (x *GetDiskStateRequest) Reset() {
+	*x = GetDiskStateRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -686,13 +686,13 @@ func (x *GetAttachStateRequest) Reset() {
 	}
 }
 
-func (x *GetAttachStateRequest) String() string {
+func (x *GetDiskStateRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetAttachStateRequest) ProtoMessage() {}
+func (*GetDiskStateRequest) ProtoMessage() {}
 
-func (x *GetAttachStateRequest) ProtoReflect() protoreflect.Message {
+func (x *GetDiskStateRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -704,29 +704,29 @@ func (x *GetAttachStateRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetAttachStateRequest.ProtoReflect.Descriptor instead.
-func (*GetAttachStateRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetDiskStateRequest.ProtoReflect.Descriptor instead.
+func (*GetDiskStateRequest) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{14}
 }
 
-func (x *GetAttachStateRequest) GetDiskID() string {
+func (x *GetDiskStateRequest) GetDiskNumber() uint32 {
 	if x != nil {
-		return x.DiskID
+		return x.DiskNumber
 	}
-	return ""
+	return 0
 }
 
-type GetAttachStateResponse struct {
+type GetDiskStateResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Online state of the disk. true for online, false for offline
-	IsOnline bool `protobuf:"varint,1,opt,name=isOnline,proto3" json:"isOnline,omitempty"`
+	// Online state of the disk. true for online, false for offline.
+	IsOnline bool `protobuf:"varint,1,opt,name=is_online,json=isOnline,proto3" json:"is_online,omitempty"`
 }
 
-func (x *GetAttachStateResponse) Reset() {
-	*x = GetAttachStateResponse{}
+func (x *GetDiskStateResponse) Reset() {
+	*x = GetDiskStateResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -734,13 +734,13 @@ func (x *GetAttachStateResponse) Reset() {
 	}
 }
 
-func (x *GetAttachStateResponse) String() string {
+func (x *GetDiskStateResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*GetAttachStateResponse) ProtoMessage() {}
+func (*GetDiskStateResponse) ProtoMessage() {}
 
-func (x *GetAttachStateResponse) ProtoReflect() protoreflect.Message {
+func (x *GetDiskStateResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -752,12 +752,12 @@ func (x *GetAttachStateResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GetAttachStateResponse.ProtoReflect.Descriptor instead.
-func (*GetAttachStateResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetDiskStateResponse.ProtoReflect.Descriptor instead.
+func (*GetDiskStateResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{15}
 }
 
-func (x *GetAttachStateResponse) GetIsOnline() bool {
+func (x *GetDiskStateResponse) GetIsOnline() bool {
 	if x != nil {
 		return x.IsOnline
 	}
@@ -790,96 +790,99 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_r
 	0x74, 0x72, 0x79, 0x52, 0x0d, 0x64, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x73, 0x1a, 0x57, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
 	0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2b, 0x0a, 0x05, 0x76, 0x61,
+	0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2b, 0x0a, 0x05, 0x76, 0x61,
 	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x76, 0x31, 0x62, 0x65,
 	0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2e, 0x0a, 0x14, 0x50,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x37, 0x0a, 0x14, 0x50,
 	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x22, 0x17, 0x0a, 0x15, 0x50,
-	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x10, 0x0a, 0x0e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x44,
-	0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x8e, 0x01,
-	0x0a, 0x07, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x12, 0x43, 0x0a, 0x0b, 0x69, 0x64, 0x65,
-	0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73,
-	0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x0b, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x1a, 0x3e,
-	0x0a, 0x10, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa8,
-	0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x1a, 0x4c, 0x0a, 0x0c, 0x44,
-	0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76,
-	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2a, 0x0a, 0x10, 0x44, 0x69, 0x73,
-	0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a,
-	0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64,
-	0x69, 0x73, 0x6b, 0x49, 0x44, 0x22, 0x2f, 0x0a, 0x11, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61,
-	0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69,
-	0x73, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x69,
-	0x73, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x4b, 0x0a, 0x15, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74,
-	0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x16, 0x0a, 0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x22, 0x18, 0x0a, 0x16, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x0a,
-	0x15, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x22, 0x34,
-	0x0a, 0x16, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x4f, 0x6e,
-	0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e,
-	0x6c, 0x69, 0x6e, 0x65, 0x32, 0xaf, 0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c, 0x0a,
-	0x11, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73,
-	0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
-	0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d, 0x50,
-	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e, 0x76,
-	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76, 0x31,
-	0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44,
-	0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b, 0x0a,
-	0x06, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x17, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c, 0x69,
-	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62, 0x65,
-	0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x44, 0x0a, 0x09, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74,
-	0x61, 0x74, 0x73, 0x12, 0x19, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69,
-	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61,
-	0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x0e,
-	0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1e,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61,
-	0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61,
-	0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x53, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x12, 0x1e, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65,
-	0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65,
-	0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d,
-	0x63, 0x73, 0x69, 0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c,
-	0x69, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31,
-	0x62, 0x65, 0x74, 0x61, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62,
+	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75,
+	0x6d, 0x62, 0x65, 0x72, 0x22, 0x17, 0x0a, 0x15, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x0f, 0x0a,
+	0x0d, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x10,
+	0x0a, 0x0e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x14, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x8e, 0x01, 0x0a, 0x07, 0x44, 0x69, 0x73, 0x6b, 0x49,
+	0x44, 0x73, 0x12, 0x43, 0x0a, 0x0b, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x69, 0x64, 0x65, 0x6e,
+	0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x1a, 0x3e, 0x0a, 0x10, 0x49, 0x64, 0x65, 0x6e, 0x74,
+	0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa9, 0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x44, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
+	0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x69,
+	0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x4c, 0x0a, 0x0c, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74,
+	0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69,
+	0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
+	0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x37, 0x0a, 0x14, 0x47,
+	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74,
+	0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42,
+	0x79, 0x74, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x13, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64,
+	0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09,
+	0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x65, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b,
+	0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64,
+	0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x33, 0x0a, 0x14, 0x47, 0x65, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x32, 0xac,
+	0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x44,
+	0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76,
+	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c,
+	0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69,
+	0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
+	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x63, 0x61,
+	0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63,
+	0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x76, 0x31, 0x62, 0x65,
+	0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69,
+	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44,
+	0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73,
+	0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69,
+	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d,
+	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
+	0x4d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12,
+	0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73,
+	0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e,
+	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d,
+	0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c,
+	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76,
+	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a,
+	0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65,
+	0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d, 0x63, 0x73, 0x69, 0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70,
+	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -906,36 +909,36 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_g
 	(*ListDiskIDsRequest)(nil),        // 7: v1beta3.ListDiskIDsRequest
 	(*DiskIDs)(nil),                   // 8: v1beta3.DiskIDs
 	(*ListDiskIDsResponse)(nil),       // 9: v1beta3.ListDiskIDsResponse
-	(*DiskStatsRequest)(nil),          // 10: v1beta3.DiskStatsRequest
-	(*DiskStatsResponse)(nil),         // 11: v1beta3.DiskStatsResponse
-	(*SetAttachStateRequest)(nil),     // 12: v1beta3.SetAttachStateRequest
-	(*SetAttachStateResponse)(nil),    // 13: v1beta3.SetAttachStateResponse
-	(*GetAttachStateRequest)(nil),     // 14: v1beta3.GetAttachStateRequest
-	(*GetAttachStateResponse)(nil),    // 15: v1beta3.GetAttachStateResponse
+	(*GetDiskStatsRequest)(nil),       // 10: v1beta3.GetDiskStatsRequest
+	(*GetDiskStatsResponse)(nil),      // 11: v1beta3.GetDiskStatsResponse
+	(*SetDiskStateRequest)(nil),       // 12: v1beta3.SetDiskStateRequest
+	(*SetDiskStateResponse)(nil),      // 13: v1beta3.SetDiskStateResponse
+	(*GetDiskStateRequest)(nil),       // 14: v1beta3.GetDiskStateRequest
+	(*GetDiskStateResponse)(nil),      // 15: v1beta3.GetDiskStateResponse
 	nil,                               // 16: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
 	nil,                               // 17: v1beta3.DiskIDs.IdentifiersEntry
-	nil,                               // 18: v1beta3.ListDiskIDsResponse.DiskIDsEntry
+	nil,                               // 18: v1beta3.ListDiskIDsResponse.DiskIdsEntry
 }
 var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_depIdxs = []int32{
 	16, // 0: v1beta3.ListDiskLocationsResponse.disk_locations:type_name -> v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
 	17, // 1: v1beta3.DiskIDs.identifiers:type_name -> v1beta3.DiskIDs.IdentifiersEntry
-	18, // 2: v1beta3.ListDiskIDsResponse.diskIDs:type_name -> v1beta3.ListDiskIDsResponse.DiskIDsEntry
+	18, // 2: v1beta3.ListDiskIDsResponse.disk_ids:type_name -> v1beta3.ListDiskIDsResponse.DiskIdsEntry
 	1,  // 3: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry.value:type_name -> v1beta3.DiskLocation
-	8,  // 4: v1beta3.ListDiskIDsResponse.DiskIDsEntry.value:type_name -> v1beta3.DiskIDs
+	8,  // 4: v1beta3.ListDiskIDsResponse.DiskIdsEntry.value:type_name -> v1beta3.DiskIDs
 	0,  // 5: v1beta3.Disk.ListDiskLocations:input_type -> v1beta3.ListDiskLocationsRequest
 	3,  // 6: v1beta3.Disk.PartitionDisk:input_type -> v1beta3.PartitionDiskRequest
 	5,  // 7: v1beta3.Disk.Rescan:input_type -> v1beta3.RescanRequest
 	7,  // 8: v1beta3.Disk.ListDiskIDs:input_type -> v1beta3.ListDiskIDsRequest
-	10, // 9: v1beta3.Disk.DiskStats:input_type -> v1beta3.DiskStatsRequest
-	12, // 10: v1beta3.Disk.SetAttachState:input_type -> v1beta3.SetAttachStateRequest
-	14, // 11: v1beta3.Disk.GetAttachState:input_type -> v1beta3.GetAttachStateRequest
+	10, // 9: v1beta3.Disk.GetDiskStats:input_type -> v1beta3.GetDiskStatsRequest
+	12, // 10: v1beta3.Disk.SetDiskState:input_type -> v1beta3.SetDiskStateRequest
+	14, // 11: v1beta3.Disk.GetDiskState:input_type -> v1beta3.GetDiskStateRequest
 	2,  // 12: v1beta3.Disk.ListDiskLocations:output_type -> v1beta3.ListDiskLocationsResponse
 	4,  // 13: v1beta3.Disk.PartitionDisk:output_type -> v1beta3.PartitionDiskResponse
 	6,  // 14: v1beta3.Disk.Rescan:output_type -> v1beta3.RescanResponse
 	9,  // 15: v1beta3.Disk.ListDiskIDs:output_type -> v1beta3.ListDiskIDsResponse
-	11, // 16: v1beta3.Disk.DiskStats:output_type -> v1beta3.DiskStatsResponse
-	13, // 17: v1beta3.Disk.SetAttachState:output_type -> v1beta3.SetAttachStateResponse
-	15, // 18: v1beta3.Disk.GetAttachState:output_type -> v1beta3.GetAttachStateResponse
+	11, // 16: v1beta3.Disk.GetDiskStats:output_type -> v1beta3.GetDiskStatsResponse
+	13, // 17: v1beta3.Disk.SetDiskState:output_type -> v1beta3.SetDiskStateResponse
+	15, // 18: v1beta3.Disk.GetDiskState:output_type -> v1beta3.GetDiskStateResponse
 	12, // [12:19] is the sub-list for method output_type
 	5,  // [5:12] is the sub-list for method input_type
 	5,  // [5:5] is the sub-list for extension type_name
@@ -1070,7 +1073,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DiskStatsRequest); i {
+			switch v := v.(*GetDiskStatsRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1082,7 +1085,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DiskStatsResponse); i {
+			switch v := v.(*GetDiskStatsResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1094,7 +1097,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SetAttachStateRequest); i {
+			switch v := v.(*SetDiskStateRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1106,7 +1109,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SetAttachStateResponse); i {
+			switch v := v.(*SetDiskStateResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1118,7 +1121,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAttachStateRequest); i {
+			switch v := v.(*GetDiskStateRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1130,7 +1133,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			}
 		}
 		file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetAttachStateResponse); i {
+			switch v := v.(*GetDiskStateResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1175,21 +1178,21 @@ const _ = grpc.SupportPackageIsVersion6
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type DiskClient interface {
 	// ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all
-	// disk devices enumerated by the host
+	// disk devices enumerated by the host.
 	ListDiskLocations(ctx context.Context, in *ListDiskLocationsRequest, opts ...grpc.CallOption) (*ListDiskLocationsResponse, error)
 	// PartitionDisk initializes and partitions a disk device (if the disk has not
-	// been partitioned already) and returns the resulting volume device ID
+	// been partitioned already) and returns the resulting volume device ID.
 	PartitionDisk(ctx context.Context, in *PartitionDiskRequest, opts ...grpc.CallOption) (*PartitionDiskResponse, error)
-	// Rescan refreshes the host's storage cache
+	// Rescan refreshes the host's storage cache.
 	Rescan(ctx context.Context, in *RescanRequest, opts ...grpc.CallOption) (*RescanResponse, error)
-	// ListDiskIDs returns a map of DiskID objects where the key is the disk number
+	// ListDiskIDs returns a map of DiskID objects where the key is the disk number.
 	ListDiskIDs(ctx context.Context, in *ListDiskIDsRequest, opts ...grpc.CallOption) (*ListDiskIDsResponse, error)
-	// DiskStats returns the stats for the disk
-	DiskStats(ctx context.Context, in *DiskStatsRequest, opts ...grpc.CallOption) (*DiskStatsResponse, error)
-	// SetAttachState sets the offline/online state of a disk
-	SetAttachState(ctx context.Context, in *SetAttachStateRequest, opts ...grpc.CallOption) (*SetAttachStateResponse, error)
-	// GetAttachState gets the offline/online state of a disk
-	GetAttachState(ctx context.Context, in *GetAttachStateRequest, opts ...grpc.CallOption) (*GetAttachStateResponse, error)
+	// GetDiskStats returns the stats of a disk.
+	GetDiskStats(ctx context.Context, in *GetDiskStatsRequest, opts ...grpc.CallOption) (*GetDiskStatsResponse, error)
+	// SetDiskState sets the offline/online state of a disk.
+	SetDiskState(ctx context.Context, in *SetDiskStateRequest, opts ...grpc.CallOption) (*SetDiskStateResponse, error)
+	// GetDiskState gets the offline/online state of a disk.
+	GetDiskState(ctx context.Context, in *GetDiskStateRequest, opts ...grpc.CallOption) (*GetDiskStateResponse, error)
 }
 
 type diskClient struct {
@@ -1236,27 +1239,27 @@ func (c *diskClient) ListDiskIDs(ctx context.Context, in *ListDiskIDsRequest, op
 	return out, nil
 }
 
-func (c *diskClient) DiskStats(ctx context.Context, in *DiskStatsRequest, opts ...grpc.CallOption) (*DiskStatsResponse, error) {
-	out := new(DiskStatsResponse)
-	err := c.cc.Invoke(ctx, "/v1beta3.Disk/DiskStats", in, out, opts...)
+func (c *diskClient) GetDiskStats(ctx context.Context, in *GetDiskStatsRequest, opts ...grpc.CallOption) (*GetDiskStatsResponse, error) {
+	out := new(GetDiskStatsResponse)
+	err := c.cc.Invoke(ctx, "/v1beta3.Disk/GetDiskStats", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *diskClient) SetAttachState(ctx context.Context, in *SetAttachStateRequest, opts ...grpc.CallOption) (*SetAttachStateResponse, error) {
-	out := new(SetAttachStateResponse)
-	err := c.cc.Invoke(ctx, "/v1beta3.Disk/SetAttachState", in, out, opts...)
+func (c *diskClient) SetDiskState(ctx context.Context, in *SetDiskStateRequest, opts ...grpc.CallOption) (*SetDiskStateResponse, error) {
+	out := new(SetDiskStateResponse)
+	err := c.cc.Invoke(ctx, "/v1beta3.Disk/SetDiskState", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *diskClient) GetAttachState(ctx context.Context, in *GetAttachStateRequest, opts ...grpc.CallOption) (*GetAttachStateResponse, error) {
-	out := new(GetAttachStateResponse)
-	err := c.cc.Invoke(ctx, "/v1beta3.Disk/GetAttachState", in, out, opts...)
+func (c *diskClient) GetDiskState(ctx context.Context, in *GetDiskStateRequest, opts ...grpc.CallOption) (*GetDiskStateResponse, error) {
+	out := new(GetDiskStateResponse)
+	err := c.cc.Invoke(ctx, "/v1beta3.Disk/GetDiskState", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1266,21 +1269,21 @@ func (c *diskClient) GetAttachState(ctx context.Context, in *GetAttachStateReque
 // DiskServer is the server API for Disk service.
 type DiskServer interface {
 	// ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all
-	// disk devices enumerated by the host
+	// disk devices enumerated by the host.
 	ListDiskLocations(context.Context, *ListDiskLocationsRequest) (*ListDiskLocationsResponse, error)
 	// PartitionDisk initializes and partitions a disk device (if the disk has not
-	// been partitioned already) and returns the resulting volume device ID
+	// been partitioned already) and returns the resulting volume device ID.
 	PartitionDisk(context.Context, *PartitionDiskRequest) (*PartitionDiskResponse, error)
-	// Rescan refreshes the host's storage cache
+	// Rescan refreshes the host's storage cache.
 	Rescan(context.Context, *RescanRequest) (*RescanResponse, error)
-	// ListDiskIDs returns a map of DiskID objects where the key is the disk number
+	// ListDiskIDs returns a map of DiskID objects where the key is the disk number.
 	ListDiskIDs(context.Context, *ListDiskIDsRequest) (*ListDiskIDsResponse, error)
-	// DiskStats returns the stats for the disk
-	DiskStats(context.Context, *DiskStatsRequest) (*DiskStatsResponse, error)
-	// SetAttachState sets the offline/online state of a disk
-	SetAttachState(context.Context, *SetAttachStateRequest) (*SetAttachStateResponse, error)
-	// GetAttachState gets the offline/online state of a disk
-	GetAttachState(context.Context, *GetAttachStateRequest) (*GetAttachStateResponse, error)
+	// GetDiskStats returns the stats of a disk.
+	GetDiskStats(context.Context, *GetDiskStatsRequest) (*GetDiskStatsResponse, error)
+	// SetDiskState sets the offline/online state of a disk.
+	SetDiskState(context.Context, *SetDiskStateRequest) (*SetDiskStateResponse, error)
+	// GetDiskState gets the offline/online state of a disk.
+	GetDiskState(context.Context, *GetDiskStateRequest) (*GetDiskStateResponse, error)
 }
 
 // UnimplementedDiskServer can be embedded to have forward compatible implementations.
@@ -1299,14 +1302,14 @@ func (*UnimplementedDiskServer) Rescan(context.Context, *RescanRequest) (*Rescan
 func (*UnimplementedDiskServer) ListDiskIDs(context.Context, *ListDiskIDsRequest) (*ListDiskIDsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListDiskIDs not implemented")
 }
-func (*UnimplementedDiskServer) DiskStats(context.Context, *DiskStatsRequest) (*DiskStatsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DiskStats not implemented")
+func (*UnimplementedDiskServer) GetDiskStats(context.Context, *GetDiskStatsRequest) (*GetDiskStatsResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetDiskStats not implemented")
 }
-func (*UnimplementedDiskServer) SetAttachState(context.Context, *SetAttachStateRequest) (*SetAttachStateResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetAttachState not implemented")
+func (*UnimplementedDiskServer) SetDiskState(context.Context, *SetDiskStateRequest) (*SetDiskStateResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SetDiskState not implemented")
 }
-func (*UnimplementedDiskServer) GetAttachState(context.Context, *GetAttachStateRequest) (*GetAttachStateResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetAttachState not implemented")
+func (*UnimplementedDiskServer) GetDiskState(context.Context, *GetDiskStateRequest) (*GetDiskStateResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetDiskState not implemented")
 }
 
 func RegisterDiskServer(s *grpc.Server, srv DiskServer) {
@@ -1385,56 +1388,56 @@ func _Disk_ListDiskIDs_Handler(srv interface{}, ctx context.Context, dec func(in
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Disk_DiskStats_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DiskStatsRequest)
+func _Disk_GetDiskStats_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDiskStatsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(DiskServer).DiskStats(ctx, in)
+		return srv.(DiskServer).GetDiskStats(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/v1beta3.Disk/DiskStats",
+		FullMethod: "/v1beta3.Disk/GetDiskStats",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DiskServer).DiskStats(ctx, req.(*DiskStatsRequest))
+		return srv.(DiskServer).GetDiskStats(ctx, req.(*GetDiskStatsRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Disk_SetAttachState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetAttachStateRequest)
+func _Disk_SetDiskState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetDiskStateRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(DiskServer).SetAttachState(ctx, in)
+		return srv.(DiskServer).SetDiskState(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/v1beta3.Disk/SetAttachState",
+		FullMethod: "/v1beta3.Disk/SetDiskState",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DiskServer).SetAttachState(ctx, req.(*SetAttachStateRequest))
+		return srv.(DiskServer).SetDiskState(ctx, req.(*SetDiskStateRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Disk_GetAttachState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetAttachStateRequest)
+func _Disk_GetDiskState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDiskStateRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(DiskServer).GetAttachState(ctx, in)
+		return srv.(DiskServer).GetDiskState(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/v1beta3.Disk/GetAttachState",
+		FullMethod: "/v1beta3.Disk/GetDiskState",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(DiskServer).GetAttachState(ctx, req.(*GetAttachStateRequest))
+		return srv.(DiskServer).GetDiskState(ctx, req.(*GetDiskStateRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1460,16 +1463,16 @@ var _Disk_serviceDesc = grpc.ServiceDesc{
 			Handler:    _Disk_ListDiskIDs_Handler,
 		},
 		{
-			MethodName: "DiskStats",
-			Handler:    _Disk_DiskStats_Handler,
+			MethodName: "GetDiskStats",
+			Handler:    _Disk_GetDiskStats_Handler,
 		},
 		{
-			MethodName: "SetAttachState",
-			Handler:    _Disk_SetAttachState_Handler,
+			MethodName: "SetDiskState",
+			Handler:    _Disk_SetDiskState_Handler,
 		},
 		{
-			MethodName: "GetAttachState",
-			Handler:    _Disk_GetAttachState_Handler,
+			MethodName: "GetDiskState",
+			Handler:    _Disk_GetDiskState_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
index 89234524..1a5ab1e3 100644
--- a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
@@ -6,31 +6,31 @@ option go_package = "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3
 
 service Disk {
     // ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all
-    // disk devices enumerated by the host
+    // disk devices enumerated by the host.
     rpc ListDiskLocations(ListDiskLocationsRequest) returns (ListDiskLocationsResponse) {}
 
     // PartitionDisk initializes and partitions a disk device (if the disk has not
-    // been partitioned already) and returns the resulting volume device ID
+    // been partitioned already) and returns the resulting volume device ID.
     rpc PartitionDisk(PartitionDiskRequest) returns (PartitionDiskResponse) {}
 
-    // Rescan refreshes the host's storage cache
+    // Rescan refreshes the host's storage cache.
     rpc Rescan(RescanRequest) returns (RescanResponse) {}
 
-    // ListDiskIDs returns a map of DiskID objects where the key is the disk number
+    // ListDiskIDs returns a map of DiskID objects where the key is the disk number.
     rpc ListDiskIDs(ListDiskIDsRequest) returns (ListDiskIDsResponse) {}
 
-    // DiskStats returns the stats for the disk
-    rpc DiskStats(DiskStatsRequest) returns (DiskStatsResponse) {}
+    // GetDiskStats returns the stats of a disk.
+    rpc GetDiskStats(GetDiskStatsRequest) returns (GetDiskStatsResponse) {}
 
-    // SetAttachState sets the offline/online state of a disk
-    rpc SetAttachState(SetAttachStateRequest) returns (SetAttachStateResponse) {}
+    // SetDiskState sets the offline/online state of a disk.
+    rpc SetDiskState(SetDiskStateRequest) returns (SetDiskStateResponse) {}
 
-    // GetAttachState gets the offline/online state of a disk
-    rpc GetAttachState(GetAttachStateRequest) returns (GetAttachStateResponse) {}
+    // GetDiskState gets the offline/online state of a disk.
+    rpc GetDiskState(GetDiskStateRequest) returns (GetDiskStateResponse) {}
 }
 
 message ListDiskLocationsRequest {
-    // Intentionally empty
+    // Intentionally empty.
 }
 
 message DiskLocation {
@@ -41,69 +41,69 @@ message DiskLocation {
 }
 
 message ListDiskLocationsResponse {
-    // Map of disk device IDs and <adapter, bus, target, lun ID> associated with each disk device
-    map <string, DiskLocation> disk_locations = 1;
+    // Map of disk device number and <adapter, bus, target, lun ID> associated with each disk device.
+    map <uint32, DiskLocation> disk_locations = 1;
 }
 
 message PartitionDiskRequest {
-    // Disk device ID of the disk to partition
-    string diskID = 1;
+    // Disk device number of the disk to partition.
+    uint32 disk_number = 1;
 }
 
 message PartitionDiskResponse {
-    // Intentionally empty
+    // Intentionally empty.
 }
 
 message RescanRequest {
-    // Intentionally empty
+    // Intentionally empty.
 }
 
 message RescanResponse {
-    // Intentionally empty
+    // Intentionally empty.
 }
 
 message ListDiskIDsRequest {
-    // Intentionally empty
+    // Intentionally empty.
 }
 
 message DiskIDs {
-    // Map of Disk ID types and Disk ID values
+    // Map of Disk ID types and Disk ID values.
     map <string, string> identifiers = 1;
 }
 
 message ListDiskIDsResponse {
-    // Map of disk device numbers and IDs <page83> associated with each disk device
-    map <string, DiskIDs> diskIDs = 1;
+    // Map of disk device numbers and IDs <page83> associated with each disk device.
+    map <uint32, DiskIDs> disk_ids = 1;
 }
 
-message DiskStatsRequest {
-    // Disk device ID of the disk to get the size from
-    string diskID = 1;
+message GetDiskStatsRequest {
+    // Disk device number of the disk to get the stats from.
+    uint32 disk_number = 1;
 }
 
-message DiskStatsResponse {
-    //Total size of the volume
-    int64 diskSize = 1;
+message GetDiskStatsResponse {
+    // Total size of the volume.
+    int64 total_bytes = 1;
 }
 
-message SetAttachStateRequest {
-    // Disk device ID (number) of the disk which state will change
-    string diskID = 1;
+message SetDiskStateRequest {
+    // Disk device number of the disk.
+    uint32 disk_number = 1;
 
-    // Online state to set for the disk. true for online, false for offline
-    bool isOnline = 2;
+    // Online state to set for the disk. true for online, false for offline.
+    bool is_online = 2;
 }
 
-message SetAttachStateResponse {
+message SetDiskStateResponse {
+    // Intentionally empty.
 }
 
-message GetAttachStateRequest {
-    // Disk device ID (number) of the disk
-    string diskID = 1;
+message GetDiskStateRequest {
+    // Disk device number of the disk.
+    uint32 disk_number = 1;
 }
 
-message GetAttachStateResponse {
-    // Online state of the disk. true for online, false for offline
-    bool isOnline = 1;
+message GetDiskStateResponse {
+    // Online state of the disk. true for online, false for offline.
+    bool is_online = 1;
 }
-
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3/client_generated.go b/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3/client_generated.go
index e16f595a..37b2393d 100644
--- a/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3/client_generated.go
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3/client_generated.go
@@ -65,12 +65,12 @@ func (w *Client) Close() error {
 // ensures we implement all the required methods
 var _ v1beta3.DiskClient = &Client{}
 
-func (w *Client) DiskStats(context context.Context, request *v1beta3.DiskStatsRequest, opts ...grpc.CallOption) (*v1beta3.DiskStatsResponse, error) {
-	return w.client.DiskStats(context, request, opts...)
+func (w *Client) GetDiskState(context context.Context, request *v1beta3.GetDiskStateRequest, opts ...grpc.CallOption) (*v1beta3.GetDiskStateResponse, error) {
+	return w.client.GetDiskState(context, request, opts...)
 }
 
-func (w *Client) GetAttachState(context context.Context, request *v1beta3.GetAttachStateRequest, opts ...grpc.CallOption) (*v1beta3.GetAttachStateResponse, error) {
-	return w.client.GetAttachState(context, request, opts...)
+func (w *Client) GetDiskStats(context context.Context, request *v1beta3.GetDiskStatsRequest, opts ...grpc.CallOption) (*v1beta3.GetDiskStatsResponse, error) {
+	return w.client.GetDiskStats(context, request, opts...)
 }
 
 func (w *Client) ListDiskIDs(context context.Context, request *v1beta3.ListDiskIDsRequest, opts ...grpc.CallOption) (*v1beta3.ListDiskIDsResponse, error) {
@@ -89,6 +89,6 @@ func (w *Client) Rescan(context context.Context, request *v1beta3.RescanRequest,
 	return w.client.Rescan(context, request, opts...)
 }
 
-func (w *Client) SetAttachState(context context.Context, request *v1beta3.SetAttachStateRequest, opts ...grpc.CallOption) (*v1beta3.SetAttachStateResponse, error) {
-	return w.client.SetAttachState(context, request, opts...)
+func (w *Client) SetDiskState(context context.Context, request *v1beta3.SetDiskStateRequest, opts ...grpc.CallOption) (*v1beta3.SetDiskStateResponse, error) {
+	return w.client.SetDiskState(context, request, opts...)
 }

From 62056be65418f650e1c7e30785a02ac92af54877 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Tue, 25 May 2021 06:56:40 +0000
Subject: [PATCH 02/22] Add E2E scripts

---
 docs/DEVELOPMENT.md    | 24 +++++++++++++++++++
 scripts/e2e-runner.ps1 | 51 ++++++++++++++++++++++++++++++++++++++++
 scripts/e2e-tests.sh   | 53 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+)
 create mode 100644 scripts/e2e-runner.ps1
 create mode 100755 scripts/e2e-tests.sh

diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index 9f1b3a02..ad3a0871 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -90,3 +90,27 @@ If there are any non-backward compatible changes (for example renaming a paramet
 - Remap old parameters in previous API versions e.g. let's say that we make a remap in `v1beta3` then we need to updated `v1alpha1`, `v1beta1`, etc. using the `conversion.go` file. (see #138)
 - Update `internal/<group>/server.go` if there are new methods, the old methods should forward the request (see #138)
 
+## Running E2E tests
+
+There are a few presubmit tests that run in Github Actions, E2E tests need to run in a Windows VM with Hyper-V enabled, to run the E2E tests in Google Cloud follow this workflow:
+
+- Modify scripts/e2e-runner.ps1 to use your repo/branch
+- Create a windows VM for csi-proxy with scripts/e2e-tests.sh, after the instance is initialized it'll build csi-proxy and attempt to run the E2E tests
+
+During development we need to iterate faster, I follow this workflow during development:
+
+- Make changes to the codebase locally and push to the remote
+- RDP to the VM and open a few powershell terminals (with `start powershell`)
+- Pull the changes from the remote, recompile and start csi-proxy and run the E2E tests
+
+```bash
+cd ~/go/src/github.com/kubernetes-csi/csi-proxy
+git fetch; git pull --rebase origin $BRANCH
+
+# terminal 1 (build and start CSI proxy)
+go build -v -a -o ./bin/csi-proxy.exe ./cmd/csi-proxy
+.\bin\csi-proxy.exe --kubelet-csi-plugins-path $pwd --kubelet-pod-path $pwd --v=5
+
+# terminal 2 (run E2E tests)
+go test -v .\integrationtests\ -run TestVolumeAPIs
+```
diff --git a/scripts/e2e-runner.ps1 b/scripts/e2e-runner.ps1
new file mode 100644
index 00000000..8df36aa0
--- /dev/null
+++ b/scripts/e2e-runner.ps1
@@ -0,0 +1,51 @@
+# hyperv
+Install-WindowsFeature -Name Hyper-V -IncludeManagementTools -Restart
+
+# installers
+iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex
+choco upgrade chocolatey
+choco install -y golang
+choco install -y vim
+choco install -y git
+$env:GOPATH="$HOME\go"
+$env:GOOS="windows"
+$env:GOARCH="amd64"
+refreshenv
+
+# check env
+go version
+git version
+
+# go setup
+New-Item -ItemType Directory -Force -Path $HOME\go\bin
+New-Item -ItemType Directory -Force -Path $HOME\go\src
+New-Item -ItemType Directory -Force -Path $HOME\go\src\github.com\kubernetes-csi\
+cd $HOME/go/src/github.com/kubernetes-csi
+
+# XXX: update the url to your repo & branch
+Write-Output "building csi-proxy"
+git clone https://github.com/mauriciopoppe/csi-proxy
+# csi-proxy-setup (taken from the github action workflow)
+cd $HOME/go/src/github.com/kubernetes-csi/csi-proxy
+git checkout volume-api-changes
+
+go build -v -a -o ./bin/csi-proxy.exe ./cmd/csi-proxy
+go build -v -a -o ./build/csi-proxy-api-gen ./cmd/csi-proxy-api-gen
+
+# start the CSI Proxy before running tests on windows
+Write-Output "starting csi-proxy"
+$csiproxy = Start-Job -Name CSIProxy -ScriptBlock {
+    cd $HOME/go/src/github.com/kubernetes-csi/csi-proxy
+    .\bin\csi-proxy.exe --kubelet-csi-plugins-path $pwd --kubelet-pod-path $pwd --v=5
+};
+Start-Sleep -Seconds 10;
+
+Write-Output "checking that csi-proxy is still up"
+Get-Job
+
+Write-Output "getting named pipes"
+[System.IO.Directory]::GetFiles("\\.\\pipe\\")
+
+Write-Output "running e2e tests"
+cd $HOME/go/src/github.com/kubernetes-csi/csi-proxy
+go test -v -race ./integrationtests/
diff --git a/scripts/e2e-tests.sh b/scripts/e2e-tests.sh
new file mode 100755
index 00000000..6343a9a0
--- /dev/null
+++ b/scripts/e2e-tests.sh
@@ -0,0 +1,53 @@
+#/bin/bash
+
+set -o nounset
+set -ex
+
+# the Google Storage bucket
+: $CSI_PROXY_BUCKET
+
+# The bucket url of this script in Google Cloud, set in sync_scripts
+SCRIPT_URL=
+
+function sync_scripts {
+  # upload initialization code to a bucket
+  gsutil mb gs://${CSI_PROXY_BUCKET} || true
+  SCRIPT_URL=gs://${CSI_PROXY_BUCKET}/e2e-runner.ps1
+  gsutil cp scripts/e2e-runner.ps1 $SCRIPT_URL
+}
+
+function bootstrap_environment {
+  if ! gcloud compute routes describe csi-proxy-windows-activation-route; then
+    gcloud compute routes create csi-proxy-windows-activation-route \
+      --destination-range=35.190.247.13/32 \
+      --network=default \
+      --next-hop-gateway=default-internet-gateway
+  fi
+
+  if ! gcloud compute firewall-rules describe csi-proxy-windows-activation-firewall-rule; then
+    gcloud compute firewall-rules create csi-proxy-windows-activation-firewall-rule \
+      --direction=EGRESS \
+      --network=default \
+      --action=ALLOW \
+      --rules=tcp:1688 \
+      --destination-ranges=35.190.247.13/32 \
+      --priority=0
+  fi
+
+  if ! gcloud compute instances describe csi-proxy-e2e-tests; then
+    gcloud compute instances create csi-proxy-e2e-tests \
+      --image-project windows-cloud \
+      --image-family windows-2019-core \
+      --machine-type e2-medium \
+      --boot-disk-size 100 \
+      --boot-disk-type pd-ssd \
+      --metadata=windows-startup-script-url=${SCRIPT_URL}
+  fi
+}
+
+function main {
+  sync_scripts
+  bootstrap_environment
+}
+
+main

From dea9a054c9d91ed57a809bd742fedb34703ea128 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 00:52:37 +0000
Subject: [PATCH 03/22] Use fork of gengo, redo all the conversion functions in
 the disk api

---
 Makefile                                      |   2 +-
 client/api/disk/v1beta3/api.pb.go             | 240 +++++++++---------
 client/api/disk/v1beta3/api.proto             |  14 +-
 cmd/csi-proxy-api-gen/generators/api.go       |   1 +
 client/api/README.md => docs/API.md           |   0
 docs/DEVELOPMENT.md                           |   6 +-
 go.mod                                        |   5 +-
 go.sum                                        |   2 +
 .../client/dummy/v1/client_generated.go       |   2 +-
 .../server/dummy/api_group_generated.go       |   2 +-
 .../dummy/internal/v1/server_generated.go     |   2 +-
 internal/os/disk/api.go                       |   8 +-
 internal/server/disk/internal/types.go        |  15 +-
 .../disk/internal/v1alpha1/conversion.go      |  77 ++++--
 .../internal/v1alpha1/conversion_generated.go |  83 ++----
 .../disk/internal/v1beta1/conversion.go       | 119 +++++----
 .../internal/v1beta1/conversion_generated.go  |  85 ++-----
 .../disk/internal/v1beta2/conversion.go       | 119 +++++----
 .../internal/v1beta2/conversion_generated.go  |  85 ++-----
 .../disk/internal/v1beta3/conversion.go       |  43 +---
 .../internal/v1beta3/conversion_generated.go  |   8 +-
 internal/server/disk/server.go                | 143 +++++++----
 .../internal/v1alpha1/conversion_generated.go |  17 +-
 .../internal/v1alpha2/conversion_generated.go |  17 +-
 internal/shared/disk/types.go                 |   6 +-
 scripts/e2e-tests.sh                          |   2 +-
 .../client/api/disk/v1beta3/api.pb.go         | 240 +++++++++---------
 .../client/api/disk/v1beta3/api.proto         |  14 +-
 .../generator/conversion_generator.go         |  14 +-
 vendor/modules.txt                            |   4 +-
 30 files changed, 653 insertions(+), 722 deletions(-)
 rename client/api/README.md => docs/API.md (100%)

diff --git a/Makefile b/Makefile
index 97fc6090..f335d848 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ generate-protobuf:
 
 .PHONY: generate-csi-proxy-api-gen
 generate-csi-proxy-api-gen: compile-csi-proxy-api-gen
-	$(CSI_PROXY_API_GEN) -i github.com/kubernetes-csi/csi-proxy/client/api,github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy --v=5
+	$(CSI_PROXY_API_GEN) -i github.com/kubernetes-csi/csi-proxy/client/api,github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy --v=8
 
 .PHONY: clean
 clean: clean-protobuf clean-generated
diff --git a/client/api/disk/v1beta3/api.pb.go b/client/api/disk/v1beta3/api.pb.go
index 7f7ca84e..52386898 100644
--- a/client/api/disk/v1beta3/api.pb.go
+++ b/client/api/disk/v1beta3/api.pb.go
@@ -138,7 +138,7 @@ type ListDiskLocationsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of disk device number and <adapter, bus, target, lun ID> associated with each disk device.
+	// Map of disk number and <adapter, bus, target, lun ID> associated with each disk device.
 	DiskLocations map[uint32]*DiskLocation `protobuf:"bytes,1,rep,name=disk_locations,json=diskLocations,proto3" json:"disk_locations,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
@@ -386,8 +386,10 @@ type DiskIDs struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of Disk ID types and Disk ID values.
-	Identifiers map[string]string `protobuf:"bytes,1,rep,name=identifiers,proto3" json:"identifiers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// The disk page83 id.
+	Page83 string `protobuf:"bytes,1,opt,name=page83,proto3" json:"page83,omitempty"`
+	// The disk serial number.
+	SerialNumber string `protobuf:"bytes,2,opt,name=serial_number,json=serialNumber,proto3" json:"serial_number,omitempty"`
 }
 
 func (x *DiskIDs) Reset() {
@@ -422,11 +424,18 @@ func (*DiskIDs) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *DiskIDs) GetIdentifiers() map[string]string {
+func (x *DiskIDs) GetPage83() string {
 	if x != nil {
-		return x.Identifiers
+		return x.Page83
 	}
-	return nil
+	return ""
+}
+
+func (x *DiskIDs) GetSerialNumber() string {
+	if x != nil {
+		return x.SerialNumber
+	}
+	return ""
 }
 
 type ListDiskIDsResponse struct {
@@ -434,7 +443,7 @@ type ListDiskIDsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of disk device numbers and IDs <page83> associated with each disk device.
+	// Map of disk numbers and IDs <page83> associated with each disk device.
 	DiskIds map[uint32]*DiskIDs `protobuf:"bytes,1,rep,name=disk_ids,json=diskIds,proto3" json:"disk_ids,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
@@ -802,87 +811,82 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_r
 	0x0d, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x10,
 	0x0a, 0x0e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
 	0x22, 0x14, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x8e, 0x01, 0x0a, 0x07, 0x44, 0x69, 0x73, 0x6b, 0x49,
-	0x44, 0x73, 0x12, 0x43, 0x0a, 0x0b, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x69, 0x64, 0x65, 0x6e,
-	0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x1a, 0x3e, 0x0a, 0x10, 0x49, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa9, 0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74,
-	0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x44, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
-	0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x69,
-	0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x4c, 0x0a, 0x0c, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
-	0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74,
-	0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69,
-	0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x37, 0x0a, 0x14, 0x47,
-	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74,
-	0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42,
-	0x79, 0x74, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x13, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53,
-	0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64,
-	0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09,
-	0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x65, 0x74,
-	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b,
-	0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64,
-	0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x33, 0x0a, 0x14, 0x47, 0x65, 0x74,
-	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x32, 0xac,
-	0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x44,
-	0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76,
-	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c,
-	0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69,
-	0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
-	0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
-	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x63, 0x61,
-	0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63,
-	0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x76, 0x31, 0x62, 0x65,
-	0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b,
-	0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44,
-	0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73,
-	0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69,
-	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
-	0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x4d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12,
-	0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73,
-	0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e,
-	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53,
-	0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d,
-	0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76,
-	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a,
-	0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65,
-	0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d, 0x63, 0x73, 0x69, 0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x46, 0x0a, 0x07, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44,
+	0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x65, 0x38, 0x33, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x70, 0x61, 0x67, 0x65, 0x38, 0x33, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x65, 0x72,
+	0x69, 0x61, 0x6c, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0xa9,
+	0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x69,
+	0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
+	0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x4c, 0x0a, 0x0c,
+	0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e,
+	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65,
+	0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62,
+	0x65, 0x72, 0x22, 0x37, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61,
+	0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f,
+	0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x13, 0x53,
+	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65,
+	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d,
+	0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
+	0x22, 0x16, 0x0a, 0x14, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44,
+	0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+	0x22, 0x33, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x32, 0xac, 0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c,
+	0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69,
+	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d,
+	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e,
+	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76,
+	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b,
+	0x0a, 0x06, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
+	0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x17, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c,
+	0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62,
+	0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69,
+	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
+	0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73,
+	0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53,
+	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
+	0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65,
+	0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d, 0x63, 0x73,
+	0x69, 0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65,
+	0x6e, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31, 0x62, 0x65,
+	0x74, 0x61, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -897,7 +901,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescData
 }
 
-var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
+var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
 var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_goTypes = []interface{}{
 	(*ListDiskLocationsRequest)(nil),  // 0: v1beta3.ListDiskLocationsRequest
 	(*DiskLocation)(nil),              // 1: v1beta3.DiskLocation
@@ -916,34 +920,32 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_g
 	(*GetDiskStateRequest)(nil),       // 14: v1beta3.GetDiskStateRequest
 	(*GetDiskStateResponse)(nil),      // 15: v1beta3.GetDiskStateResponse
 	nil,                               // 16: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
-	nil,                               // 17: v1beta3.DiskIDs.IdentifiersEntry
-	nil,                               // 18: v1beta3.ListDiskIDsResponse.DiskIdsEntry
+	nil,                               // 17: v1beta3.ListDiskIDsResponse.DiskIdsEntry
 }
 var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_depIdxs = []int32{
 	16, // 0: v1beta3.ListDiskLocationsResponse.disk_locations:type_name -> v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
-	17, // 1: v1beta3.DiskIDs.identifiers:type_name -> v1beta3.DiskIDs.IdentifiersEntry
-	18, // 2: v1beta3.ListDiskIDsResponse.disk_ids:type_name -> v1beta3.ListDiskIDsResponse.DiskIdsEntry
-	1,  // 3: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry.value:type_name -> v1beta3.DiskLocation
-	8,  // 4: v1beta3.ListDiskIDsResponse.DiskIdsEntry.value:type_name -> v1beta3.DiskIDs
-	0,  // 5: v1beta3.Disk.ListDiskLocations:input_type -> v1beta3.ListDiskLocationsRequest
-	3,  // 6: v1beta3.Disk.PartitionDisk:input_type -> v1beta3.PartitionDiskRequest
-	5,  // 7: v1beta3.Disk.Rescan:input_type -> v1beta3.RescanRequest
-	7,  // 8: v1beta3.Disk.ListDiskIDs:input_type -> v1beta3.ListDiskIDsRequest
-	10, // 9: v1beta3.Disk.GetDiskStats:input_type -> v1beta3.GetDiskStatsRequest
-	12, // 10: v1beta3.Disk.SetDiskState:input_type -> v1beta3.SetDiskStateRequest
-	14, // 11: v1beta3.Disk.GetDiskState:input_type -> v1beta3.GetDiskStateRequest
-	2,  // 12: v1beta3.Disk.ListDiskLocations:output_type -> v1beta3.ListDiskLocationsResponse
-	4,  // 13: v1beta3.Disk.PartitionDisk:output_type -> v1beta3.PartitionDiskResponse
-	6,  // 14: v1beta3.Disk.Rescan:output_type -> v1beta3.RescanResponse
-	9,  // 15: v1beta3.Disk.ListDiskIDs:output_type -> v1beta3.ListDiskIDsResponse
-	11, // 16: v1beta3.Disk.GetDiskStats:output_type -> v1beta3.GetDiskStatsResponse
-	13, // 17: v1beta3.Disk.SetDiskState:output_type -> v1beta3.SetDiskStateResponse
-	15, // 18: v1beta3.Disk.GetDiskState:output_type -> v1beta3.GetDiskStateResponse
-	12, // [12:19] is the sub-list for method output_type
-	5,  // [5:12] is the sub-list for method input_type
-	5,  // [5:5] is the sub-list for extension type_name
-	5,  // [5:5] is the sub-list for extension extendee
-	0,  // [0:5] is the sub-list for field type_name
+	17, // 1: v1beta3.ListDiskIDsResponse.disk_ids:type_name -> v1beta3.ListDiskIDsResponse.DiskIdsEntry
+	1,  // 2: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry.value:type_name -> v1beta3.DiskLocation
+	8,  // 3: v1beta3.ListDiskIDsResponse.DiskIdsEntry.value:type_name -> v1beta3.DiskIDs
+	0,  // 4: v1beta3.Disk.ListDiskLocations:input_type -> v1beta3.ListDiskLocationsRequest
+	3,  // 5: v1beta3.Disk.PartitionDisk:input_type -> v1beta3.PartitionDiskRequest
+	5,  // 6: v1beta3.Disk.Rescan:input_type -> v1beta3.RescanRequest
+	7,  // 7: v1beta3.Disk.ListDiskIDs:input_type -> v1beta3.ListDiskIDsRequest
+	10, // 8: v1beta3.Disk.GetDiskStats:input_type -> v1beta3.GetDiskStatsRequest
+	12, // 9: v1beta3.Disk.SetDiskState:input_type -> v1beta3.SetDiskStateRequest
+	14, // 10: v1beta3.Disk.GetDiskState:input_type -> v1beta3.GetDiskStateRequest
+	2,  // 11: v1beta3.Disk.ListDiskLocations:output_type -> v1beta3.ListDiskLocationsResponse
+	4,  // 12: v1beta3.Disk.PartitionDisk:output_type -> v1beta3.PartitionDiskResponse
+	6,  // 13: v1beta3.Disk.Rescan:output_type -> v1beta3.RescanResponse
+	9,  // 14: v1beta3.Disk.ListDiskIDs:output_type -> v1beta3.ListDiskIDsResponse
+	11, // 15: v1beta3.Disk.GetDiskStats:output_type -> v1beta3.GetDiskStatsResponse
+	13, // 16: v1beta3.Disk.SetDiskState:output_type -> v1beta3.SetDiskStateResponse
+	15, // 17: v1beta3.Disk.GetDiskState:output_type -> v1beta3.GetDiskStateResponse
+	11, // [11:18] is the sub-list for method output_type
+	4,  // [4:11] is the sub-list for method input_type
+	4,  // [4:4] is the sub-list for extension type_name
+	4,  // [4:4] is the sub-list for extension extendee
+	0,  // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_init() }
@@ -1151,7 +1153,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   19,
+			NumMessages:   18,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -1180,8 +1182,8 @@ type DiskClient interface {
 	// ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all
 	// disk devices enumerated by the host.
 	ListDiskLocations(ctx context.Context, in *ListDiskLocationsRequest, opts ...grpc.CallOption) (*ListDiskLocationsResponse, error)
-	// PartitionDisk initializes and partitions a disk device (if the disk has not
-	// been partitioned already) and returns the resulting volume device ID.
+	// PartitionDisk initializes and partitions a disk device with the GPT partition style
+	// (if the disk has not been partitioned already) and returns the resulting volume device ID.
 	PartitionDisk(ctx context.Context, in *PartitionDiskRequest, opts ...grpc.CallOption) (*PartitionDiskResponse, error)
 	// Rescan refreshes the host's storage cache.
 	Rescan(ctx context.Context, in *RescanRequest, opts ...grpc.CallOption) (*RescanResponse, error)
@@ -1271,8 +1273,8 @@ type DiskServer interface {
 	// ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all
 	// disk devices enumerated by the host.
 	ListDiskLocations(context.Context, *ListDiskLocationsRequest) (*ListDiskLocationsResponse, error)
-	// PartitionDisk initializes and partitions a disk device (if the disk has not
-	// been partitioned already) and returns the resulting volume device ID.
+	// PartitionDisk initializes and partitions a disk device with the GPT partition style
+	// (if the disk has not been partitioned already) and returns the resulting volume device ID.
 	PartitionDisk(context.Context, *PartitionDiskRequest) (*PartitionDiskResponse, error)
 	// Rescan refreshes the host's storage cache.
 	Rescan(context.Context, *RescanRequest) (*RescanResponse, error)
diff --git a/client/api/disk/v1beta3/api.proto b/client/api/disk/v1beta3/api.proto
index 1a5ab1e3..1b581cbe 100644
--- a/client/api/disk/v1beta3/api.proto
+++ b/client/api/disk/v1beta3/api.proto
@@ -9,8 +9,8 @@ service Disk {
     // disk devices enumerated by the host.
     rpc ListDiskLocations(ListDiskLocationsRequest) returns (ListDiskLocationsResponse) {}
 
-    // PartitionDisk initializes and partitions a disk device (if the disk has not
-    // been partitioned already) and returns the resulting volume device ID.
+    // PartitionDisk initializes and partitions a disk device with the GPT partition style
+    // (if the disk has not been partitioned already) and returns the resulting volume device ID.
     rpc PartitionDisk(PartitionDiskRequest) returns (PartitionDiskResponse) {}
 
     // Rescan refreshes the host's storage cache.
@@ -41,7 +41,7 @@ message DiskLocation {
 }
 
 message ListDiskLocationsResponse {
-    // Map of disk device number and <adapter, bus, target, lun ID> associated with each disk device.
+    // Map of disk number and <adapter, bus, target, lun ID> associated with each disk device.
     map <uint32, DiskLocation> disk_locations = 1;
 }
 
@@ -67,12 +67,14 @@ message ListDiskIDsRequest {
 }
 
 message DiskIDs {
-    // Map of Disk ID types and Disk ID values.
-    map <string, string> identifiers = 1;
+    // The disk page83 id.
+    string page83 = 1;
+    // The disk serial number.
+    string serial_number = 2;
 }
 
 message ListDiskIDsResponse {
-    // Map of disk device numbers and IDs <page83> associated with each disk device.
+    // Map of disk numbers and disk identifiers associated with each disk device.
     map <uint32, DiskIDs> disk_ids = 1;
 }
 
diff --git a/cmd/csi-proxy-api-gen/generators/api.go b/cmd/csi-proxy-api-gen/generators/api.go
index c1a999f4..bd1a8946 100644
--- a/cmd/csi-proxy-api-gen/generators/api.go
+++ b/cmd/csi-proxy-api-gen/generators/api.go
@@ -358,6 +358,7 @@ func packagesForGroup(group *groupDefinition, outputBase string) generator.Packa
 							return nil
 						}).
 						WithExternalConversionsHandler(func(inVar, outVar conversiongenerator.NamedVariable, sw *generator.SnippetWriter) (bool, error) {
+							klog.V(7).Infof("Checking %+v %+v", inVar, outVar)
 							if isVersionedVariable(inVar.Type, vsn) || isVersionedVariable(outVar.Type, vsn) {
 								// the conversion involves one of the versioned type, so there should
 								// be a conversion function defined for this
diff --git a/client/api/README.md b/docs/API.md
similarity index 100%
rename from client/api/README.md
rename to docs/API.md
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index ad3a0871..bfa443f7 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -26,6 +26,10 @@ Read the [`Makefile`](./Makefile) for more details and the descriptions below to
   - `server/<group>/server.go` - Server API handlers that implements `types_generated.go` and perform server side validations, once client requests are converted into the internal server structs they go through methods exposed here and invoke `os/<group>` methods.
   - `os/<group>/` - The internal server implementation of the csi-proxy API.
 
+Additional notes about the API files:
+
+- [API](./API.md)
+
 Additional notes about some autogenerated files:
 
 - `internal/server/<group>/internal/<version>/conversion_generated.go` - In the First gRPC layer requests may come from different versioned clients, the server works with internal structs that don't have any info about a specific client request, there's the need of conversion functions that remap properties from a client to the internal server structs, this file has functions with autogenerated mappings (overrides can be specified through `conversion.go` see #138)
@@ -53,7 +57,7 @@ When there are changes to the to client module:
 git restore client/api/volume/v1beta{1,2} client/api/{disk,iscsi,system,smb,filesystem}
 ```
 
-- Finally after checking that only `client/api/<group>/<version>/api.pb.go` and `client/groups/<group>/<version>/client_generated.go` were created/modified, sync these files to the vendor folder with `go mod vendor`
+- Finally after checking that only `client/api/<group>/<version>/api.pb.go` and `client/groups/<group>/<version>/client_generated.go` were created/modified, sync these files to the vendor folder with `go mod vendor`, verify that the wanted files were generated with `git status`
 
 ## Making changes to the server module
 
diff --git a/go.mod b/go.mod
index 19c3097e..a4725fca 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,10 @@ replace (
 	// https://github.com/kubernetes/gengo/pull/155#issuecomment-537589085
 	// is implemented, and the generic conversion generator merged into code-generator
 	// FIXME: switch back to the upstream repo and/or code-generator!
-	k8s.io/gengo => github.com/wk8/gengo v0.0.0-20191007012548-3d2530bfe606
+	// (mauriciopoppe) while working on #140 I found out that I had to do an
+	// override to the fork to stop generating auto* functions
+	// https://github.com/mauriciopoppe/gengo/commit/9c78f58f3486e3c0cdb02ed9551d32762ac99773
+	k8s.io/gengo => github.com/mauriciopoppe/gengo v0.0.0-20210525224835-9c78f58f3486
 )
 
 require (
diff --git a/go.sum b/go.sum
index 79595fc5..3feea8db 100644
--- a/go.sum
+++ b/go.sum
@@ -33,6 +33,8 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365 h1:ECW73yc9MY7935nNYXUkK7Dz17YuSUI9yqRqYS8aBww=
 github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/mauriciopoppe/gengo v0.0.0-20210525224835-9c78f58f3486 h1:+l047vEi0SyAzdVToIaAcfoY5DwwGW+OyqTdH/P3TTg=
+github.com/mauriciopoppe/gengo v0.0.0-20210525224835-9c78f58f3486/go.mod h1:xXv3T4UXTLta31wMhVezwVkc26OLei4hMbLeBJbPmxc=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/integrationtests/apigroups/client/dummy/v1/client_generated.go b/integrationtests/apigroups/client/dummy/v1/client_generated.go
index e97fbecd..7eed6341 100644
--- a/integrationtests/apigroups/client/dummy/v1/client_generated.go
+++ b/integrationtests/apigroups/client/dummy/v1/client_generated.go
@@ -9,7 +9,7 @@ import (
 	"github.com/Microsoft/go-winio"
 	"github.com/kubernetes-csi/csi-proxy/client"
 	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
-	v1 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1"
+	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1"
 	"google.golang.org/grpc"
 )
 
diff --git a/integrationtests/apigroups/server/dummy/api_group_generated.go b/integrationtests/apigroups/server/dummy/api_group_generated.go
index 8a8ea9bb..1bb67d46 100644
--- a/integrationtests/apigroups/server/dummy/api_group_generated.go
+++ b/integrationtests/apigroups/server/dummy/api_group_generated.go
@@ -5,7 +5,7 @@ package dummy
 import (
 	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
 	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
-	v1 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1"
+	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1"
 	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1alpha1"
 	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1alpha2"
 	srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types"
diff --git a/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go b/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go
index cac51292..349566d1 100644
--- a/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go
+++ b/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
-	v1 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1"
+	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1"
 	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
 	"google.golang.org/grpc"
 )
diff --git a/internal/os/disk/api.go b/internal/os/disk/api.go
index f6af5800..776f6c31 100644
--- a/internal/os/disk/api.go
+++ b/internal/os/disk/api.go
@@ -330,10 +330,10 @@ func (imp DiskAPI) ListDiskIDs() (map[uint32]shared.DiskIDs, error) {
 			return m, fmt.Errorf("Could not get disk number: %v", err)
 		}
 
-		diskIDs := make(map[string]string)
-		diskIDs["page83"] = page83
-		diskIDs["serialNumber"] = disks[i].SerialNumber
-		m[diskNumber] = shared.DiskIDs{Identifiers: diskIDs}
+		m[diskNumber] = shared.DiskIDs{
+			Page83:       page83,
+			SerialNumber: disks[i].SerialNumber,
+		}
 	}
 
 	return m, nil
diff --git a/internal/server/disk/internal/types.go b/internal/server/disk/internal/types.go
index a588df3f..fd2c96fc 100644
--- a/internal/server/disk/internal/types.go
+++ b/internal/server/disk/internal/types.go
@@ -12,6 +12,7 @@ type ListDiskLocationsRequest struct {
 
 type ListDiskLocationsResponse struct {
 	// Map of disk device IDs and <adapter, bus, target, lun ID> associated with each disk device
+	// +k8s:conversion-gen=false
 	DiskLocations map[uint32]*DiskLocation
 }
 
@@ -38,17 +39,19 @@ type GetDiskNumberByNameResponse struct {
 	DiskNumber uint32
 }
 
-type DiskIDs struct {
-	// Map of Disk ID types and Disk ID values
-	Identifiers map[string]string
+type ListDiskIDsRequest struct {
 }
 
-type ListDiskIDsRequest struct {
+type DiskIDs struct {
+	// Map of Disk ID types and Disk ID values
+	Page83       string
+	SerialNumber string
 }
 
 type ListDiskIDsResponse struct {
-	// Map of disk device numbers and IDs <page83> associated with each disk device
-	DiskNumbers map[uint32]*DiskIDs
+	// Map of disk device numbers and IDs associated with each disk device
+	// +k8s:conversion-gen=false
+	DiskIDs map[uint32]*DiskIDs
 }
 
 type GetDiskStatsRequest struct {
diff --git a/internal/server/disk/internal/v1alpha1/conversion.go b/internal/server/disk/internal/v1alpha1/conversion.go
index addff864..20916c3c 100644
--- a/internal/server/disk/internal/v1alpha1/conversion.go
+++ b/internal/server/disk/internal/v1alpha1/conversion.go
@@ -1,25 +1,60 @@
 package v1alpha1
 
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
+	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+)
+
 // Add manual conversion functions here to override automatic conversion functions
 
-// import (
-// 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
-// 	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
-// )
-
-// func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error {
-// 	if in.DiskLocations != nil {
-// 		in, out := &in.DiskLocations, &out.DiskLocations
-// 		*out = make(map[string]*v1alpha1.DiskLocation, len(*in))
-// 		for key, val := range *in {
-// 			newVal := new(v1alpha1.DiskLocation)
-// 			if err := Convert_internal_DiskLocation_To_v1alpha1_DiskLocation(val, newVal); err != nil {
-// 				return err
-// 			}
-// 			(*out)[key] = newVal
-// 		}
-// 	} else {
-// 		out.DiskLocations = nil
-// 	}
-// 	return nil
-// }
+func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error {
+	// conversion function added in v1beta3, the disk_locations map key was changed from string to uint32
+	// v1alpha1 is expecting a string so convert the uint32 to string
+	if in.DiskLocations != nil {
+		in, out := &in.DiskLocations, &out.DiskLocations
+		*out = make(map[string]*v1alpha1.DiskLocation, len(*in))
+		for key, val := range *in {
+			newVal := new(v1alpha1.DiskLocation)
+			if err := Convert_internal_DiskLocation_To_v1alpha1_DiskLocation(val, newVal); err != nil {
+				return err
+			}
+			(*out)[strconv.FormatUint(uint64(key), 10)] = newVal
+		}
+	} else {
+		out.DiskLocations = nil
+	}
+	return nil
+}
+
+func Convert_v1alpha1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1alpha1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
+	// there's no need to implement this function because it's never used (we only convert an internal response to a client response)
+	// however we need to override it so that the generator doesn't generate the wrong implementation
+	// see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400
+	return nil
+}
+
+func Convert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1alpha1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
+	diskNumber, err := strconv.ParseUint(in.DiskID, 10, 64)
+	if err != nil {
+		return fmt.Errorf("Failed to convert v1alpha1.PartitionDiskRequest.DiskID to uint32: %w", err)
+	}
+	out.DiskNumber = uint32(diskNumber)
+	return nil
+}
+
+// no need to override PartitionDiskResponse because the request doesn't return anything
+
+func Convert_v1alpha1_GetDiskNumberByNameResponse_To_internal_GetDiskNumberByNameResponse(in *v1alpha1.GetDiskNumberByNameResponse, out *internal.GetDiskNumberByNameResponse) error {
+	// there's no need to implement this function because it's never used (we only convert an internal response to a client response)
+	// however we need to override it so that the generator doesn't generate the wrong implementation
+	// see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400
+	return nil
+}
+
+func Convert_internal_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(in *internal.GetDiskNumberByNameResponse, out *v1alpha1.GetDiskNumberByNameResponse) error {
+	out.DiskNumber = strconv.FormatUint(uint64(in.DiskNumber), 10)
+	return nil
+}
diff --git a/internal/server/disk/internal/v1alpha1/conversion_generated.go b/internal/server/disk/internal/v1alpha1/conversion_generated.go
index 1b81b498..72777c45 100644
--- a/internal/server/disk/internal/v1alpha1/conversion_generated.go
+++ b/internal/server/disk/internal/v1alpha1/conversion_generated.go
@@ -53,25 +53,13 @@ func Convert_internal_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByName
 	return autoConvert_internal_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByNameRequest(in, out)
 }
 
-func autoConvert_v1alpha1_GetDiskNumberByNameResponse_To_internal_GetDiskNumberByNameResponse(in *v1alpha1.GetDiskNumberByNameResponse, out *internal.GetDiskNumberByNameResponse) error {
-	out.DiskNumber = uint32(in.DiskNumber)
-	return nil
-}
+// detected external conversion function
+// Convert_v1alpha1_GetDiskNumberByNameResponse_To_internal_GetDiskNumberByNameResponse(in *v1alpha1.GetDiskNumberByNameResponse, out *internal.GetDiskNumberByNameResponse) error
+// skipping generation of the auto function
 
-// Convert_v1alpha1_GetDiskNumberByNameResponse_To_internal_GetDiskNumberByNameResponse is an autogenerated conversion function.
-func Convert_v1alpha1_GetDiskNumberByNameResponse_To_internal_GetDiskNumberByNameResponse(in *v1alpha1.GetDiskNumberByNameResponse, out *internal.GetDiskNumberByNameResponse) error {
-	return autoConvert_v1alpha1_GetDiskNumberByNameResponse_To_internal_GetDiskNumberByNameResponse(in, out)
-}
-
-func autoConvert_internal_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(in *internal.GetDiskNumberByNameResponse, out *v1alpha1.GetDiskNumberByNameResponse) error {
-	out.DiskNumber = string(in.DiskNumber)
-	return nil
-}
-
-// Convert_internal_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse is an autogenerated conversion function.
-func Convert_internal_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(in *internal.GetDiskNumberByNameResponse, out *v1alpha1.GetDiskNumberByNameResponse) error {
-	return autoConvert_internal_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(in, out)
-}
+// detected external conversion function
+// Convert_internal_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(in *internal.GetDiskNumberByNameResponse, out *v1alpha1.GetDiskNumberByNameResponse) error
+// skipping generation of the auto function
 
 func autoConvert_v1alpha1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1alpha1.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error {
 	return nil
@@ -91,58 +79,17 @@ func Convert_internal_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequ
 	return autoConvert_internal_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequest(in, out)
 }
 
-func autoConvert_v1alpha1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1alpha1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[uint32]*internal.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(*internal.DiskLocation)
-			if err := Convert_v1alpha1_DiskLocation_To_internal_DiskLocation(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[uint32(key)] = *newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
-
-// Convert_v1alpha1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse is an autogenerated conversion function.
-func Convert_v1alpha1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1alpha1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
-	return autoConvert_v1alpha1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in, out)
-}
-
-func autoConvert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*v1alpha1.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(*v1alpha1.DiskLocation)
-			if err := Convert_internal_DiskLocation_To_v1alpha1_DiskLocation(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[string(key)] = *newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
+// detected external conversion function
+// Convert_v1alpha1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1alpha1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error
+// skipping generation of the auto function
 
-// Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse is an autogenerated conversion function.
-func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error {
-	return autoConvert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in, out)
-}
+// detected external conversion function
+// Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error
+// skipping generation of the auto function
 
-func autoConvert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1alpha1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
-	return nil
-}
-
-// Convert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest is an autogenerated conversion function.
-func Convert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1alpha1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
-	return autoConvert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in, out)
-}
+// detected external conversion function
+// Convert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1alpha1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error
+// skipping generation of the auto function
 
 func autoConvert_internal_PartitionDiskRequest_To_v1alpha1_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1alpha1.PartitionDiskRequest) error {
 	return nil
diff --git a/internal/server/disk/internal/v1beta1/conversion.go b/internal/server/disk/internal/v1beta1/conversion.go
index f348cb82..d222be60 100644
--- a/internal/server/disk/internal/v1beta1/conversion.go
+++ b/internal/server/disk/internal/v1beta1/conversion.go
@@ -1,52 +1,75 @@
 package v1beta1
 
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
+	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+)
+
 // Add manual conversion functions here to override automatic conversion functions
 
-// import (
-// 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
-// 	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
-// )
-
-// func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error {
-// 	if in.DiskLocations != nil {
-// 		in, out := &in.DiskLocations, &out.DiskLocations
-// 		*out = make(map[string]*v1beta1.DiskLocation, len(*in))
-// 		for key, val := range *in {
-// 			newVal := new(v1beta1.DiskLocation)
-// 			if err := Convert_internal_DiskLocation_To_v1beta1_DiskLocation(val, newVal); err != nil {
-// 				return err
-// 			}
-// 			(*out)[key] = newVal
-// 		}
-// 	} else {
-// 		out.DiskLocations = nil
-// 	}
-// 	return nil
-// }
-
-// func Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error {
-// 	if in.DiskIDs != nil {
-// 		in, out := &in.DiskIDs, &out.DiskIDs
-// 		*out = make(map[string]*v1beta1.DiskIDs, len(*in))
-// 		for key, val := range *in {
-// 			newVal := new(v1beta1.DiskIDs)
-// 			if err := Convert_internal_DiskIDs_To_v1beta1_DiskIDs(val, newVal); err != nil {
-// 				return err
-// 			}
-// 			(*out)[key] = newVal
-// 		}
-// 	} else {
-// 		out.DiskIDs = nil
-// 	}
-// 	return nil
-// }
-
-// func Convert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta1.DiskStatsResponse) error {
-// 	out.DiskSize = in.DiskSize
-// 	return nil
-// }
-
-// func Convert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta1.DiskStatsRequest, out *internal.DiskStatsRequest) error {
-// 	out.DiskID = in.DiskID
-// 	return nil
-// }
+func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error {
+	// conversion function added in v1beta3, the disk_locations map key was changed from string to uint32
+	// v1beta1 is expecting a string so convert the uint32 to string
+	if in.DiskLocations != nil {
+		in, out := &in.DiskLocations, &out.DiskLocations
+		*out = make(map[string]*v1beta1.DiskLocation, len(*in))
+		for key, val := range *in {
+			newVal := new(v1beta1.DiskLocation)
+			if err := Convert_internal_DiskLocation_To_v1beta1_DiskLocation(val, newVal); err != nil {
+				return err
+			}
+			(*out)[strconv.FormatUint(uint64(key), 10)] = newVal
+		}
+	} else {
+		out.DiskLocations = nil
+	}
+	return nil
+}
+
+func Convert_v1beta1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
+	// there's no need to implement this function because it's never used (we only convert an internal response to a client response)
+	// however we need to override it so that the generator doesn't generate the wrong implementation
+	// see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400
+	return nil
+}
+
+func Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error {
+	// conversion function added in v1beta3, diskIDs was renamed to disk_ids, also the disk_ids map key was converted from string to uint32
+	// v1beta1 is expecting diskIDs to have a key of the type string instead of uint32
+	if in.DiskIDs != nil {
+		in, out := &in.DiskIDs, &out.DiskIDs
+		*out = make(map[string]*v1beta1.DiskIDs, len(*in))
+		for key, val := range *in {
+			newVal := new(v1beta1.DiskIDs)
+
+			// copy internal.DiskIDs struct to a map by known keys (page83 and serialNumber)
+			newVal.Identifiers["page83"] = val.Page83
+			newVal.Identifiers["serialNumber"] = val.SerialNumber
+			(*out)[strconv.FormatUint(uint64(key), 10)] = newVal
+		}
+	} else {
+		out.DiskIDs = nil
+	}
+	return nil
+}
+
+func Convert_v1beta1_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta1.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error {
+	// there's no need to implement this function because it's never used (we only convert an internal response to a client response)
+	// however we need to override it so that the generator doesn't generate the wrong implementation
+	// see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400
+	return nil
+}
+
+func Convert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
+	diskNumber, err := strconv.ParseUint(in.DiskID, 10, 64)
+	if err != nil {
+		return fmt.Errorf("Failed to convert v1beta1.PartitionDiskRequest.DiskID to uint32: %w", err)
+	}
+	out.DiskNumber = uint32(diskNumber)
+	return nil
+}
+
+// no need to override PartitionDiskResponse because the request doesn't return anything
diff --git a/internal/server/disk/internal/v1beta1/conversion_generated.go b/internal/server/disk/internal/v1beta1/conversion_generated.go
index 95238e23..1ee910a9 100644
--- a/internal/server/disk/internal/v1beta1/conversion_generated.go
+++ b/internal/server/disk/internal/v1beta1/conversion_generated.go
@@ -3,14 +3,11 @@
 package v1beta1
 
 import (
-	unsafe "unsafe"
-
 	v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
 	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
 )
 
 func autoConvert_v1beta1_DiskIDs_To_internal_DiskIDs(in *v1beta1.DiskIDs, out *internal.DiskIDs) error {
-	out.Identifiers = *(*map[string]string)(unsafe.Pointer(&in.Identifiers))
 	return nil
 }
 
@@ -20,7 +17,6 @@ func Convert_v1beta1_DiskIDs_To_internal_DiskIDs(in *v1beta1.DiskIDs, out *inter
 }
 
 func autoConvert_internal_DiskIDs_To_v1beta1_DiskIDs(in *internal.DiskIDs, out *v1beta1.DiskIDs) error {
-	out.Identifiers = *(*map[string]string)(unsafe.Pointer(&in.Identifiers))
 	return nil
 }
 
@@ -113,23 +109,13 @@ func Convert_internal_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest(in *inter
 	return autoConvert_internal_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest(in, out)
 }
 
-func autoConvert_v1beta1_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta1.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error {
-	return nil
-}
-
-// Convert_v1beta1_ListDiskIDsResponse_To_internal_ListDiskIDsResponse is an autogenerated conversion function.
-func Convert_v1beta1_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta1.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error {
-	return autoConvert_v1beta1_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in, out)
-}
-
-func autoConvert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error {
-	return nil
-}
+// detected external conversion function
+// Convert_v1beta1_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta1.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error
+// skipping generation of the auto function
 
-// Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse is an autogenerated conversion function.
-func Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error {
-	return autoConvert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in, out)
-}
+// detected external conversion function
+// Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error
+// skipping generation of the auto function
 
 func autoConvert_v1beta1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta1.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error {
 	return nil
@@ -149,58 +135,17 @@ func Convert_internal_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsReque
 	return autoConvert_internal_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsRequest(in, out)
 }
 
-func autoConvert_v1beta1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[uint32]*internal.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(*internal.DiskLocation)
-			if err := Convert_v1beta1_DiskLocation_To_internal_DiskLocation(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[uint32(key)] = *newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
+// detected external conversion function
+// Convert_v1beta1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error
+// skipping generation of the auto function
 
-// Convert_v1beta1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse is an autogenerated conversion function.
-func Convert_v1beta1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
-	return autoConvert_v1beta1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in, out)
-}
-
-func autoConvert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*v1beta1.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(*v1beta1.DiskLocation)
-			if err := Convert_internal_DiskLocation_To_v1beta1_DiskLocation(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[string(key)] = *newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
-
-// Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse is an autogenerated conversion function.
-func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error {
-	return autoConvert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in, out)
-}
+// detected external conversion function
+// Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error
+// skipping generation of the auto function
 
-func autoConvert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
-	return nil
-}
-
-// Convert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest is an autogenerated conversion function.
-func Convert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
-	return autoConvert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in, out)
-}
+// detected external conversion function
+// Convert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error
+// skipping generation of the auto function
 
 func autoConvert_internal_PartitionDiskRequest_To_v1beta1_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta1.PartitionDiskRequest) error {
 	return nil
diff --git a/internal/server/disk/internal/v1beta2/conversion.go b/internal/server/disk/internal/v1beta2/conversion.go
index 285efa05..9b8987dd 100644
--- a/internal/server/disk/internal/v1beta2/conversion.go
+++ b/internal/server/disk/internal/v1beta2/conversion.go
@@ -1,52 +1,75 @@
 package v1beta2
 
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
+	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+)
+
 // Add manual conversion functions here to override automatic conversion functions
 
-// import (
-// 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
-// 	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
-// )
-
-// func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error {
-// 	if in.DiskLocations != nil {
-// 		in, out := &in.DiskLocations, &out.DiskLocations
-// 		*out = make(map[string]*v1beta2.DiskLocation, len(*in))
-// 		for key, val := range *in {
-// 			newVal := new(v1beta2.DiskLocation)
-// 			if err := Convert_internal_DiskLocation_To_v1beta2_DiskLocation(val, newVal); err != nil {
-// 				return err
-// 			}
-// 			(*out)[key] = newVal
-// 		}
-// 	} else {
-// 		out.DiskLocations = nil
-// 	}
-// 	return nil
-// }
-
-// func Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error {
-// 	if in.DiskIDs != nil {
-// 		in, out := &in.DiskIDs, &out.DiskIDs
-// 		*out = make(map[string]*v1beta2.DiskIDs, len(*in))
-// 		for key, val := range *in {
-// 			newVal := new(v1beta2.DiskIDs)
-// 			if err := Convert_internal_DiskIDs_To_v1beta2_DiskIDs(val, newVal); err != nil {
-// 				return err
-// 			}
-// 			(*out)[key] = newVal
-// 		}
-// 	} else {
-// 		out.DiskIDs = nil
-// 	}
-// 	return nil
-// }
-
-// func Convert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta2.DiskStatsResponse) error {
-// 	out.DiskSize = in.DiskSize
-// 	return nil
-// }
-
-// func Convert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta2.DiskStatsRequest, out *internal.DiskStatsRequest) error {
-// 	out.DiskID = in.DiskID
-// 	return nil
-// }
+func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error {
+	// conversion function added in v1beta3, the disk_locations map key was changed from string to uint32
+	// v1beta2 is expecting a string so convert the uint32 to string
+	if in.DiskLocations != nil {
+		in, out := &in.DiskLocations, &out.DiskLocations
+		*out = make(map[string]*v1beta2.DiskLocation, len(*in))
+		for key, val := range *in {
+			newVal := new(v1beta2.DiskLocation)
+			if err := Convert_internal_DiskLocation_To_v1beta2_DiskLocation(val, newVal); err != nil {
+				return err
+			}
+			(*out)[strconv.FormatUint(uint64(key), 10)] = newVal
+		}
+	} else {
+		out.DiskLocations = nil
+	}
+	return nil
+}
+
+func Convert_v1beta2_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta2.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
+	// there's no need to implement this function because it's never used (we only convert an internal response to a client response)
+	// however we need to override it so that the generator doesn't generate the wrong implementation
+	// see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400
+	return nil
+}
+
+func Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error {
+	// conversion function added in v1beta3, diskIDs was renamed to disk_ids, also the disk_ids map key was converted from string to uint32
+	// v1beta2 is expecting diskIDs to have a key of the type string instead of uint32
+	if in.DiskIDs != nil {
+		in, out := &in.DiskIDs, &out.DiskIDs
+		*out = make(map[string]*v1beta2.DiskIDs, len(*in))
+		for key, val := range *in {
+			newVal := new(v1beta2.DiskIDs)
+
+			// copy internal.DiskIDs struct to a map by known keys (page83 and serialNumber)
+			newVal.Identifiers["page83"] = val.Page83
+			newVal.Identifiers["serialNumber"] = val.SerialNumber
+			(*out)[strconv.FormatUint(uint64(key), 10)] = newVal
+		}
+	} else {
+		out.DiskIDs = nil
+	}
+	return nil
+}
+
+func Convert_v1beta2_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta2.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error {
+	// there's no need to implement this function because it's never used (we only convert an internal response to a client response)
+	// however we need to override it so that the generator doesn't generate the wrong implementation
+	// see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400
+	return nil
+}
+
+func Convert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta2.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
+	diskNumber, err := strconv.ParseUint(in.DiskID, 10, 64)
+	if err != nil {
+		return fmt.Errorf("Failed to convert v1beta2.PartitionDiskRequest.DiskID to uint32: %w", err)
+	}
+	out.DiskNumber = uint32(diskNumber)
+	return nil
+}
+
+// no need to override PartitionDiskResponse because the request doesn't return anything
diff --git a/internal/server/disk/internal/v1beta2/conversion_generated.go b/internal/server/disk/internal/v1beta2/conversion_generated.go
index 324c6441..749c533c 100644
--- a/internal/server/disk/internal/v1beta2/conversion_generated.go
+++ b/internal/server/disk/internal/v1beta2/conversion_generated.go
@@ -3,14 +3,11 @@
 package v1beta2
 
 import (
-	unsafe "unsafe"
-
 	v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
 	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
 )
 
 func autoConvert_v1beta2_DiskIDs_To_internal_DiskIDs(in *v1beta2.DiskIDs, out *internal.DiskIDs) error {
-	out.Identifiers = *(*map[string]string)(unsafe.Pointer(&in.Identifiers))
 	return nil
 }
 
@@ -20,7 +17,6 @@ func Convert_v1beta2_DiskIDs_To_internal_DiskIDs(in *v1beta2.DiskIDs, out *inter
 }
 
 func autoConvert_internal_DiskIDs_To_v1beta2_DiskIDs(in *internal.DiskIDs, out *v1beta2.DiskIDs) error {
-	out.Identifiers = *(*map[string]string)(unsafe.Pointer(&in.Identifiers))
 	return nil
 }
 
@@ -153,23 +149,13 @@ func Convert_internal_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest(in *inter
 	return autoConvert_internal_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest(in, out)
 }
 
-func autoConvert_v1beta2_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta2.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error {
-	return nil
-}
-
-// Convert_v1beta2_ListDiskIDsResponse_To_internal_ListDiskIDsResponse is an autogenerated conversion function.
-func Convert_v1beta2_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta2.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error {
-	return autoConvert_v1beta2_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in, out)
-}
-
-func autoConvert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error {
-	return nil
-}
+// detected external conversion function
+// Convert_v1beta2_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta2.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error
+// skipping generation of the auto function
 
-// Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse is an autogenerated conversion function.
-func Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error {
-	return autoConvert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in, out)
-}
+// detected external conversion function
+// Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error
+// skipping generation of the auto function
 
 func autoConvert_v1beta2_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta2.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error {
 	return nil
@@ -189,58 +175,17 @@ func Convert_internal_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsReque
 	return autoConvert_internal_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsRequest(in, out)
 }
 
-func autoConvert_v1beta2_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta2.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[uint32]*internal.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(*internal.DiskLocation)
-			if err := Convert_v1beta2_DiskLocation_To_internal_DiskLocation(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[uint32(key)] = *newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
+// detected external conversion function
+// Convert_v1beta2_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta2.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error
+// skipping generation of the auto function
 
-// Convert_v1beta2_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse is an autogenerated conversion function.
-func Convert_v1beta2_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta2.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error {
-	return autoConvert_v1beta2_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in, out)
-}
-
-func autoConvert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[string]*v1beta2.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(*v1beta2.DiskLocation)
-			if err := Convert_internal_DiskLocation_To_v1beta2_DiskLocation(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[string(key)] = *newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
-
-// Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse is an autogenerated conversion function.
-func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error {
-	return autoConvert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in, out)
-}
+// detected external conversion function
+// Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error
+// skipping generation of the auto function
 
-func autoConvert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta2.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
-	return nil
-}
-
-// Convert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest is an autogenerated conversion function.
-func Convert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta2.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
-	return autoConvert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest(in, out)
-}
+// detected external conversion function
+// Convert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta2.PartitionDiskRequest, out *internal.PartitionDiskRequest) error
+// skipping generation of the auto function
 
 func autoConvert_internal_PartitionDiskRequest_To_v1beta2_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta2.PartitionDiskRequest) error {
 	return nil
diff --git a/internal/server/disk/internal/v1beta3/conversion.go b/internal/server/disk/internal/v1beta3/conversion.go
index 42012fdc..018db1e1 100644
--- a/internal/server/disk/internal/v1beta3/conversion.go
+++ b/internal/server/disk/internal/v1beta3/conversion.go
@@ -1,44 +1,3 @@
 package v1beta3
 
-// import (
-// 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
-// 	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
-// )
-
-// // Add manual conversion functions here to override automatic conversion functions
-
-// func Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error {
-// 	if in.DiskLocations != nil {
-// 		in, out := &in.DiskLocations, &out.DiskLocations
-// 		*out = make(map[uint32]*v1beta3.DiskLocation, len(*in))
-// 		for key, val := range *in {
-// 			newVal := new(v1beta3.DiskLocation)
-// 			// override (auto generated code has (*&val, *newVal))
-// 			if err := Convert_internal_DiskLocation_To_v1beta3_DiskLocation(val, newVal); err != nil {
-// 				return err
-// 			}
-// 			(*out)[key] = newVal
-// 		}
-// 	} else {
-// 		out.DiskLocations = nil
-// 	}
-// 	return nil
-// }
-
-// func Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error {
-// 	if in.DiskNumbers != nil {
-// 		in, out := &in.DiskNumbers, &out.DiskNumbers
-// 		*out = make(map[uint32]*v1beta3.DiskIDs, len(*in))
-// 		for key, val := range *in {
-// 			newVal := new(v1beta3.DiskIDs)
-// 			// override
-// 			if err := Convert_internal_DiskIDs_To_v1beta3_DiskIDs(val, newVal); err != nil {
-// 				return err
-// 			}
-// 			(*out)[key] = newVal
-// 		}
-// 	} else {
-// 		out.DiskNumbers = nil
-// 	}
-// 	return nil
-// }
+// Add manual conversion functions here to override automatic conversion functions
diff --git a/internal/server/disk/internal/v1beta3/conversion_generated.go b/internal/server/disk/internal/v1beta3/conversion_generated.go
index fb12d86c..7beac9a8 100644
--- a/internal/server/disk/internal/v1beta3/conversion_generated.go
+++ b/internal/server/disk/internal/v1beta3/conversion_generated.go
@@ -3,14 +3,13 @@
 package v1beta3
 
 import (
-	unsafe "unsafe"
-
 	v1beta3 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
 	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
 )
 
 func autoConvert_v1beta3_DiskIDs_To_internal_DiskIDs(in *v1beta3.DiskIDs, out *internal.DiskIDs) error {
-	out.Identifiers = *(*map[string]string)(unsafe.Pointer(&in.Identifiers))
+	out.Page83 = in.Page83
+	out.SerialNumber = in.SerialNumber
 	return nil
 }
 
@@ -20,7 +19,8 @@ func Convert_v1beta3_DiskIDs_To_internal_DiskIDs(in *v1beta3.DiskIDs, out *inter
 }
 
 func autoConvert_internal_DiskIDs_To_v1beta3_DiskIDs(in *internal.DiskIDs, out *v1beta3.DiskIDs) error {
-	out.Identifiers = *(*map[string]string)(unsafe.Pointer(&in.Identifiers))
+	out.Page83 = in.Page83
+	out.SerialNumber = in.SerialNumber
 	return nil
 }
 
diff --git a/internal/server/disk/server.go b/internal/server/disk/server.go
index 1516c30f..2867eb71 100644
--- a/internal/server/disk/server.go
+++ b/internal/server/disk/server.go
@@ -3,6 +3,7 @@ package disk
 import (
 	"context"
 	"fmt"
+	"strconv"
 
 	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
 	"github.com/kubernetes-csi/csi-proxy/internal/os/disk"
@@ -14,6 +15,9 @@ type Server struct {
 	hostAPI disk.API
 }
 
+// check that Server implements internal.ServerInterface
+var _ internal.ServerInterface = &Server{}
+
 func NewServer(hostAPI disk.API) (*Server, error) {
 	return &Server{
 		hostAPI: hostAPI,
@@ -21,11 +25,11 @@ func NewServer(hostAPI disk.API) (*Server, error) {
 }
 
 func (s *Server) ListDiskLocations(context context.Context, request *internal.ListDiskLocationsRequest, version apiversion.Version) (*internal.ListDiskLocationsResponse, error) {
-	klog.V(4).Infof("calling ListDiskLocations")
+	klog.V(2).Infof("Request: ListDiskLocations: %+v", request)
 	response := &internal.ListDiskLocationsResponse{}
 	m, err := s.hostAPI.ListDiskLocations()
 	if err != nil {
-		klog.Errorf("failed ListDiskLocations: %v", err)
+		klog.Errorf("ListDiskLocations failed: %v", err)
 		return response, err
 	}
 
@@ -42,13 +46,13 @@ func (s *Server) ListDiskLocations(context context.Context, request *internal.Li
 }
 
 func (s *Server) PartitionDisk(context context.Context, request *internal.PartitionDiskRequest, version apiversion.Version) (*internal.PartitionDiskResponse, error) {
-	klog.V(4).Infof("calling PartitionDisk with diskNumber=%d", request.DiskNumber)
+	klog.V(2).Infof("Request: PartitionDisk with diskNumber=%d", request.DiskNumber)
 	response := &internal.PartitionDiskResponse{}
 	diskNumber := request.DiskNumber
 
 	initialized, err := s.hostAPI.IsDiskInitialized(diskNumber)
 	if err != nil {
-		klog.Errorf("failed check IsDiskInitialized %v", err)
+		klog.Errorf("IsDiskInitialized failed: %v", err)
 		return response, err
 	}
 	if !initialized {
@@ -82,23 +86,23 @@ func (s *Server) PartitionDisk(context context.Context, request *internal.Partit
 }
 
 func (s *Server) Rescan(context context.Context, request *internal.RescanRequest, version apiversion.Version) (*internal.RescanResponse, error) {
-	klog.V(4).Infof("calling PartitionDisk")
+	klog.V(2).Infof("Request: Rescan")
 	response := &internal.RescanResponse{}
 	err := s.hostAPI.Rescan()
 	if err != nil {
-		klog.Errorf("failed Rescan %v", err)
+		klog.Errorf("Rescan failed %v", err)
 		return nil, err
 	}
 	return response, nil
 }
 
 func (s *Server) GetDiskNumberByName(context context.Context, request *internal.GetDiskNumberByNameRequest, version apiversion.Version) (*internal.GetDiskNumberByNameResponse, error) {
-	klog.V(4).Infof("calling GetDiskNumberByName with diskName %q", request.DiskName)
+	klog.V(4).Infof("Request: GetDiskNumberByName with diskName %q", request.DiskName)
 	response := &internal.GetDiskNumberByNameResponse{}
 	diskName := request.DiskName
 	number, err := s.hostAPI.GetDiskNumberByName(diskName)
 	if err != nil {
-		klog.Errorf("failed GetDiskNumberByName %v", err)
+		klog.Errorf("GetDiskNumberByName failed: %v", err)
 		return nil, err
 	}
 	response.DiskNumber = number
@@ -106,86 +110,133 @@ func (s *Server) GetDiskNumberByName(context context.Context, request *internal.
 }
 
 func (s *Server) ListDiskIDs(context context.Context, request *internal.ListDiskIDsRequest, version apiversion.Version) (*internal.ListDiskIDsResponse, error) {
-	klog.V(4).Infof("calling ListDiskIDs")
+	klog.V(4).Infof("Request: ListDiskIDs")
 	minimumVersion := apiversion.NewVersionOrPanic("v1beta1")
 	if version.Compare(minimumVersion) < 0 {
 		return nil, fmt.Errorf("ListDiskIDs requires CSI-Proxy API version v1beta1 or greater")
 	}
 
-	response := &internal.ListDiskIDsResponse{}
 	diskIDs, err := s.hostAPI.ListDiskIDs()
-
 	if err != nil {
-		klog.Errorf("failed ListDiskIDs %v", err)
+		klog.Errorf("ListDiskIDs failed: %v", err)
 		return nil, err
 	}
-	responseDiskIDs := make(map[uint32]*internal.DiskIDs)
 
 	// Convert from shared to internal type
+	responseDiskIDs := make(map[uint32]*internal.DiskIDs)
 	for k, v := range diskIDs {
-		diskIDs := internal.DiskIDs{Identifiers: make(map[string]string)}
-		for k1, v1 := range v.Identifiers {
-			diskIDs.Identifiers[k1] = v1
+		responseDiskIDs[k] = &internal.DiskIDs{
+			Page83:       v.Page83,
+			SerialNumber: v.SerialNumber,
 		}
-		responseDiskIDs[k] = &diskIDs
 	}
-	response.DiskNumbers = responseDiskIDs
-	return response, nil
+	return &internal.ListDiskIDsResponse{DiskIDs: responseDiskIDs}, nil
 }
 
-func (s *Server) GetDiskStats(context context.Context, request *internal.GetDiskStatsRequest, version apiversion.Version) (*internal.GetDiskStatsResponse, error) {
-	klog.V(4).Infof("calling GetDiskStats with diskNumber=%d", request.DiskNumber)
+func (s *Server) DiskStats(context context.Context, request *internal.DiskStatsRequest, version apiversion.Version) (*internal.DiskStatsResponse, error) {
+	klog.V(2).Infof("Request: DiskStats: diskNumber=%d", request.DiskID)
 	minimumVersion := apiversion.NewVersionOrPanic("v1beta1")
 	if version.Compare(minimumVersion) < 0 {
-		return nil, fmt.Errorf("GetDiskStats requires CSI-Proxy API version v1beta1 or greater")
+		return nil, fmt.Errorf("DiskStats requires CSI-Proxy API version v1beta1 or greater")
 	}
-	diskNumber := request.DiskNumber
-
-	diskSize, err := s.hostAPI.GetDiskStats(diskNumber)
+	// forward to GetDiskStats
+	diskNumber, err := strconv.ParseUint(request.DiskID, 10, 64)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to format DiskStatsRequest.DiskID with err: %w", err)
+	}
+	getDiskStatsRequest := &internal.GetDiskStatsRequest{
+		DiskNumber: uint32(diskNumber),
+	}
+	getDiskStatsResponse, err := s.GetDiskStats(context, getDiskStatsRequest, version)
 	if err != nil {
-		klog.Errorf("failed GetDiskStats %v", err)
+		klog.Errorf("Forward to GetDiskStats failed: %+v", err)
 		return nil, err
 	}
+	return &internal.DiskStatsResponse{
+		DiskSize: getDiskStatsResponse.TotalBytes,
+	}, nil
+}
 
-	response := &internal.GetDiskStatsResponse{
-		DiskSize: diskSize,
+func (s *Server) GetDiskStats(context context.Context, request *internal.GetDiskStatsRequest, version apiversion.Version) (*internal.GetDiskStatsResponse, error) {
+	klog.V(2).Infof("Request: GetDiskStats: diskNumber=%d", request.DiskNumber)
+	diskNumber := request.DiskNumber
+	totalBytes, err := s.hostAPI.GetDiskStats(diskNumber)
+	if err != nil {
+		klog.Errorf("GetDiskStats failed: %v", err)
+		return nil, err
 	}
-
-	return response, nil
+	return &internal.GetDiskStatsResponse{
+		TotalBytes: totalBytes,
+	}, nil
 }
 
-func (s *Server) SetDiskState(_ context.Context, request *internal.SetDiskStateRequest, version apiversion.Version) (*internal.SetDiskStateResponse, error) {
-	klog.V(4).Infof("calling SetDiskState with diskNumber %q and isOnline %v", request.DiskNumber, request.IsOnline)
+func (s *Server) SetAttachState(context context.Context, request *internal.SetAttachStateRequest, version apiversion.Version) (*internal.SetAttachStateResponse, error) {
+	klog.V(2).Infof("Request: SetAttachState: %+v", request)
+
 	minimumVersion := apiversion.NewVersionOrPanic("v1beta2")
 	if version.Compare(minimumVersion) < 0 {
-		return nil, fmt.Errorf("SetDiskState requires CSI-Proxy API version v1beta2 or greater")
+		return nil, fmt.Errorf("SetAttachState requires CSI-Proxy API version v1beta2 or greater")
 	}
 
-	err := s.hostAPI.SetDiskState(request.DiskNumber, request.IsOnline)
+	// forward to SetDiskState
+	diskNumber, err := strconv.ParseUint(request.DiskID, 10, 64)
 	if err != nil {
-		klog.Errorf("failed SetDiskState %v", err)
+		return nil, fmt.Errorf("Failed to format SetAttachStateRequest.DiskID with err: %w", err)
+	}
+	setDiskStateRequest := &internal.SetDiskStateRequest{
+		DiskNumber: uint32(diskNumber),
+		IsOnline:   request.IsOnline,
+	}
+	_, err = s.SetDiskState(context, setDiskStateRequest, version)
+	if err != nil {
+		klog.Errorf("Forward to SetDiskState failed with: %+v", err)
 		return nil, err
 	}
+	return &internal.SetAttachStateResponse{}, nil
+}
 
-	response := &internal.SetDiskStateResponse{}
-
-	return response, nil
+func (s *Server) SetDiskState(context context.Context, request *internal.SetDiskStateRequest, version apiversion.Version) (*internal.SetDiskStateResponse, error) {
+	klog.V(2).Infof("Request: SetDiskState with diskNumber=%q and isOnline=%v", request.DiskNumber, request.IsOnline)
+	err := s.hostAPI.SetDiskState(request.DiskNumber, request.IsOnline)
+	if err != nil {
+		klog.Errorf("SetDiskState failed: %v", err)
+		return nil, err
+	}
+	return &internal.SetDiskStateResponse{}, nil
 }
 
-func (s *Server) GetDiskState(_ context.Context, request *internal.GetDiskStateRequest, version apiversion.Version) (*internal.GetDiskStateResponse, error) {
-	klog.V(4).Infof("calling GetDiskState with diskNumber %q", request.DiskNumber)
+func (s *Server) GetAttachState(context context.Context, request *internal.GetAttachStateRequest, version apiversion.Version) (*internal.GetAttachStateResponse, error) {
+	klog.V(2).Infof("Request: GetAttachState: %+v", request)
+
 	minimumVersion := apiversion.NewVersionOrPanic("v1beta2")
 	if version.Compare(minimumVersion) < 0 {
-		return nil, fmt.Errorf("GetDiskState requires CSI-Proxy API version v1beta2 or greater")
+		return nil, fmt.Errorf("GetAttachState requires CSI-Proxy API version v1beta2 or greater")
 	}
 
-	isOnline, err := s.hostAPI.GetDiskState(request.DiskNumber)
+	// forward to GetDiskState
+	diskNumber, err := strconv.ParseUint(request.DiskID, 10, 64)
 	if err != nil {
-		klog.Errorf("failed GetDiskState %v", err)
+		return nil, fmt.Errorf("Failed to format GetAttachStateRequest.DiskID with err: %w", err)
+	}
+	getDiskStateRequest := &internal.GetDiskStateRequest{
+		DiskNumber: uint32(diskNumber),
+	}
+	getDiskStateResponse, err := s.GetDiskState(context, getDiskStateRequest, version)
+	if err != nil {
+		klog.Errorf("Forward to GetDiskState failed with: %+v", err)
 		return nil, err
 	}
+	return &internal.GetAttachStateResponse{
+		IsOnline: getDiskStateResponse.IsOnline,
+	}, nil
+}
 
-	response := &internal.GetDiskStateResponse{IsOnline: isOnline}
-
-	return response, nil
+func (s *Server) GetDiskState(context context.Context, request *internal.GetDiskStateRequest, version apiversion.Version) (*internal.GetDiskStateResponse, error) {
+	klog.V(4).Infof("calling GetDiskState with diskNumber %q", request.DiskNumber)
+	isOnline, err := s.hostAPI.GetDiskState(request.DiskNumber)
+	if err != nil {
+		klog.Errorf("GetDiskState failed with: %v", err)
+		return nil, err
+	}
+	return &internal.GetDiskStateResponse{IsOnline: isOnline}, nil
 }
diff --git a/internal/server/iscsi/internal/v1alpha1/conversion_generated.go b/internal/server/iscsi/internal/v1alpha1/conversion_generated.go
index 34d64bc3..0b2402d7 100644
--- a/internal/server/iscsi/internal/v1alpha1/conversion_generated.go
+++ b/internal/server/iscsi/internal/v1alpha1/conversion_generated.go
@@ -333,20 +333,9 @@ func Convert_v1alpha1_ListTargetPortalsResponse_To_internal_ListTargetPortalsRes
 	return autoConvert_v1alpha1_ListTargetPortalsResponse_To_internal_ListTargetPortalsResponse(in, out)
 }
 
-func autoConvert_internal_ListTargetPortalsResponse_To_v1alpha1_ListTargetPortalsResponse(in *internal.ListTargetPortalsResponse, out *v1alpha1.ListTargetPortalsResponse) error {
-	if in.TargetPortals != nil {
-		in, out := &in.TargetPortals, &out.TargetPortals
-		*out = make([]*v1alpha1.TargetPortal, len(*in))
-		for i := range *in {
-			if err := Convert_internal_TargetPortal_To_v1alpha1_TargetPortal(*&(*in)[i], *&(*out)[i]); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.TargetPortals = nil
-	}
-	return nil
-}
+// detected external conversion function
+// Convert_internal_ListTargetPortalsResponse_To_v1alpha1_ListTargetPortalsResponse(in *internal.ListTargetPortalsResponse, out *v1alpha1.ListTargetPortalsResponse) error
+// skipping generation of the auto function
 
 func autoConvert_v1alpha1_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest(in *v1alpha1.RemoveTargetPortalRequest, out *internal.RemoveTargetPortalRequest) error {
 	if in.TargetPortal != nil {
diff --git a/internal/server/iscsi/internal/v1alpha2/conversion_generated.go b/internal/server/iscsi/internal/v1alpha2/conversion_generated.go
index e66bcb89..c2821908 100644
--- a/internal/server/iscsi/internal/v1alpha2/conversion_generated.go
+++ b/internal/server/iscsi/internal/v1alpha2/conversion_generated.go
@@ -333,20 +333,9 @@ func Convert_v1alpha2_ListTargetPortalsResponse_To_internal_ListTargetPortalsRes
 	return autoConvert_v1alpha2_ListTargetPortalsResponse_To_internal_ListTargetPortalsResponse(in, out)
 }
 
-func autoConvert_internal_ListTargetPortalsResponse_To_v1alpha2_ListTargetPortalsResponse(in *internal.ListTargetPortalsResponse, out *v1alpha2.ListTargetPortalsResponse) error {
-	if in.TargetPortals != nil {
-		in, out := &in.TargetPortals, &out.TargetPortals
-		*out = make([]*v1alpha2.TargetPortal, len(*in))
-		for i := range *in {
-			if err := Convert_internal_TargetPortal_To_v1alpha2_TargetPortal(*&(*in)[i], *&(*out)[i]); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.TargetPortals = nil
-	}
-	return nil
-}
+// detected external conversion function
+// Convert_internal_ListTargetPortalsResponse_To_v1alpha2_ListTargetPortalsResponse(in *internal.ListTargetPortalsResponse, out *v1alpha2.ListTargetPortalsResponse) error
+// skipping generation of the auto function
 
 func autoConvert_v1alpha2_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest(in *v1alpha2.RemoveTargetPortalRequest, out *internal.RemoveTargetPortalRequest) error {
 	if in.TargetPortal != nil {
diff --git a/internal/shared/disk/types.go b/internal/shared/disk/types.go
index dc62e471..8c179510 100644
--- a/internal/shared/disk/types.go
+++ b/internal/shared/disk/types.go
@@ -11,8 +11,8 @@ type DiskLocation struct {
 	LUNID   string
 }
 
-// DiskID definition
+// DiskIDs definition
 type DiskIDs struct {
-	// Map of Disk ID types and Disk ID values
-	Identifiers map[string]string
+	Page83       string
+	SerialNumber string
 }
diff --git a/scripts/e2e-tests.sh b/scripts/e2e-tests.sh
index 6343a9a0..6b35052e 100755
--- a/scripts/e2e-tests.sh
+++ b/scripts/e2e-tests.sh
@@ -4,7 +4,7 @@ set -o nounset
 set -ex
 
 # the Google Storage bucket
-: $CSI_PROXY_BUCKET
+: "${CSI_PROXY_BUCKET:?CSI_PROXY_BUCKET not set}"
 
 # The bucket url of this script in Google Cloud, set in sync_scripts
 SCRIPT_URL=
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
index 7f7ca84e..52386898 100644
--- a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
@@ -138,7 +138,7 @@ type ListDiskLocationsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of disk device number and <adapter, bus, target, lun ID> associated with each disk device.
+	// Map of disk number and <adapter, bus, target, lun ID> associated with each disk device.
 	DiskLocations map[uint32]*DiskLocation `protobuf:"bytes,1,rep,name=disk_locations,json=diskLocations,proto3" json:"disk_locations,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
@@ -386,8 +386,10 @@ type DiskIDs struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of Disk ID types and Disk ID values.
-	Identifiers map[string]string `protobuf:"bytes,1,rep,name=identifiers,proto3" json:"identifiers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// The disk page83 id.
+	Page83 string `protobuf:"bytes,1,opt,name=page83,proto3" json:"page83,omitempty"`
+	// The disk serial number.
+	SerialNumber string `protobuf:"bytes,2,opt,name=serial_number,json=serialNumber,proto3" json:"serial_number,omitempty"`
 }
 
 func (x *DiskIDs) Reset() {
@@ -422,11 +424,18 @@ func (*DiskIDs) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *DiskIDs) GetIdentifiers() map[string]string {
+func (x *DiskIDs) GetPage83() string {
 	if x != nil {
-		return x.Identifiers
+		return x.Page83
 	}
-	return nil
+	return ""
+}
+
+func (x *DiskIDs) GetSerialNumber() string {
+	if x != nil {
+		return x.SerialNumber
+	}
+	return ""
 }
 
 type ListDiskIDsResponse struct {
@@ -434,7 +443,7 @@ type ListDiskIDsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of disk device numbers and IDs <page83> associated with each disk device.
+	// Map of disk numbers and IDs <page83> associated with each disk device.
 	DiskIds map[uint32]*DiskIDs `protobuf:"bytes,1,rep,name=disk_ids,json=diskIds,proto3" json:"disk_ids,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
@@ -802,87 +811,82 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_r
 	0x0d, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x10,
 	0x0a, 0x0e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
 	0x22, 0x14, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x8e, 0x01, 0x0a, 0x07, 0x44, 0x69, 0x73, 0x6b, 0x49,
-	0x44, 0x73, 0x12, 0x43, 0x0a, 0x0b, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x69, 0x64, 0x65, 0x6e,
-	0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x1a, 0x3e, 0x0a, 0x10, 0x49, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa9, 0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74,
-	0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x44, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
-	0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x69,
-	0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x4c, 0x0a, 0x0c, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
-	0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74,
-	0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69,
-	0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x37, 0x0a, 0x14, 0x47,
-	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74,
-	0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42,
-	0x79, 0x74, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x13, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53,
-	0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64,
-	0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09,
-	0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x65, 0x74,
-	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b,
-	0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64,
-	0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x33, 0x0a, 0x14, 0x47, 0x65, 0x74,
-	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x32, 0xac,
-	0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x44,
-	0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76,
-	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c,
-	0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69,
-	0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
-	0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
-	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x63, 0x61,
-	0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63,
-	0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x76, 0x31, 0x62, 0x65,
-	0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b,
-	0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44,
-	0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73,
-	0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69,
-	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
-	0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x4d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12,
-	0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73,
-	0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e,
-	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53,
-	0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d,
-	0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76,
-	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a,
-	0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65,
-	0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d, 0x63, 0x73, 0x69, 0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x46, 0x0a, 0x07, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44,
+	0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x65, 0x38, 0x33, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x70, 0x61, 0x67, 0x65, 0x38, 0x33, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x65, 0x72,
+	0x69, 0x61, 0x6c, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0xa9,
+	0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x69,
+	0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
+	0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x4c, 0x0a, 0x0c,
+	0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e,
+	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65,
+	0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62,
+	0x65, 0x72, 0x22, 0x37, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61,
+	0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f,
+	0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x13, 0x53,
+	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65,
+	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d,
+	0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
+	0x22, 0x16, 0x0a, 0x14, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44,
+	0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+	0x22, 0x33, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x32, 0xac, 0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c,
+	0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69,
+	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d,
+	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e,
+	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76,
+	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b,
+	0x0a, 0x06, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
+	0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x17, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c,
+	0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62,
+	0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69,
+	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
+	0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73,
+	0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53,
+	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
+	0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65,
+	0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d, 0x63, 0x73,
+	0x69, 0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65,
+	0x6e, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31, 0x62, 0x65,
+	0x74, 0x61, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -897,7 +901,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescData
 }
 
-var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
+var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
 var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_goTypes = []interface{}{
 	(*ListDiskLocationsRequest)(nil),  // 0: v1beta3.ListDiskLocationsRequest
 	(*DiskLocation)(nil),              // 1: v1beta3.DiskLocation
@@ -916,34 +920,32 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_g
 	(*GetDiskStateRequest)(nil),       // 14: v1beta3.GetDiskStateRequest
 	(*GetDiskStateResponse)(nil),      // 15: v1beta3.GetDiskStateResponse
 	nil,                               // 16: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
-	nil,                               // 17: v1beta3.DiskIDs.IdentifiersEntry
-	nil,                               // 18: v1beta3.ListDiskIDsResponse.DiskIdsEntry
+	nil,                               // 17: v1beta3.ListDiskIDsResponse.DiskIdsEntry
 }
 var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_depIdxs = []int32{
 	16, // 0: v1beta3.ListDiskLocationsResponse.disk_locations:type_name -> v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
-	17, // 1: v1beta3.DiskIDs.identifiers:type_name -> v1beta3.DiskIDs.IdentifiersEntry
-	18, // 2: v1beta3.ListDiskIDsResponse.disk_ids:type_name -> v1beta3.ListDiskIDsResponse.DiskIdsEntry
-	1,  // 3: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry.value:type_name -> v1beta3.DiskLocation
-	8,  // 4: v1beta3.ListDiskIDsResponse.DiskIdsEntry.value:type_name -> v1beta3.DiskIDs
-	0,  // 5: v1beta3.Disk.ListDiskLocations:input_type -> v1beta3.ListDiskLocationsRequest
-	3,  // 6: v1beta3.Disk.PartitionDisk:input_type -> v1beta3.PartitionDiskRequest
-	5,  // 7: v1beta3.Disk.Rescan:input_type -> v1beta3.RescanRequest
-	7,  // 8: v1beta3.Disk.ListDiskIDs:input_type -> v1beta3.ListDiskIDsRequest
-	10, // 9: v1beta3.Disk.GetDiskStats:input_type -> v1beta3.GetDiskStatsRequest
-	12, // 10: v1beta3.Disk.SetDiskState:input_type -> v1beta3.SetDiskStateRequest
-	14, // 11: v1beta3.Disk.GetDiskState:input_type -> v1beta3.GetDiskStateRequest
-	2,  // 12: v1beta3.Disk.ListDiskLocations:output_type -> v1beta3.ListDiskLocationsResponse
-	4,  // 13: v1beta3.Disk.PartitionDisk:output_type -> v1beta3.PartitionDiskResponse
-	6,  // 14: v1beta3.Disk.Rescan:output_type -> v1beta3.RescanResponse
-	9,  // 15: v1beta3.Disk.ListDiskIDs:output_type -> v1beta3.ListDiskIDsResponse
-	11, // 16: v1beta3.Disk.GetDiskStats:output_type -> v1beta3.GetDiskStatsResponse
-	13, // 17: v1beta3.Disk.SetDiskState:output_type -> v1beta3.SetDiskStateResponse
-	15, // 18: v1beta3.Disk.GetDiskState:output_type -> v1beta3.GetDiskStateResponse
-	12, // [12:19] is the sub-list for method output_type
-	5,  // [5:12] is the sub-list for method input_type
-	5,  // [5:5] is the sub-list for extension type_name
-	5,  // [5:5] is the sub-list for extension extendee
-	0,  // [0:5] is the sub-list for field type_name
+	17, // 1: v1beta3.ListDiskIDsResponse.disk_ids:type_name -> v1beta3.ListDiskIDsResponse.DiskIdsEntry
+	1,  // 2: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry.value:type_name -> v1beta3.DiskLocation
+	8,  // 3: v1beta3.ListDiskIDsResponse.DiskIdsEntry.value:type_name -> v1beta3.DiskIDs
+	0,  // 4: v1beta3.Disk.ListDiskLocations:input_type -> v1beta3.ListDiskLocationsRequest
+	3,  // 5: v1beta3.Disk.PartitionDisk:input_type -> v1beta3.PartitionDiskRequest
+	5,  // 6: v1beta3.Disk.Rescan:input_type -> v1beta3.RescanRequest
+	7,  // 7: v1beta3.Disk.ListDiskIDs:input_type -> v1beta3.ListDiskIDsRequest
+	10, // 8: v1beta3.Disk.GetDiskStats:input_type -> v1beta3.GetDiskStatsRequest
+	12, // 9: v1beta3.Disk.SetDiskState:input_type -> v1beta3.SetDiskStateRequest
+	14, // 10: v1beta3.Disk.GetDiskState:input_type -> v1beta3.GetDiskStateRequest
+	2,  // 11: v1beta3.Disk.ListDiskLocations:output_type -> v1beta3.ListDiskLocationsResponse
+	4,  // 12: v1beta3.Disk.PartitionDisk:output_type -> v1beta3.PartitionDiskResponse
+	6,  // 13: v1beta3.Disk.Rescan:output_type -> v1beta3.RescanResponse
+	9,  // 14: v1beta3.Disk.ListDiskIDs:output_type -> v1beta3.ListDiskIDsResponse
+	11, // 15: v1beta3.Disk.GetDiskStats:output_type -> v1beta3.GetDiskStatsResponse
+	13, // 16: v1beta3.Disk.SetDiskState:output_type -> v1beta3.SetDiskStateResponse
+	15, // 17: v1beta3.Disk.GetDiskState:output_type -> v1beta3.GetDiskStateResponse
+	11, // [11:18] is the sub-list for method output_type
+	4,  // [4:11] is the sub-list for method input_type
+	4,  // [4:4] is the sub-list for extension type_name
+	4,  // [4:4] is the sub-list for extension extendee
+	0,  // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_init() }
@@ -1151,7 +1153,7 @@ func file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   19,
+			NumMessages:   18,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -1180,8 +1182,8 @@ type DiskClient interface {
 	// ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all
 	// disk devices enumerated by the host.
 	ListDiskLocations(ctx context.Context, in *ListDiskLocationsRequest, opts ...grpc.CallOption) (*ListDiskLocationsResponse, error)
-	// PartitionDisk initializes and partitions a disk device (if the disk has not
-	// been partitioned already) and returns the resulting volume device ID.
+	// PartitionDisk initializes and partitions a disk device with the GPT partition style
+	// (if the disk has not been partitioned already) and returns the resulting volume device ID.
 	PartitionDisk(ctx context.Context, in *PartitionDiskRequest, opts ...grpc.CallOption) (*PartitionDiskResponse, error)
 	// Rescan refreshes the host's storage cache.
 	Rescan(ctx context.Context, in *RescanRequest, opts ...grpc.CallOption) (*RescanResponse, error)
@@ -1271,8 +1273,8 @@ type DiskServer interface {
 	// ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all
 	// disk devices enumerated by the host.
 	ListDiskLocations(context.Context, *ListDiskLocationsRequest) (*ListDiskLocationsResponse, error)
-	// PartitionDisk initializes and partitions a disk device (if the disk has not
-	// been partitioned already) and returns the resulting volume device ID.
+	// PartitionDisk initializes and partitions a disk device with the GPT partition style
+	// (if the disk has not been partitioned already) and returns the resulting volume device ID.
 	PartitionDisk(context.Context, *PartitionDiskRequest) (*PartitionDiskResponse, error)
 	// Rescan refreshes the host's storage cache.
 	Rescan(context.Context, *RescanRequest) (*RescanResponse, error)
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
index 1a5ab1e3..1b581cbe 100644
--- a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
@@ -9,8 +9,8 @@ service Disk {
     // disk devices enumerated by the host.
     rpc ListDiskLocations(ListDiskLocationsRequest) returns (ListDiskLocationsResponse) {}
 
-    // PartitionDisk initializes and partitions a disk device (if the disk has not
-    // been partitioned already) and returns the resulting volume device ID.
+    // PartitionDisk initializes and partitions a disk device with the GPT partition style
+    // (if the disk has not been partitioned already) and returns the resulting volume device ID.
     rpc PartitionDisk(PartitionDiskRequest) returns (PartitionDiskResponse) {}
 
     // Rescan refreshes the host's storage cache.
@@ -41,7 +41,7 @@ message DiskLocation {
 }
 
 message ListDiskLocationsResponse {
-    // Map of disk device number and <adapter, bus, target, lun ID> associated with each disk device.
+    // Map of disk number and <adapter, bus, target, lun ID> associated with each disk device.
     map <uint32, DiskLocation> disk_locations = 1;
 }
 
@@ -67,12 +67,14 @@ message ListDiskIDsRequest {
 }
 
 message DiskIDs {
-    // Map of Disk ID types and Disk ID values.
-    map <string, string> identifiers = 1;
+    // The disk page83 id.
+    string page83 = 1;
+    // The disk serial number.
+    string serial_number = 2;
 }
 
 message ListDiskIDsResponse {
-    // Map of disk device numbers and IDs <page83> associated with each disk device.
+    // Map of disk numbers and disk identifiers associated with each disk device.
     map <uint32, DiskIDs> disk_ids = 1;
 }
 
diff --git a/vendor/k8s.io/gengo/examples/conversion-gen/generators/generator/conversion_generator.go b/vendor/k8s.io/gengo/examples/conversion-gen/generators/generator/conversion_generator.go
index b0767047..bd3f9951 100644
--- a/vendor/k8s.io/gengo/examples/conversion-gen/generators/generator/conversion_generator.go
+++ b/vendor/k8s.io/gengo/examples/conversion-gen/generators/generator/conversion_generator.go
@@ -288,6 +288,15 @@ func (g *ConversionGenerator) GenerateType(context *generator.Context, t *types.
 }
 
 func (g *ConversionGenerator) generateConversion(inType, outType *types.Type, sw *generator.SnippetWriter) {
+	if _, found := g.preexists(inType, outType); found {
+		// there is a public manual Conversion method: use it.
+		sw.Do("\n// detected external conversion function ", nil)
+		sw.Do("\n// ", nil)
+		g.writeConversionFunctionSignature(inType, outType, sw, true)
+		sw.Do("\n// skipping generation of the auto function\n\n", nil)
+		return
+	}
+
 	// function signature
 	sw.Do("func auto", nil)
 	g.writeConversionFunctionSignature(inType, outType, sw, true)
@@ -300,11 +309,6 @@ func (g *ConversionGenerator) generateConversion(inType, outType *types.Type, sw
 	sw.Do("return nil\n", nil)
 	sw.Do("}\n\n", nil)
 
-	if _, found := g.preexists(inType, outType); found {
-		// there is a public manual Conversion method: use it.
-		return
-	}
-
 	if len(errors) == 0 {
 		// Emit a public conversion function.
 		sw.Do("// "+conversionFunctionNameTemplate(publicImportTrackingNamer)+" is an autogenerated conversion function.\nfunc ", argsFromType(inType, outType))
diff --git a/vendor/modules.txt b/vendor/modules.txt
index fcd9911c..ee68dcea 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -177,7 +177,7 @@ google.golang.org/protobuf/types/known/durationpb
 google.golang.org/protobuf/types/known/timestamppb
 # gopkg.in/yaml.v2 v2.2.2
 gopkg.in/yaml.v2
-# k8s.io/gengo v0.0.0-00010101000000-000000000000 => github.com/wk8/gengo v0.0.0-20191007012548-3d2530bfe606
+# k8s.io/gengo v0.0.0-00010101000000-000000000000 => github.com/mauriciopoppe/gengo v0.0.0-20210525224835-9c78f58f3486
 ## explicit
 k8s.io/gengo/args
 k8s.io/gengo/examples/conversion-gen/generators/generator
@@ -192,4 +192,4 @@ k8s.io/klog
 ## explicit
 k8s.io/klog/v2
 # github.com/kubernetes-csi/csi-proxy/client => ./client
-# k8s.io/gengo => github.com/wk8/gengo v0.0.0-20191007012548-3d2530bfe606
+# k8s.io/gengo => github.com/mauriciopoppe/gengo v0.0.0-20210525224835-9c78f58f3486

From 2ce2f20097d05bf93fee2656762ea5b7cb2df13c Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 01:27:28 +0000
Subject: [PATCH 04/22] add integration tests for v1beta3

---
 integrationtests/disk_test.go                 | 100 +---------------
 integrationtests/disk_v1beta3_test.go         | 109 ++++++++++++++++++
 internal/server/disk/internal/types.go        |   1 -
 .../disk/internal/v1alpha1/conversion.go      |   2 +-
 .../disk/internal/v1beta1/conversion.go       |   2 +-
 .../disk/internal/v1beta2/conversion.go       |   2 +-
 6 files changed, 114 insertions(+), 102 deletions(-)
 create mode 100644 integrationtests/disk_v1beta3_test.go

diff --git a/integrationtests/disk_test.go b/integrationtests/disk_test.go
index e25808d2..ce7f8097 100644
--- a/integrationtests/disk_test.go
+++ b/integrationtests/disk_test.go
@@ -1,111 +1,15 @@
 package integrationtests
 
 import (
-	"context"
-	"fmt"
-	"strconv"
-	"strings"
 	"testing"
-
-	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
-	v1beta3client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 // This test is meant to run on GCE where the page83 ID of the first disk contains
 // the host name
 // Skip on Github Actions as it is expected to fail
 func TestDiskAPIGroup(t *testing.T) {
-	t.Run("ListDiskIDs", func(t *testing.T) {
-		skipTestOnCondition(t, isRunningOnGhActions())
-		client, err := v1beta3client.NewClient()
-		require.Nil(t, err)
-		defer client.Close()
-
-		diskNumber := 0
-		id := "page83"
-		listRequest := &v1beta3.ListDiskIDsRequest{}
-		diskIDsResponse, err := client.ListDiskIDs(context.TODO(), listRequest)
-		require.Nil(t, err)
-
-		cmd := "hostname"
-		hostname, err := runPowershellCmd(t, cmd)
-		if err != nil {
-			t.Errorf("Error: %v. Command: %s. Out: %s", err, cmd, hostname)
-		}
-
-		hostname = strings.TrimSpace(hostname)
-
-		diskIDsMap := diskIDsResponse.GetDiskIDs()
-		if diskIDsMap != nil {
-			diskIDs, found := diskIDsMap[strconv.Itoa(diskNumber)]
-			if !found {
-				t.Errorf("Cannot find Disk %d", diskNumber)
-			}
-
-			idValue, found := diskIDs.Identifiers[id]
-			if !found {
-				t.Errorf("Cannot find %s ID of Disk %d", id, diskNumber)
-			}
-
-			// In GCE, the page83 ID of Disk 0 contains the hostname
-			if !strings.Contains(idValue, hostname) {
-				t.Errorf("%s ID of Disk %d is incorrect. Expected to contain: %s. Received: %s", id, diskNumber, hostname, idValue)
-			}
-		}
-	})
-
-	t.Run("Get/SetAttachState", func(t *testing.T) {
+	t.Run("v1beta3Tests", func(t *testing.T) {
 		skipTestOnCondition(t, isRunningOnGhActions())
-		client, err := v1beta3client.NewClient()
-		require.NoError(t, err)
-
-		defer client.Close()
-
-		// initialize disk
-		vhd, vhdCleanup := diskInit(t)
-		defer vhdCleanup()
-
-		diskNumAsString := strconv.FormatUint(uint64(vhd.DiskNumber), 10)
-
-		out, err := runPowershellCmd(t, fmt.Sprintf("Get-Disk -Number %d | Set-Disk -IsOffline $true", vhd.DiskNumber))
-		require.NoError(t, err, "failed setting disk offline, out=%v", out)
-
-		getReq := &v1beta3.GetAttachStateRequest{DiskID: diskNumAsString}
-		getResp, err := client.GetAttachState(context.TODO(), getReq)
-
-		if assert.NoError(t, err) {
-			assert.False(t, getResp.IsOnline, "Expected disk to be offline")
-		}
-
-		setReq := &v1beta3.SetAttachStateRequest{DiskID: diskNumAsString, IsOnline: true}
-		_, err = client.SetAttachState(context.TODO(), setReq)
-		assert.NoError(t, err)
-
-		out, err = runPowershellCmd(t, fmt.Sprintf("Get-Disk -Number %d | Select-Object -ExpandProperty IsOffline", vhd.DiskNumber))
-		assert.NoError(t, err)
-
-		result, err := strconv.ParseBool(strings.TrimSpace(out))
-		assert.NoError(t, err)
-		assert.False(t, result, "Expected disk to be online")
-
-		getReq = &v1beta3.GetAttachStateRequest{DiskID: diskNumAsString}
-		getResp, err = client.GetAttachState(context.TODO(), getReq)
-
-		if assert.NoError(t, err) {
-			assert.True(t, getResp.IsOnline, "Expected disk is online")
-		}
-
-		setReq = &v1beta3.SetAttachStateRequest{DiskID: diskNumAsString, IsOnline: false}
-		_, err = client.SetAttachState(context.TODO(), setReq)
-		assert.NoError(t, err)
-
-		out, err = runPowershellCmd(t, fmt.Sprintf("Get-Disk -Number %d | Select-Object -ExpandProperty IsOffline", vhd.DiskNumber))
-		assert.NoError(t, err)
-
-		result, err = strconv.ParseBool(strings.TrimSpace(out))
-		assert.NoError(t, err)
-		assert.True(t, result, "Expected disk to be offline")
+		v1beta3DiskTests(t)
 	})
 }
diff --git a/integrationtests/disk_v1beta3_test.go b/integrationtests/disk_v1beta3_test.go
new file mode 100644
index 00000000..7e611a33
--- /dev/null
+++ b/integrationtests/disk_v1beta3_test.go
@@ -0,0 +1,109 @@
+package integrationtests
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"strings"
+	"testing"
+
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
+	diskv1beta3client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func v1beta3DiskTests(t *testing.T) {
+	t.Run("ListDiskIDs", func(t *testing.T) {
+		client, err := diskv1beta3client.NewClient()
+		require.Nil(t, err)
+		defer client.Close()
+
+		diskNumber := 0
+		id := "page83"
+		listRequest := &v1beta3.ListDiskIDsRequest{}
+		diskIDsResponse, err := client.ListDiskIDs(context.TODO(), listRequest)
+		require.Nil(t, err)
+
+		cmd := "hostname"
+		hostname, err := runPowershellCmd(t, cmd)
+		if err != nil {
+			t.Errorf("Error: %v. Command: %s. Out: %s", err, cmd, hostname)
+		}
+
+		hostname = strings.TrimSpace(hostname)
+
+		diskIDsMap := diskIDsResponse.DiskIds
+		if diskIDsMap != nil {
+			diskIDs, found := diskIDsMap[uint32(diskNumber)]
+			if !found {
+				t.Errorf("Cannot find Disk %d", diskNumber)
+			}
+
+			page83 := diskIDs.Page83
+			if page83 == "" {
+				t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+			}
+
+			serialNumber := diskIDs.SerialNumber
+			if serialNumber == "" {
+				t.Errorf("serialNumber field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+			}
+
+			// In GCE, the page83 ID of Disk 0 contains the hostname
+			if !strings.Contains(page83, hostname) {
+				t.Errorf("%s ID of Disk %d is incorrect. Expected to contain: %s. Received: %s", id, diskNumber, hostname, page83)
+			}
+		}
+	})
+
+	t.Run("Get/SetAttachState", func(t *testing.T) {
+		client, err := diskv1beta3client.NewClient()
+		require.NoError(t, err)
+
+		defer client.Close()
+
+		// initialize disk
+		vhd, vhdCleanup := diskInit(t)
+		defer vhdCleanup()
+
+		out, err := runPowershellCmd(t, fmt.Sprintf("Get-Disk -Number %d | Set-Disk -IsOffline $true", vhd.DiskNumber))
+		require.NoError(t, err, "failed setting disk offline, out=%v", out)
+
+		getReq := &v1beta3.GetDiskStateRequest{DiskNumber: vhd.DiskNumber}
+		getResp, err := client.GetDiskState(context.TODO(), getReq)
+
+		if assert.NoError(t, err) {
+			assert.False(t, getResp.IsOnline, "Expected disk to be offline")
+		}
+
+		setReq := &v1beta3.SetDiskStateRequest{DiskNumber: vhd.DiskNumber, IsOnline: true}
+		_, err = client.SetDiskState(context.TODO(), setReq)
+		assert.NoError(t, err)
+
+		out, err = runPowershellCmd(t, fmt.Sprintf("Get-Disk -Number %d | Select-Object -ExpandProperty IsOffline", vhd.DiskNumber))
+		assert.NoError(t, err)
+
+		result, err := strconv.ParseBool(strings.TrimSpace(out))
+		assert.NoError(t, err)
+		assert.False(t, result, "Expected disk to be online")
+
+		getReq = &v1beta3.GetDiskStateRequest{DiskNumber: vhd.DiskNumber}
+		getResp, err = client.GetDiskState(context.TODO(), getReq)
+
+		if assert.NoError(t, err) {
+			assert.True(t, getResp.IsOnline, "Expected disk is online")
+		}
+
+		setReq = &v1beta3.SetDiskStateRequest{DiskNumber: vhd.DiskNumber, IsOnline: false}
+		_, err = client.SetDiskState(context.TODO(), setReq)
+		assert.NoError(t, err)
+
+		out, err = runPowershellCmd(t, fmt.Sprintf("Get-Disk -Number %d | Select-Object -ExpandProperty IsOffline", vhd.DiskNumber))
+		assert.NoError(t, err)
+
+		result, err = strconv.ParseBool(strings.TrimSpace(out))
+		assert.NoError(t, err)
+		assert.True(t, result, "Expected disk to be offline")
+	})
+}
diff --git a/internal/server/disk/internal/types.go b/internal/server/disk/internal/types.go
index fd2c96fc..5a3cb80f 100644
--- a/internal/server/disk/internal/types.go
+++ b/internal/server/disk/internal/types.go
@@ -12,7 +12,6 @@ type ListDiskLocationsRequest struct {
 
 type ListDiskLocationsResponse struct {
 	// Map of disk device IDs and <adapter, bus, target, lun ID> associated with each disk device
-	// +k8s:conversion-gen=false
 	DiskLocations map[uint32]*DiskLocation
 }
 
diff --git a/internal/server/disk/internal/v1alpha1/conversion.go b/internal/server/disk/internal/v1alpha1/conversion.go
index 20916c3c..d0bb557c 100644
--- a/internal/server/disk/internal/v1alpha1/conversion.go
+++ b/internal/server/disk/internal/v1alpha1/conversion.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
-	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
 )
 
 // Add manual conversion functions here to override automatic conversion functions
diff --git a/internal/server/disk/internal/v1beta1/conversion.go b/internal/server/disk/internal/v1beta1/conversion.go
index d222be60..c4299ba6 100644
--- a/internal/server/disk/internal/v1beta1/conversion.go
+++ b/internal/server/disk/internal/v1beta1/conversion.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
-	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
 )
 
 // Add manual conversion functions here to override automatic conversion functions
diff --git a/internal/server/disk/internal/v1beta2/conversion.go b/internal/server/disk/internal/v1beta2/conversion.go
index 9b8987dd..05983e4b 100644
--- a/internal/server/disk/internal/v1beta2/conversion.go
+++ b/internal/server/disk/internal/v1beta2/conversion.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
-	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
 )
 
 // Add manual conversion functions here to override automatic conversion functions

From a63a221255560650200f3d74913aec003b48a23a Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 01:38:46 +0000
Subject: [PATCH 05/22] iscsi and volume tests upgraded because of the disk API
 change

---
 integrationtests/iscsi_test.go          | 13 ++++++++-----
 integrationtests/volume_v1beta3_test.go | 12 +++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/integrationtests/iscsi_test.go b/integrationtests/iscsi_test.go
index 233ecb79..5664cba6 100644
--- a/integrationtests/iscsi_test.go
+++ b/integrationtests/iscsi_test.go
@@ -3,6 +3,7 @@ package integrationtests
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"testing"
 
 	diskApi "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
@@ -103,17 +104,19 @@ func e2eTest(t *testing.T) {
 	require.Len(t, tgtDisksResp.DiskIDs, 1)
 
 	diskId := tgtDisksResp.DiskIDs[0]
+	diskNumber, err := strconv.ParseUint(diskId, 10, 64)
+	require.NoError(t, err)
 
-	attachReq := &diskApi.SetAttachStateRequest{DiskID: diskId, IsOnline: true}
-	_, err = disk.SetAttachState(context.TODO(), attachReq)
+	attachReq := &diskApi.SetDiskStateRequest{DiskNumber: uint32(diskNumber), IsOnline: true}
+	_, err = disk.SetDiskState(context.TODO(), attachReq)
 	require.Nil(t, err)
 
-	partReq := &diskApi.PartitionDiskRequest{DiskID: diskId}
+	partReq := &diskApi.PartitionDiskRequest{DiskNumber: uint32(diskNumber)}
 	_, err = disk.PartitionDisk(context.TODO(), partReq)
 	assert.Nil(t, err)
 
-	detachReq := &diskApi.SetAttachStateRequest{DiskID: diskId, IsOnline: false}
-	_, err = disk.SetAttachState(context.TODO(), detachReq)
+	detachReq := &diskApi.SetDiskStateRequest{DiskNumber: uint32(diskNumber), IsOnline: false}
+	_, err = disk.SetDiskState(context.TODO(), detachReq)
 	assert.Nil(t, err)
 }
 
diff --git a/integrationtests/volume_v1beta3_test.go b/integrationtests/volume_v1beta3_test.go
index 30b91731..e035b259 100644
--- a/integrationtests/volume_v1beta3_test.go
+++ b/integrationtests/volume_v1beta3_test.go
@@ -134,19 +134,17 @@ func v1beta3VolumeTests(t *testing.T) {
 		t.Fatalf("GetDiskNumberFromVolumeID failed: %v", err)
 	}
 
-	diskNumberString := fmt.Sprintf("%d", volumeDiskNumberResponse.DiskNumber)
-
-	diskStatsRequest := &diskv1beta3.DiskStatsRequest{
-		DiskID: diskNumberString,
+	diskStatsRequest := &diskv1beta3.GetDiskStatsRequest{
+		DiskNumber: volumeDiskNumberResponse.DiskNumber,
 	}
 
-	diskStatsResponse, err := diskClient.DiskStats(context.TODO(), diskStatsRequest)
+	diskStatsResponse, err := diskClient.GetDiskStats(context.TODO(), diskStatsRequest)
 	if err != nil {
 		t.Fatalf("DiskStats request error: %v", err)
 	}
 
-	if diskStatsResponse.DiskSize < 0 {
-		t.Fatalf("Invalid disk size was returned %v", diskStatsResponse.DiskSize)
+	if diskStatsResponse.TotalBytes < 0 {
+		t.Fatalf("Invalid disk size was returned %v", diskStatsResponse.TotalBytes)
 	}
 
 	// Mount the volume

From 046b15aba2291ec15222d5a98e4c94a42ab2d26a Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 01:57:16 +0000
Subject: [PATCH 06/22] make sure that the listDisks API is actually returning
 data

---
 integrationtests/disk_test.go         | 10 +++++++++-
 integrationtests/disk_v1beta3_test.go | 14 +++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/integrationtests/disk_test.go b/integrationtests/disk_test.go
index ce7f8097..e2812806 100644
--- a/integrationtests/disk_test.go
+++ b/integrationtests/disk_test.go
@@ -9,7 +9,15 @@ import (
 // Skip on Github Actions as it is expected to fail
 func TestDiskAPIGroup(t *testing.T) {
 	t.Run("v1beta3Tests", func(t *testing.T) {
-		skipTestOnCondition(t, isRunningOnGhActions())
 		v1beta3DiskTests(t)
 	})
+	// t.Run("v1beta2Tests", func(t *testing.T) {
+	// 	v1beta2DiskTests(t)
+	// })
+	// t.Run("v1beta1Tests", func(t *testing.T) {
+	// 	v1beta1DiskTests(t)
+	// })
+	// t.Run("v1alpha1Tests", func(t *testing.T) {
+	// 	v1alpha1DiskTests(t)
+	// })
 }
diff --git a/integrationtests/disk_v1beta3_test.go b/integrationtests/disk_v1beta3_test.go
index 7e611a33..39dba56f 100644
--- a/integrationtests/disk_v1beta3_test.go
+++ b/integrationtests/disk_v1beta3_test.go
@@ -15,15 +15,22 @@ import (
 
 func v1beta3DiskTests(t *testing.T) {
 	t.Run("ListDiskIDs", func(t *testing.T) {
+		skipTestOnCondition(t, isRunningOnGhActions())
+
 		client, err := diskv1beta3client.NewClient()
 		require.Nil(t, err)
 		defer client.Close()
 
+		// initialize disk
+		_, vhdCleanup := diskInit(t)
+		defer vhdCleanup()
+
 		diskNumber := 0
 		id := "page83"
 		listRequest := &v1beta3.ListDiskIDsRequest{}
 		diskIDsResponse, err := client.ListDiskIDs(context.TODO(), listRequest)
 		require.Nil(t, err)
+		t.Logf("diskIDsResponse=%v", diskIDsResponse)
 
 		cmd := "hostname"
 		hostname, err := runPowershellCmd(t, cmd)
@@ -32,8 +39,11 @@ func v1beta3DiskTests(t *testing.T) {
 		}
 
 		hostname = strings.TrimSpace(hostname)
-
 		diskIDsMap := diskIDsResponse.DiskIds
+		if len(diskIDsMap) == 0 {
+			t.Errorf("Expected to get diskIDs, instead got diskIDsResponse.DiskIds=%+v", diskIDsMap)
+		}
+
 		if diskIDsMap != nil {
 			diskIDs, found := diskIDsMap[uint32(diskNumber)]
 			if !found {
@@ -58,6 +68,8 @@ func v1beta3DiskTests(t *testing.T) {
 	})
 
 	t.Run("Get/SetAttachState", func(t *testing.T) {
+		skipTestOnCondition(t, isRunningOnGhActions())
+
 		client, err := diskv1beta3client.NewClient()
 		require.NoError(t, err)
 

From 8ed1ee7575307811db9ba5be940d3ce3e8bfc021 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 02:04:11 +0000
Subject: [PATCH 07/22] log commands executed

---
 internal/os/disk/api.go        | 31 ++++++++++++++++++++-----------
 internal/server/disk/server.go |  2 +-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/internal/os/disk/api.go b/internal/os/disk/api.go
index 776f6c31..bfaa3d1b 100644
--- a/internal/os/disk/api.go
+++ b/internal/os/disk/api.go
@@ -64,6 +64,13 @@ func New() DiskAPI {
 	return DiskAPI{}
 }
 
+func runExec(command string) ([]byte, error) {
+	cmd := exec.Command("powershell", "/c", command)
+	klog.V(4).Infof("Executing command: %q", cmd.String())
+	out, err := cmd.CombinedOutput()
+	return out, err
+}
+
 // ListDiskLocations - constructs a map with the disk number as the key and the DiskLocation structure
 // as the value. The DiskLocation struct has various fields like the Adapter, Bus, Target and LUNID.
 func (DiskAPI) ListDiskLocations() (map[uint32]shared.DiskLocation, error) {
@@ -73,7 +80,7 @@ func (DiskAPI) ListDiskLocations() (map[uint32]shared.DiskLocation, error) {
 	//    "location":  "PCI Slot 3 : Adapter 0 : Port 0 : Target 1 : LUN 0"
 	// }, ...]
 	cmd := fmt.Sprintf("Get-Disk | select number, location | ConvertTo-Json")
-	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
+	out, err := runExec(cmd)
 	if err != nil {
 		return nil, fmt.Errorf("failed to list disk location. cmd: %q, output: %q, err %v", cmd, string(out), err)
 	}
@@ -121,7 +128,7 @@ func (DiskAPI) ListDiskLocations() (map[uint32]shared.DiskLocation, error) {
 
 func (DiskAPI) Rescan() error {
 	cmd := "Update-HostStorageCache"
-	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
+	out, err := runExec(cmd)
 	if err != nil {
 		return fmt.Errorf("error updating host storage cache output: %q, err: %v", string(out), err)
 	}
@@ -130,7 +137,7 @@ func (DiskAPI) Rescan() error {
 
 func (DiskAPI) IsDiskInitialized(diskNumber uint32) (bool, error) {
 	cmd := fmt.Sprintf("Get-Disk -Number %d | Where partitionstyle -eq 'raw'", diskNumber)
-	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
+	out, err := runExec(cmd)
 	if err != nil {
 		return false, fmt.Errorf("error checking initialized status of disk %d: %v, %v", diskNumber, out, err)
 	}
@@ -143,7 +150,7 @@ func (DiskAPI) IsDiskInitialized(diskNumber uint32) (bool, error) {
 
 func (DiskAPI) InitializeDisk(diskNumber uint32) error {
 	cmd := fmt.Sprintf("Initialize-Disk -Number %d -PartitionStyle GPT", diskNumber)
-	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
+	out, err := runExec(cmd)
 	if err != nil {
 		return fmt.Errorf("error initializing disk %d: %v, %v", diskNumber, out, err)
 	}
@@ -152,7 +159,7 @@ func (DiskAPI) InitializeDisk(diskNumber uint32) error {
 
 func (DiskAPI) PartitionsExist(diskNumber uint32) (bool, error) {
 	cmd := fmt.Sprintf("Get-Partition | Where DiskNumber -eq %d", diskNumber)
-	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
+	out, err := runExec(cmd)
 	if err != nil {
 		return false, fmt.Errorf("error checking presence of partitions on disk %d: %v, %v", diskNumber, out, err)
 	}
@@ -165,7 +172,7 @@ func (DiskAPI) PartitionsExist(diskNumber uint32) (bool, error) {
 
 func (DiskAPI) CreatePartition(diskNumber uint32) error {
 	cmd := fmt.Sprintf("New-Partition -DiskNumber %d -UseMaximumSize", diskNumber)
-	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
+	out, err := runExec(cmd)
 	if err != nil {
 		return fmt.Errorf("error creating parition on disk %d: %v, %v", diskNumber, out, err)
 	}
@@ -276,7 +283,8 @@ func (DiskAPI) GetDiskPage83ID(disk syscall.Handle) (string, error) {
 }
 
 func (imp DiskAPI) GetDiskNumberWithID(page83ID string) (uint32, error) {
-	out, err := exec.Command("powershell.exe", "(get-disk | select Path) | ConvertTo-Json").CombinedOutput()
+	cmd := "(Get-Disk | Select Path) | ConvertTo-Json"
+	out, err := runExec(cmd)
 	if err != nil {
 		return 0, fmt.Errorf("Could not query disk paths")
 	}
@@ -303,7 +311,8 @@ func (imp DiskAPI) GetDiskNumberWithID(page83ID string) (uint32, error) {
 // ListDiskIDs - constructs a map with the disk number as the key and the DiskID structure
 // as the value. The DiskID struct has a field for the page83 ID.
 func (imp DiskAPI) ListDiskIDs() (map[uint32]shared.DiskIDs, error) {
-	out, err := exec.Command("powershell.exe", "(get-disk | select Path, SerialNumber) | ConvertTo-Json").CombinedOutput()
+	cmd := "(Get-Disk | Select Path, SerialNumber) | ConvertTo-Json"
+	out, err := runExec(cmd)
 	if err != nil {
 		return nil, fmt.Errorf("Could not query disk paths")
 	}
@@ -341,7 +350,7 @@ func (imp DiskAPI) ListDiskIDs() (map[uint32]shared.DiskIDs, error) {
 
 func (imp DiskAPI) GetDiskStats(diskNumber uint32) (int64, error) {
 	cmd := fmt.Sprintf("(Get-Disk -Number %d).Size", diskNumber)
-	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
+	out, err := runExec(cmd)
 	if err != nil || len(out) == 0 {
 		return -1, fmt.Errorf("error getting size of disk. cmd: %s, output: %s, error: %v", cmd, string(out), err)
 	}
@@ -363,7 +372,7 @@ func (imp DiskAPI) GetDiskStats(diskNumber uint32) (int64, error) {
 
 func (imp DiskAPI) SetDiskState(diskNumber uint32, isOnline bool) error {
 	cmd := fmt.Sprintf("(Get-Disk -Number %d) | Set-Disk -IsOffline $%t", diskNumber, !isOnline)
-	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
+	out, err := runExec(cmd)
 	if err != nil {
 		return fmt.Errorf("error setting disk attach state. cmd: %s, output: %s, error: %v", cmd, string(out), err)
 	}
@@ -373,7 +382,7 @@ func (imp DiskAPI) SetDiskState(diskNumber uint32, isOnline bool) error {
 
 func (imp DiskAPI) GetDiskState(diskNumber uint32) (bool, error) {
 	cmd := fmt.Sprintf("(Get-Disk -Number %d) | Select-Object -ExpandProperty IsOffline", diskNumber)
-	out, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
+	out, err := runExec(cmd)
 	if err != nil {
 		return false, fmt.Errorf("error getting disk state. cmd: %s, output: %s, error: %v", cmd, string(out), err)
 	}
diff --git a/internal/server/disk/server.go b/internal/server/disk/server.go
index 2867eb71..35098e26 100644
--- a/internal/server/disk/server.go
+++ b/internal/server/disk/server.go
@@ -232,7 +232,7 @@ func (s *Server) GetAttachState(context context.Context, request *internal.GetAt
 }
 
 func (s *Server) GetDiskState(context context.Context, request *internal.GetDiskStateRequest, version apiversion.Version) (*internal.GetDiskStateResponse, error) {
-	klog.V(4).Infof("calling GetDiskState with diskNumber %q", request.DiskNumber)
+	klog.V(4).Infof("Request: GetDiskState with diskNumber=%d", request.DiskNumber)
 	isOnline, err := s.hostAPI.GetDiskState(request.DiskNumber)
 	if err != nil {
 		klog.Errorf("GetDiskState failed with: %v", err)

From bb0be4818d13b2f83ad5f1caa65accf5ad704470 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 02:48:30 +0000
Subject: [PATCH 08/22] Rename proto field diskIDs to disk_iDs (for the
 generator to work)

---
 Makefile                                      |   2 +-
 client/api/disk/v1beta3/api.pb.go             | 146 +++++++++---------
 client/api/disk/v1beta3/api.proto             |   2 +-
 internal/os/disk/api.go                       |  10 ++
 internal/server/disk/internal/types.go        |   1 -
 .../internal/v1beta3/conversion_generated.go  |  26 ++++
 internal/server/disk/server.go                |   2 +-
 .../client/api/disk/v1beta3/api.pb.go         | 146 +++++++++---------
 .../client/api/disk/v1beta3/api.proto         |   2 +-
 9 files changed, 186 insertions(+), 151 deletions(-)

diff --git a/Makefile b/Makefile
index f335d848..87ea0947 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ include release-tools/build.make
 BUILD_PLATFORMS=windows amd64 .exe
 GOPATH ?= $(shell go env GOPATH)
 REPO_ROOT = $(CURDIR)
-BUILD_DIR = build
+BUILD_DIR = bin
 BUILD_TOOLS_DIR = $(BUILD_DIR)/tools
 GO_ENV_VARS = GO111MODULE=on GOOS=windows
 CSI_PROXY_API_GEN = $(BUILD_DIR)/csi-proxy-api-gen
diff --git a/client/api/disk/v1beta3/api.pb.go b/client/api/disk/v1beta3/api.pb.go
index 52386898..423e9dd1 100644
--- a/client/api/disk/v1beta3/api.pb.go
+++ b/client/api/disk/v1beta3/api.pb.go
@@ -443,8 +443,8 @@ type ListDiskIDsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of disk numbers and IDs <page83> associated with each disk device.
-	DiskIds map[uint32]*DiskIDs `protobuf:"bytes,1,rep,name=disk_ids,json=diskIds,proto3" json:"disk_ids,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Map of disk numbers and disk identifiers associated with each disk device.
+	DiskIDs map[uint32]*DiskIDs `protobuf:"bytes,1,rep,name=diskIDs,proto3" json:"diskIDs,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // the case is intentional for protoc to generate the field as DiskIDs
 }
 
 func (x *ListDiskIDsResponse) Reset() {
@@ -479,9 +479,9 @@ func (*ListDiskIDsResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *ListDiskIDsResponse) GetDiskIds() map[uint32]*DiskIDs {
+func (x *ListDiskIDsResponse) GetDiskIDs() map[uint32]*DiskIDs {
 	if x != nil {
-		return x.DiskIds
+		return x.DiskIDs
 	}
 	return nil
 }
@@ -815,78 +815,78 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_r
 	0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x65, 0x38, 0x33, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x06, 0x70, 0x61, 0x67, 0x65, 0x38, 0x33, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x65, 0x72,
 	0x69, 0x61, 0x6c, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0xa9,
+	0x52, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0xa8,
 	0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x69,
-	0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
-	0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x4c, 0x0a, 0x0c,
-	0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e,
-	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65,
-	0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x1a, 0x4c, 0x0a, 0x0c, 0x44,
+	0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76,
+	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65,
+	0x72, 0x22, 0x37, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74,
+	0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a,
+	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x13, 0x53, 0x65,
+	0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62,
-	0x65, 0x72, 0x22, 0x37, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61,
-	0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f,
-	0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x13, 0x53,
-	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65,
-	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d,
-	0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
-	0x22, 0x16, 0x0a, 0x14, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44,
-	0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
-	0x22, 0x33, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f,
-	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f,
-	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x32, 0xac, 0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c,
-	0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d,
-	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e,
-	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76,
+	0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x22,
+	0x16, 0x0a, 0x14, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44, 0x69,
+	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f,
+	0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22,
+	0x33, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e,
+	0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e,
+	0x6c, 0x69, 0x6e, 0x65, 0x32, 0xac, 0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c, 0x0a,
+	0x11, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73,
+	0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
+	0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d, 0x50,
+	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e, 0x76,
 	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b,
-	0x0a, 0x06, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
-	0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x17, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c,
-	0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62,
-	0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69,
-	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
-	0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73,
-	0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
-	0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53,
-	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76, 0x31,
+	0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44,
+	0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b, 0x0a,
+	0x06, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x17, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c, 0x69,
+	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62, 0x65,
+	0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73,
+	0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47,
+	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
 	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
-	0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65,
+	0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65,
 	0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d, 0x63, 0x73,
-	0x69, 0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65,
-	0x6e, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31, 0x62, 0x65,
-	0x74, 0x61, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47,
+	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d, 0x63, 0x73, 0x69,
+	0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+	0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74,
+	0x61, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -920,13 +920,13 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_g
 	(*GetDiskStateRequest)(nil),       // 14: v1beta3.GetDiskStateRequest
 	(*GetDiskStateResponse)(nil),      // 15: v1beta3.GetDiskStateResponse
 	nil,                               // 16: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
-	nil,                               // 17: v1beta3.ListDiskIDsResponse.DiskIdsEntry
+	nil,                               // 17: v1beta3.ListDiskIDsResponse.DiskIDsEntry
 }
 var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_depIdxs = []int32{
 	16, // 0: v1beta3.ListDiskLocationsResponse.disk_locations:type_name -> v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
-	17, // 1: v1beta3.ListDiskIDsResponse.disk_ids:type_name -> v1beta3.ListDiskIDsResponse.DiskIdsEntry
+	17, // 1: v1beta3.ListDiskIDsResponse.diskIDs:type_name -> v1beta3.ListDiskIDsResponse.DiskIDsEntry
 	1,  // 2: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry.value:type_name -> v1beta3.DiskLocation
-	8,  // 3: v1beta3.ListDiskIDsResponse.DiskIdsEntry.value:type_name -> v1beta3.DiskIDs
+	8,  // 3: v1beta3.ListDiskIDsResponse.DiskIDsEntry.value:type_name -> v1beta3.DiskIDs
 	0,  // 4: v1beta3.Disk.ListDiskLocations:input_type -> v1beta3.ListDiskLocationsRequest
 	3,  // 5: v1beta3.Disk.PartitionDisk:input_type -> v1beta3.PartitionDiskRequest
 	5,  // 6: v1beta3.Disk.Rescan:input_type -> v1beta3.RescanRequest
diff --git a/client/api/disk/v1beta3/api.proto b/client/api/disk/v1beta3/api.proto
index 1b581cbe..7d561367 100644
--- a/client/api/disk/v1beta3/api.proto
+++ b/client/api/disk/v1beta3/api.proto
@@ -75,7 +75,7 @@ message DiskIDs {
 
 message ListDiskIDsResponse {
     // Map of disk numbers and disk identifiers associated with each disk device.
-    map <uint32, DiskIDs> disk_ids = 1;
+    map <uint32, DiskIDs> diskIDs = 1;  // the case is intentional for protoc to generate the field as DiskIDs
 }
 
 message GetDiskStatsRequest {
diff --git a/internal/os/disk/api.go b/internal/os/disk/api.go
index bfaa3d1b..b02bcd1c 100644
--- a/internal/os/disk/api.go
+++ b/internal/os/disk/api.go
@@ -311,6 +311,16 @@ func (imp DiskAPI) GetDiskNumberWithID(page83ID string) (uint32, error) {
 // ListDiskIDs - constructs a map with the disk number as the key and the DiskID structure
 // as the value. The DiskID struct has a field for the page83 ID.
 func (imp DiskAPI) ListDiskIDs() (map[uint32]shared.DiskIDs, error) {
+	// sample response
+	// [
+	// {
+	//     "Path":  "\\\\?\\scsi#disk\u0026ven_google\u0026prod_persistentdisk#4\u002621cb0360\u00260\u0026000100#{53f56307-b6bf-11d0-94f2-00a0c91efb8b}",
+	//     "SerialNumber":  "                    "
+	// },
+	// {
+	//     "Path":  "\\\\?\\scsi#disk\u0026ven_msft\u0026prod_virtual_disk#2\u00261f4adffe\u00260\u0026000001#{53f56307-b6bf-11d0-94f2-00a0c91efb8b}",
+	//     "SerialNumber":  null
+	// },
 	cmd := "(Get-Disk | Select Path, SerialNumber) | ConvertTo-Json"
 	out, err := runExec(cmd)
 	if err != nil {
diff --git a/internal/server/disk/internal/types.go b/internal/server/disk/internal/types.go
index 5a3cb80f..8ce8a7df 100644
--- a/internal/server/disk/internal/types.go
+++ b/internal/server/disk/internal/types.go
@@ -49,7 +49,6 @@ type DiskIDs struct {
 
 type ListDiskIDsResponse struct {
 	// Map of disk device numbers and IDs associated with each disk device
-	// +k8s:conversion-gen=false
 	DiskIDs map[uint32]*DiskIDs
 }
 
diff --git a/internal/server/disk/internal/v1beta3/conversion_generated.go b/internal/server/disk/internal/v1beta3/conversion_generated.go
index 7beac9a8..32f6c56f 100644
--- a/internal/server/disk/internal/v1beta3/conversion_generated.go
+++ b/internal/server/disk/internal/v1beta3/conversion_generated.go
@@ -154,6 +154,19 @@ func Convert_internal_ListDiskIDsRequest_To_v1beta3_ListDiskIDsRequest(in *inter
 }
 
 func autoConvert_v1beta3_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta3.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error {
+	if in.DiskIDs != nil {
+		in, out := &in.DiskIDs, &out.DiskIDs
+		*out = make(map[uint32]*internal.DiskIDs, len(*in))
+		for key, val := range *in {
+			newVal := new(*internal.DiskIDs)
+			if err := Convert_v1beta3_DiskIDs_To_internal_DiskIDs(*&val, *newVal); err != nil {
+				return err
+			}
+			(*out)[key] = *newVal
+		}
+	} else {
+		out.DiskIDs = nil
+	}
 	return nil
 }
 
@@ -163,6 +176,19 @@ func Convert_v1beta3_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1b
 }
 
 func autoConvert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error {
+	if in.DiskIDs != nil {
+		in, out := &in.DiskIDs, &out.DiskIDs
+		*out = make(map[uint32]*v1beta3.DiskIDs, len(*in))
+		for key, val := range *in {
+			newVal := new(*v1beta3.DiskIDs)
+			if err := Convert_internal_DiskIDs_To_v1beta3_DiskIDs(*&val, *newVal); err != nil {
+				return err
+			}
+			(*out)[key] = *newVal
+		}
+	} else {
+		out.DiskIDs = nil
+	}
 	return nil
 }
 
diff --git a/internal/server/disk/server.go b/internal/server/disk/server.go
index 35098e26..18ee8e0d 100644
--- a/internal/server/disk/server.go
+++ b/internal/server/disk/server.go
@@ -196,7 +196,7 @@ func (s *Server) SetAttachState(context context.Context, request *internal.SetAt
 }
 
 func (s *Server) SetDiskState(context context.Context, request *internal.SetDiskStateRequest, version apiversion.Version) (*internal.SetDiskStateResponse, error) {
-	klog.V(2).Infof("Request: SetDiskState with diskNumber=%q and isOnline=%v", request.DiskNumber, request.IsOnline)
+	klog.V(2).Infof("Request: SetDiskState with diskNumber=%d and isOnline=%v", request.DiskNumber, request.IsOnline)
 	err := s.hostAPI.SetDiskState(request.DiskNumber, request.IsOnline)
 	if err != nil {
 		klog.Errorf("SetDiskState failed: %v", err)
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
index 52386898..423e9dd1 100644
--- a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
@@ -443,8 +443,8 @@ type ListDiskIDsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Map of disk numbers and IDs <page83> associated with each disk device.
-	DiskIds map[uint32]*DiskIDs `protobuf:"bytes,1,rep,name=disk_ids,json=diskIds,proto3" json:"disk_ids,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Map of disk numbers and disk identifiers associated with each disk device.
+	DiskIDs map[uint32]*DiskIDs `protobuf:"bytes,1,rep,name=diskIDs,proto3" json:"diskIDs,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // the case is intentional for protoc to generate the field as DiskIDs
 }
 
 func (x *ListDiskIDsResponse) Reset() {
@@ -479,9 +479,9 @@ func (*ListDiskIDsResponse) Descriptor() ([]byte, []int) {
 	return file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *ListDiskIDsResponse) GetDiskIds() map[uint32]*DiskIDs {
+func (x *ListDiskIDsResponse) GetDiskIDs() map[uint32]*DiskIDs {
 	if x != nil {
-		return x.DiskIds
+		return x.DiskIDs
 	}
 	return nil
 }
@@ -815,78 +815,78 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_r
 	0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x65, 0x38, 0x33, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x06, 0x70, 0x61, 0x67, 0x65, 0x38, 0x33, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x65, 0x72,
 	0x69, 0x61, 0x6c, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0xa9,
+	0x52, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0xa8,
 	0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x69,
-	0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
-	0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x4c, 0x0a, 0x0c,
-	0x44, 0x69, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e,
-	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65,
-	0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x52, 0x07, 0x64, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x1a, 0x4c, 0x0a, 0x0c, 0x44,
+	0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x76,
+	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65,
+	0x72, 0x22, 0x37, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x74,
+	0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a,
+	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x13, 0x53, 0x65,
+	0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62,
-	0x65, 0x72, 0x22, 0x37, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61,
-	0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f,
-	0x74, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x13, 0x53,
-	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65,
-	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d,
-	0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
-	0x22, 0x16, 0x0a, 0x14, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44,
-	0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
-	0x22, 0x33, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f,
-	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f,
-	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x32, 0xac, 0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c,
-	0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d,
-	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e,
-	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76,
+	0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x22,
+	0x16, 0x0a, 0x14, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x44, 0x69,
+	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f,
+	0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22,
+	0x33, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x6f, 0x6e,
+	0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e,
+	0x6c, 0x69, 0x6e, 0x65, 0x32, 0xac, 0x04, 0x0a, 0x04, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x5c, 0x0a,
+	0x11, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x12, 0x21, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73,
+	0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
+	0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0d, 0x50,
+	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x6b, 0x12, 0x1d, 0x2e, 0x76,
 	0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b,
-	0x0a, 0x06, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
-	0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x17, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c,
-	0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62,
-	0x65, 0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69,
-	0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x33, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
-	0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73,
-	0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
-	0x2e, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53,
-	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x44, 0x69, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x76, 0x31,
+	0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x44,
+	0x69, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b, 0x0a,
+	0x06, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x12, 0x16, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x17, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x52, 0x65, 0x73, 0x63, 0x61, 0x6e,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0b, 0x4c, 0x69,
+	0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x12, 0x1b, 0x2e, 0x76, 0x31, 0x62, 0x65,
+	0x74, 0x61, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x49, 0x44, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73,
+	0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33,
+	0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47,
+	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
 	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e,
-	0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65,
+	0x53, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x53, 0x65,
 	0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d, 0x63, 0x73,
-	0x69, 0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65,
-	0x6e, 0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31, 0x62, 0x65,
-	0x74, 0x61, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47,
+	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x33, 0x2e, 0x47, 0x65, 0x74,
+	0x44, 0x69, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2d, 0x63, 0x73, 0x69,
+	0x2f, 0x63, 0x73, 0x69, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+	0x74, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69, 0x73, 0x6b, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74,
+	0x61, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -920,13 +920,13 @@ var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_g
 	(*GetDiskStateRequest)(nil),       // 14: v1beta3.GetDiskStateRequest
 	(*GetDiskStateResponse)(nil),      // 15: v1beta3.GetDiskStateResponse
 	nil,                               // 16: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
-	nil,                               // 17: v1beta3.ListDiskIDsResponse.DiskIdsEntry
+	nil,                               // 17: v1beta3.ListDiskIDsResponse.DiskIDsEntry
 }
 var file_github_com_kubernetes_csi_csi_proxy_client_api_disk_v1beta3_api_proto_depIdxs = []int32{
 	16, // 0: v1beta3.ListDiskLocationsResponse.disk_locations:type_name -> v1beta3.ListDiskLocationsResponse.DiskLocationsEntry
-	17, // 1: v1beta3.ListDiskIDsResponse.disk_ids:type_name -> v1beta3.ListDiskIDsResponse.DiskIdsEntry
+	17, // 1: v1beta3.ListDiskIDsResponse.diskIDs:type_name -> v1beta3.ListDiskIDsResponse.DiskIDsEntry
 	1,  // 2: v1beta3.ListDiskLocationsResponse.DiskLocationsEntry.value:type_name -> v1beta3.DiskLocation
-	8,  // 3: v1beta3.ListDiskIDsResponse.DiskIdsEntry.value:type_name -> v1beta3.DiskIDs
+	8,  // 3: v1beta3.ListDiskIDsResponse.DiskIDsEntry.value:type_name -> v1beta3.DiskIDs
 	0,  // 4: v1beta3.Disk.ListDiskLocations:input_type -> v1beta3.ListDiskLocationsRequest
 	3,  // 5: v1beta3.Disk.PartitionDisk:input_type -> v1beta3.PartitionDiskRequest
 	5,  // 6: v1beta3.Disk.Rescan:input_type -> v1beta3.RescanRequest
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
index 1b581cbe..7d561367 100644
--- a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
@@ -75,7 +75,7 @@ message DiskIDs {
 
 message ListDiskIDsResponse {
     // Map of disk numbers and disk identifiers associated with each disk device.
-    map <uint32, DiskIDs> disk_ids = 1;
+    map <uint32, DiskIDs> diskIDs = 1;  // the case is intentional for protoc to generate the field as DiskIDs
 }
 
 message GetDiskStatsRequest {

From 0337292c16e202ed208388c9b40c5d2f0f594518 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 03:13:27 +0000
Subject: [PATCH 09/22] override autogenerated function with the correct
 parameters

---
 integrationtests/disk_v1beta3_test.go         |  2 +-
 .../disk/internal/v1beta3/conversion.go       | 46 ++++++++++++++++++
 .../internal/v1beta3/conversion_generated.go  | 48 +++----------------
 internal/server/disk/server.go                |  4 +-
 4 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/integrationtests/disk_v1beta3_test.go b/integrationtests/disk_v1beta3_test.go
index 39dba56f..47c69df3 100644
--- a/integrationtests/disk_v1beta3_test.go
+++ b/integrationtests/disk_v1beta3_test.go
@@ -39,7 +39,7 @@ func v1beta3DiskTests(t *testing.T) {
 		}
 
 		hostname = strings.TrimSpace(hostname)
-		diskIDsMap := diskIDsResponse.DiskIds
+		diskIDsMap := diskIDsResponse.DiskIDs
 		if len(diskIDsMap) == 0 {
 			t.Errorf("Expected to get diskIDs, instead got diskIDsResponse.DiskIds=%+v", diskIDsMap)
 		}
diff --git a/internal/server/disk/internal/v1beta3/conversion.go b/internal/server/disk/internal/v1beta3/conversion.go
index 018db1e1..eff2f9e4 100644
--- a/internal/server/disk/internal/v1beta3/conversion.go
+++ b/internal/server/disk/internal/v1beta3/conversion.go
@@ -1,3 +1,49 @@
 package v1beta3
 
+import (
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
+	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+)
+
 // Add manual conversion functions here to override automatic conversion functions
+
+func Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error {
+	if in.DiskIDs != nil {
+		in, out := &in.DiskIDs, &out.DiskIDs
+		*out = make(map[uint32]*v1beta3.DiskIDs, len(*in))
+		for key, val := range *in {
+
+			// This function is almost generated correctly, it has an issue in the type of arguments sent
+			// e.g.  if err := Convert_internal_DiskIDs_To_v1beta3_DiskIDs(*&val, *newVal); err != nil {
+			newVal := new(v1beta3.DiskIDs)
+			if err := Convert_internal_DiskIDs_To_v1beta3_DiskIDs(val, newVal); err != nil {
+				return err
+			}
+			(*out)[key] = newVal
+
+		}
+	} else {
+		out.DiskIDs = nil
+	}
+	return nil
+}
+
+func Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error {
+	if in.DiskLocations != nil {
+		in, out := &in.DiskLocations, &out.DiskLocations
+		*out = make(map[uint32]*v1beta3.DiskLocation, len(*in))
+		for key, val := range *in {
+
+			// This function is almost generated correctly, it has an issue in the type of arguments sent
+			// e.g.  if err := Convert_internal_DiskLocation_To_v1beta3_DiskLocation(*&val, *newVal); err != nil {
+			newVal := new(v1beta3.DiskLocation)
+			if err := Convert_internal_DiskLocation_To_v1beta3_DiskLocation(val, newVal); err != nil {
+				return err
+			}
+			(*out)[key] = newVal
+		}
+	} else {
+		out.DiskLocations = nil
+	}
+	return nil
+}
diff --git a/internal/server/disk/internal/v1beta3/conversion_generated.go b/internal/server/disk/internal/v1beta3/conversion_generated.go
index 32f6c56f..5b94c78f 100644
--- a/internal/server/disk/internal/v1beta3/conversion_generated.go
+++ b/internal/server/disk/internal/v1beta3/conversion_generated.go
@@ -175,27 +175,9 @@ func Convert_v1beta3_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1b
 	return autoConvert_v1beta3_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in, out)
 }
 
-func autoConvert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error {
-	if in.DiskIDs != nil {
-		in, out := &in.DiskIDs, &out.DiskIDs
-		*out = make(map[uint32]*v1beta3.DiskIDs, len(*in))
-		for key, val := range *in {
-			newVal := new(*v1beta3.DiskIDs)
-			if err := Convert_internal_DiskIDs_To_v1beta3_DiskIDs(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.DiskIDs = nil
-	}
-	return nil
-}
-
-// Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse is an autogenerated conversion function.
-func Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error {
-	return autoConvert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in, out)
-}
+// detected external conversion function
+// Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error
+// skipping generation of the auto function
 
 func autoConvert_v1beta3_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta3.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error {
 	return nil
@@ -237,27 +219,9 @@ func Convert_v1beta3_ListDiskLocationsResponse_To_internal_ListDiskLocationsResp
 	return autoConvert_v1beta3_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in, out)
 }
 
-func autoConvert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error {
-	if in.DiskLocations != nil {
-		in, out := &in.DiskLocations, &out.DiskLocations
-		*out = make(map[uint32]*v1beta3.DiskLocation, len(*in))
-		for key, val := range *in {
-			newVal := new(*v1beta3.DiskLocation)
-			if err := Convert_internal_DiskLocation_To_v1beta3_DiskLocation(*&val, *newVal); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.DiskLocations = nil
-	}
-	return nil
-}
-
-// Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse is an autogenerated conversion function.
-func Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error {
-	return autoConvert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in, out)
-}
+// detected external conversion function
+// Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error
+// skipping generation of the auto function
 
 func autoConvert_v1beta3_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta3.PartitionDiskRequest, out *internal.PartitionDiskRequest) error {
 	out.DiskNumber = in.DiskNumber
diff --git a/internal/server/disk/server.go b/internal/server/disk/server.go
index 18ee8e0d..2d2beab3 100644
--- a/internal/server/disk/server.go
+++ b/internal/server/disk/server.go
@@ -130,7 +130,9 @@ func (s *Server) ListDiskIDs(context context.Context, request *internal.ListDisk
 			SerialNumber: v.SerialNumber,
 		}
 	}
-	return &internal.ListDiskIDsResponse{DiskIDs: responseDiskIDs}, nil
+	response := &internal.ListDiskIDsResponse{DiskIDs: responseDiskIDs}
+	klog.V(5).Infof("Response=%v", response)
+	return response, nil
 }
 
 func (s *Server) DiskStats(context context.Context, request *internal.DiskStatsRequest, version apiversion.Version) (*internal.DiskStatsResponse, error) {

From a29dd2228e26082ae31f56b0f6ebd5b31fe3fb6f Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 04:06:23 +0000
Subject: [PATCH 10/22] add PartitionDisk e2e test

---
 integrationtests/disk_v1beta3_test.go | 127 ++++++++++++++++++++------
 1 file changed, 98 insertions(+), 29 deletions(-)

diff --git a/integrationtests/disk_v1beta3_test.go b/integrationtests/disk_v1beta3_test.go
index 47c69df3..059a886e 100644
--- a/integrationtests/disk_v1beta3_test.go
+++ b/integrationtests/disk_v1beta3_test.go
@@ -3,9 +3,11 @@ package integrationtests
 import (
 	"context"
 	"fmt"
+	"math/rand"
 	"strconv"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
 	diskv1beta3client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3"
@@ -14,22 +16,22 @@ import (
 )
 
 func v1beta3DiskTests(t *testing.T) {
-	t.Run("ListDiskIDs", func(t *testing.T) {
-		skipTestOnCondition(t, isRunningOnGhActions())
+	t.Run("ListDiskIDs,ListDiskLocations", func(t *testing.T) {
+		// NOTE: this test can run in Github Actions because it doesn't use VHDs
 
 		client, err := diskv1beta3client.NewClient()
 		require.Nil(t, err)
 		defer client.Close()
 
-		// initialize disk
-		_, vhdCleanup := diskInit(t)
-		defer vhdCleanup()
-
-		diskNumber := 0
-		id := "page83"
 		listRequest := &v1beta3.ListDiskIDsRequest{}
 		diskIDsResponse, err := client.ListDiskIDs(context.TODO(), listRequest)
 		require.Nil(t, err)
+
+		// example output for GCE (0 is ok, others are virtual disks)
+		// diskIDs:{key:0  value:{page83:"Google  persistent-disk-0"  serial_number:"                    "}}
+		// diskIDs:{key:1  value:{page83:"4d53465420202020328d59b360875845ac645473be8267bf"}}
+		// diskIDs:{key:2  value:{page83:"4d534654202020208956a91dadfe3d48865f9b9bcbdb8d3e"}}
+		// diskIDs:{key:3  value:{page83:"4d534654202020207a3d18d72787ee47bdc127cb4f06403a"}}
 		t.Logf("diskIDsResponse=%v", diskIDsResponse)
 
 		cmd := "hostname"
@@ -41,33 +43,34 @@ func v1beta3DiskTests(t *testing.T) {
 		hostname = strings.TrimSpace(hostname)
 		diskIDsMap := diskIDsResponse.DiskIDs
 		if len(diskIDsMap) == 0 {
-			t.Errorf("Expected to get diskIDs, instead got diskIDsResponse.DiskIds=%+v", diskIDsMap)
+			t.Errorf("Expected to get at least one diskIDs, instead got diskIDsResponse.DiskIDs=%+v", diskIDsMap)
 		}
 
-		if diskIDsMap != nil {
-			diskIDs, found := diskIDsMap[uint32(diskNumber)]
-			if !found {
-				t.Errorf("Cannot find Disk %d", diskNumber)
-			}
-
-			page83 := diskIDs.Page83
-			if page83 == "" {
-				t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
-			}
-
-			serialNumber := diskIDs.SerialNumber
-			if serialNumber == "" {
-				t.Errorf("serialNumber field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
-			}
+		// first disk is the VM disk (other disk might be VHD)
+		diskNumber := 0
+		diskIDs, found := diskIDsMap[uint32(diskNumber)]
+		if !found {
+			t.Errorf("Cannot find Disk %d", diskNumber)
+		}
+		page83 := diskIDs.Page83
+		if page83 == "" {
+			t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+		}
+		serialNumber := diskIDs.SerialNumber
+		if serialNumber == "" {
+			t.Errorf("serialNumber field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+		}
 
-			// In GCE, the page83 ID of Disk 0 contains the hostname
-			if !strings.Contains(page83, hostname) {
-				t.Errorf("%s ID of Disk %d is incorrect. Expected to contain: %s. Received: %s", id, diskNumber, hostname, page83)
-			}
+		listDiskLocationsRequest := &v1beta3.ListDiskLocationsRequest{}
+		listDiskLocationsResponse, err := client.ListDiskLocations(context.TODO(), listDiskLocationsRequest)
+		require.Nil(t, err)
+		t.Logf("listDiskLocationsResponse=%v", listDiskLocationsResponse)
+		if len(listDiskLocationsResponse.DiskLocations) == 0 {
+			t.Errorf("Expected to get at least one diskLocation, instead got DiskLocations=%+v", listDiskLocationsResponse.DiskLocations)
 		}
 	})
 
-	t.Run("Get/SetAttachState", func(t *testing.T) {
+	t.Run("Get/SetDiskState", func(t *testing.T) {
 		skipTestOnCondition(t, isRunningOnGhActions())
 
 		client, err := diskv1beta3client.NewClient()
@@ -79,6 +82,21 @@ func v1beta3DiskTests(t *testing.T) {
 		vhd, vhdCleanup := diskInit(t)
 		defer vhdCleanup()
 
+		// disk stats
+		diskStatsRequest := &v1beta3.GetDiskStatsRequest{
+			DiskNumber: vhd.DiskNumber,
+		}
+		diskStatsResponse, err := client.GetDiskStats(context.TODO(), diskStatsRequest)
+		require.NoError(t, err)
+		if !sizeIsAround(t, diskStatsResponse.TotalBytes, vhd.InitialSize) {
+			t.Fatalf("DiskStats doesn't have the expected size, wanted (close to)=%d got=%d", vhd.InitialSize, diskStatsResponse.TotalBytes)
+		}
+
+		// Rescan
+		_, err = client.Rescan(context.TODO(), &v1beta3.RescanRequest{})
+		require.NoError(t, err)
+
+		// change disk state
 		out, err := runPowershellCmd(t, fmt.Sprintf("Get-Disk -Number %d | Set-Disk -IsOffline $true", vhd.DiskNumber))
 		require.NoError(t, err, "failed setting disk offline, out=%v", out)
 
@@ -118,4 +136,55 @@ func v1beta3DiskTests(t *testing.T) {
 		assert.NoError(t, err)
 		assert.True(t, result, "Expected disk to be offline")
 	})
+
+	t.Run("PartitionDisk", func(t *testing.T) {
+		skipTestOnCondition(t, isRunningOnGhActions())
+
+		var err error
+		client, err := diskv1beta3client.NewClient()
+		require.NoError(t, err)
+		defer client.Close()
+
+		// initialize disk but don't partition it using `diskInit`
+		s1 := rand.NewSource(time.Now().UTC().UnixNano())
+		r1 := rand.New(s1)
+
+		testPluginPath := fmt.Sprintf("C:\\var\\lib\\kubelet\\plugins\\testplugin-%d.csi.io\\", r1.Intn(100))
+		mountPath := fmt.Sprintf("%smount-%d", testPluginPath, r1.Intn(100))
+		vhdxPath := fmt.Sprintf("%sdisk-%d.vhdx", testPluginPath, r1.Intn(100))
+
+		var cmd, out string
+		const initialSize = 1 * 1024 * 1024 * 1024
+		const partitionStyle = "GPT"
+
+		cmd = fmt.Sprintf("mkdir %s", mountPath)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s", err, cmd, out)
+		}
+		cmd = fmt.Sprintf("New-VHD -Path %s -SizeBytes %d", vhdxPath, initialSize)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s.", err, cmd, out)
+		}
+		cmd = fmt.Sprintf("Mount-VHD -Path %s", vhdxPath)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s", err, cmd, out)
+		}
+
+		var diskNum uint64
+		var diskNumUnparsed string
+		cmd = fmt.Sprintf("(Get-VHD -Path %s).DiskNumber", vhdxPath)
+		if diskNumUnparsed, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %s", err, cmd)
+		}
+		if diskNum, err = strconv.ParseUint(strings.TrimRight(diskNumUnparsed, "\r\n"), 10, 32); err != nil {
+			t.Fatalf("Error: %v", err)
+		}
+
+		// make disk partition request
+		diskPartitionRequest := &v1beta3.PartitionDiskRequest{
+			DiskNumber: uint32(diskNum),
+		}
+		_, err = client.PartitionDisk(context.TODO(), diskPartitionRequest)
+		require.NoError(t, err)
+	})
 }

From 0a1e93b1621a2bbccd05ea0fc19f5a418bc6cff9 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 04:09:12 +0000
Subject: [PATCH 11/22] Parsing the disk location response as float64 first and
 cast to uint32

---
 internal/os/disk/api.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/os/disk/api.go b/internal/os/disk/api.go
index b02bcd1c..b53d6c7b 100644
--- a/internal/os/disk/api.go
+++ b/internal/os/disk/api.go
@@ -94,7 +94,7 @@ func (DiskAPI) ListDiskLocations() (map[uint32]shared.DiskLocation, error) {
 	m := make(map[uint32]shared.DiskLocation)
 	for _, v := range getDisk {
 		str := v["location"].(string)
-		num := v["number"].(uint32)
+		num := v["number"].(float64)
 
 		found := false
 		s := strings.Split(str, ":")
@@ -119,7 +119,7 @@ func (DiskAPI) ListDiskLocations() (map[uint32]shared.DiskLocation, error) {
 			}
 
 			if found {
-				m[num] = d
+				m[uint32(num)] = d
 			}
 		}
 	}

From 602ff80948008269723b8e12bbf3e179a48e4f2e Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 04:43:49 +0000
Subject: [PATCH 12/22] disk v1beta2 integration tests

---
 integrationtests/disk_test.go                 |   6 +-
 integrationtests/disk_v1beta2_test.go         | 188 ++++++++++++++++++
 integrationtests/disk_v1beta3_test.go         |   2 +-
 .../groups/disk/v1beta2/client_generated.go   |  94 +++++++++
 vendor/modules.txt                            |   1 +
 5 files changed, 287 insertions(+), 4 deletions(-)
 create mode 100644 integrationtests/disk_v1beta2_test.go
 create mode 100644 vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta2/client_generated.go

diff --git a/integrationtests/disk_test.go b/integrationtests/disk_test.go
index e2812806..2f349372 100644
--- a/integrationtests/disk_test.go
+++ b/integrationtests/disk_test.go
@@ -11,9 +11,9 @@ func TestDiskAPIGroup(t *testing.T) {
 	t.Run("v1beta3Tests", func(t *testing.T) {
 		v1beta3DiskTests(t)
 	})
-	// t.Run("v1beta2Tests", func(t *testing.T) {
-	// 	v1beta2DiskTests(t)
-	// })
+	t.Run("v1beta2Tests", func(t *testing.T) {
+		v1beta2DiskTests(t)
+	})
 	// t.Run("v1beta1Tests", func(t *testing.T) {
 	// 	v1beta1DiskTests(t)
 	// })
diff --git a/integrationtests/disk_v1beta2_test.go b/integrationtests/disk_v1beta2_test.go
new file mode 100644
index 00000000..d781064c
--- /dev/null
+++ b/integrationtests/disk_v1beta2_test.go
@@ -0,0 +1,188 @@
+package integrationtests
+
+import (
+	"context"
+	"fmt"
+	"math/rand"
+	"strconv"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
+	diskv1beta2client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta2"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func v1beta2DiskTests(t *testing.T) {
+	t.Run("ListDiskIDs,ListDiskLocations", func(t *testing.T) {
+		// NOTE: this test can run in Github Actions because it doesn't use VHDs
+
+		client, err := diskv1beta2client.NewClient()
+		require.Nil(t, err)
+		defer client.Close()
+
+		listRequest := &v1beta2.ListDiskIDsRequest{}
+		diskIDsResponse, err := client.ListDiskIDs(context.TODO(), listRequest)
+		require.Nil(t, err)
+
+		// example output for GCE (0 is ok, others are virtual disks)
+		// diskIDs:{key:0  value:{page83:"Google  persistent-disk-0"  serial_number:"                    "}}
+		// diskIDs:{key:1  value:{page83:"4d53465420202020328d59b360875845ac645473be8267bf"}}
+		// diskIDs:{key:2  value:{page83:"4d534654202020208956a91dadfe3d48865f9b9bcbdb8d3e"}}
+		// diskIDs:{key:3  value:{page83:"4d534654202020207a3d18d72787ee47bdc127cb4f06403a"}}
+		t.Logf("diskIDsResponse=%v", diskIDsResponse)
+
+		cmd := "hostname"
+		hostname, err := runPowershellCmd(t, cmd)
+		if err != nil {
+			t.Errorf("Error: %v. Command: %s. Out: %s", err, cmd, hostname)
+		}
+
+		hostname = strings.TrimSpace(hostname)
+		diskIDsMap := diskIDsResponse.DiskIDs
+		if len(diskIDsMap) == 0 {
+			t.Errorf("Expected to get at least one diskIDs, instead got diskIDsResponse.DiskIDs=%+v", diskIDsMap)
+		}
+
+		// first disk is the VM disk (other disks might be VHD)
+		diskNumber := 0
+		diskIDs, found := diskIDsMap[strconv.FormatUint(uint64(diskNumber), 10)]
+		if !found {
+			t.Errorf("Cannot find Disk %d", diskNumber)
+		}
+		page83 := diskIDs.Identifiers["page83"]
+		if page83 == "" {
+			t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+		}
+		serialNumber := diskIDs.Identifiers["serialNumber"]
+		if serialNumber == "" {
+			t.Errorf("serialNumber field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+		}
+
+		listDiskLocationsRequest := &v1beta2.ListDiskLocationsRequest{}
+		listDiskLocationsResponse, err := client.ListDiskLocations(context.TODO(), listDiskLocationsRequest)
+		require.Nil(t, err)
+		t.Logf("listDiskLocationsResponse=%v", listDiskLocationsResponse)
+		if len(listDiskLocationsResponse.DiskLocations) == 0 {
+			t.Errorf("Expected to get at least one diskLocation, instead got DiskLocations=%+v", listDiskLocationsResponse.DiskLocations)
+		}
+	})
+
+	t.Run("Get/SetDiskState", func(t *testing.T) {
+		skipTestOnCondition(t, isRunningOnGhActions())
+
+		client, err := diskv1beta2client.NewClient()
+		require.NoError(t, err)
+
+		defer client.Close()
+
+		// initialize disk
+		vhd, vhdCleanup := diskInit(t)
+		defer vhdCleanup()
+
+		diskID := strconv.FormatUint(uint64(vhd.DiskNumber), 10)
+
+		// disk stats
+		diskStatsRequest := &v1beta2.DiskStatsRequest{
+			DiskID: diskID,
+		}
+		diskStatsResponse, err := client.DiskStats(context.TODO(), diskStatsRequest)
+		require.NoError(t, err)
+		if !sizeIsAround(t, diskStatsResponse.DiskSize, vhd.InitialSize) {
+			t.Fatalf("DiskStats doesn't have the expected size, wanted (close to)=%d got=%d", vhd.InitialSize, diskStatsResponse.DiskSize)
+		}
+
+		// Rescan
+		_, err = client.Rescan(context.TODO(), &v1beta2.RescanRequest{})
+		require.NoError(t, err)
+
+		// change disk state
+		out, err := runPowershellCmd(t, fmt.Sprintf("Get-Disk -Number %d | Set-Disk -IsOffline $true", vhd.DiskNumber))
+		require.NoError(t, err, "failed setting disk offline, out=%v", out)
+
+		getReq := &v1beta2.GetAttachStateRequest{DiskID: diskID}
+		getResp, err := client.GetAttachState(context.TODO(), getReq)
+
+		if assert.NoError(t, err) {
+			assert.False(t, getResp.IsOnline, "Expected disk to be offline")
+		}
+
+		setReq := &v1beta2.SetAttachStateRequest{DiskID: diskID, IsOnline: true}
+		_, err = client.SetAttachState(context.TODO(), setReq)
+		assert.NoError(t, err)
+
+		out, err = runPowershellCmd(t, fmt.Sprintf("Get-Disk -Number %d | Select-Object -ExpandProperty IsOffline", vhd.DiskNumber))
+		assert.NoError(t, err)
+
+		result, err := strconv.ParseBool(strings.TrimSpace(out))
+		assert.NoError(t, err)
+		assert.False(t, result, "Expected disk to be online")
+
+		getReq = &v1beta2.GetAttachStateRequest{DiskID: diskID}
+		getResp, err = client.GetAttachState(context.TODO(), getReq)
+
+		if assert.NoError(t, err) {
+			assert.True(t, getResp.IsOnline, "Expected disk is online")
+		}
+
+		setReq = &v1beta2.SetAttachStateRequest{DiskID: diskID, IsOnline: false}
+		_, err = client.SetAttachState(context.TODO(), setReq)
+		assert.NoError(t, err)
+
+		out, err = runPowershellCmd(t, fmt.Sprintf("Get-Disk -Number %d | Select-Object -ExpandProperty IsOffline", vhd.DiskNumber))
+		assert.NoError(t, err)
+
+		result, err = strconv.ParseBool(strings.TrimSpace(out))
+		assert.NoError(t, err)
+		assert.True(t, result, "Expected disk to be offline")
+	})
+
+	t.Run("PartitionDisk", func(t *testing.T) {
+		skipTestOnCondition(t, isRunningOnGhActions())
+
+		var err error
+		client, err := diskv1beta2client.NewClient()
+		require.NoError(t, err)
+		defer client.Close()
+
+		// initialize disk but don't partition it using `diskInit`
+		s1 := rand.NewSource(time.Now().UTC().UnixNano())
+		r1 := rand.New(s1)
+
+		testPluginPath := fmt.Sprintf("C:\\var\\lib\\kubelet\\plugins\\testplugin-%d.csi.io\\", r1.Intn(100))
+		mountPath := fmt.Sprintf("%smount-%d", testPluginPath, r1.Intn(100))
+		vhdxPath := fmt.Sprintf("%sdisk-%d.vhdx", testPluginPath, r1.Intn(100))
+
+		var cmd, out string
+		const initialSize = 1 * 1024 * 1024 * 1024
+		const partitionStyle = "GPT"
+
+		cmd = fmt.Sprintf("mkdir %s", mountPath)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s", err, cmd, out)
+		}
+		cmd = fmt.Sprintf("New-VHD -Path %s -SizeBytes %d", vhdxPath, initialSize)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s.", err, cmd, out)
+		}
+		cmd = fmt.Sprintf("Mount-VHD -Path %s", vhdxPath)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s", err, cmd, out)
+		}
+
+		var diskNumUnparsed string
+		cmd = fmt.Sprintf("(Get-VHD -Path %s).DiskNumber", vhdxPath)
+		if diskNumUnparsed, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %s", err, cmd)
+		}
+
+		// make disk partition request
+		diskPartitionRequest := &v1beta2.PartitionDiskRequest{
+			DiskID: diskNumUnparsed,
+		}
+		_, err = client.PartitionDisk(context.TODO(), diskPartitionRequest)
+		require.NoError(t, err)
+	})
+}
diff --git a/integrationtests/disk_v1beta3_test.go b/integrationtests/disk_v1beta3_test.go
index 059a886e..aef3ca63 100644
--- a/integrationtests/disk_v1beta3_test.go
+++ b/integrationtests/disk_v1beta3_test.go
@@ -46,7 +46,7 @@ func v1beta3DiskTests(t *testing.T) {
 			t.Errorf("Expected to get at least one diskIDs, instead got diskIDsResponse.DiskIDs=%+v", diskIDsMap)
 		}
 
-		// first disk is the VM disk (other disk might be VHD)
+		// first disk is the VM disk (other disks might be VHD)
 		diskNumber := 0
 		diskIDs, found := diskIDsMap[uint32(diskNumber)]
 		if !found {
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta2/client_generated.go b/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta2/client_generated.go
new file mode 100644
index 00000000..95866cde
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta2/client_generated.go
@@ -0,0 +1,94 @@
+// Code generated by csi-proxy-api-gen. DO NOT EDIT.
+
+package v1beta2
+
+import (
+	"context"
+	"net"
+
+	"github.com/Microsoft/go-winio"
+	"github.com/kubernetes-csi/csi-proxy/client"
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
+	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
+	"google.golang.org/grpc"
+)
+
+// GroupName is the group name of this API.
+const GroupName = "disk"
+
+// Version is the api version.
+var Version = apiversion.NewVersionOrPanic("v1beta2")
+
+type Client struct {
+	client     v1beta2.DiskClient
+	connection *grpc.ClientConn
+}
+
+// NewClient returns a client to make calls to the disk API group version v1beta2.
+// It's the caller's responsibility to Close the client when done.
+func NewClient() (*Client, error) {
+	pipePath := client.PipePath(GroupName, Version)
+	return NewClientWithPipePath(pipePath)
+}
+
+// NewClientWithPipePath returns a client to make calls to the named pipe located at "pipePath".
+// It's the caller's responsibility to Close the client when done.
+func NewClientWithPipePath(pipePath string) (*Client, error) {
+
+	// verify that the pipe exists
+	_, err := winio.DialPipe(pipePath, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	connection, err := grpc.Dial(pipePath,
+		grpc.WithContextDialer(func(context context.Context, s string) (net.Conn, error) {
+			return winio.DialPipeContext(context, s)
+		}),
+		grpc.WithInsecure())
+	if err != nil {
+		return nil, err
+	}
+
+	client := v1beta2.NewDiskClient(connection)
+	return &Client{
+		client:     client,
+		connection: connection,
+	}, nil
+}
+
+// Close closes the client. It must be called before the client gets GC-ed.
+func (w *Client) Close() error {
+	return w.connection.Close()
+}
+
+// ensures we implement all the required methods
+var _ v1beta2.DiskClient = &Client{}
+
+func (w *Client) DiskStats(context context.Context, request *v1beta2.DiskStatsRequest, opts ...grpc.CallOption) (*v1beta2.DiskStatsResponse, error) {
+	return w.client.DiskStats(context, request, opts...)
+}
+
+func (w *Client) GetAttachState(context context.Context, request *v1beta2.GetAttachStateRequest, opts ...grpc.CallOption) (*v1beta2.GetAttachStateResponse, error) {
+	return w.client.GetAttachState(context, request, opts...)
+}
+
+func (w *Client) ListDiskIDs(context context.Context, request *v1beta2.ListDiskIDsRequest, opts ...grpc.CallOption) (*v1beta2.ListDiskIDsResponse, error) {
+	return w.client.ListDiskIDs(context, request, opts...)
+}
+
+func (w *Client) ListDiskLocations(context context.Context, request *v1beta2.ListDiskLocationsRequest, opts ...grpc.CallOption) (*v1beta2.ListDiskLocationsResponse, error) {
+	return w.client.ListDiskLocations(context, request, opts...)
+}
+
+func (w *Client) PartitionDisk(context context.Context, request *v1beta2.PartitionDiskRequest, opts ...grpc.CallOption) (*v1beta2.PartitionDiskResponse, error) {
+	return w.client.PartitionDisk(context, request, opts...)
+}
+
+func (w *Client) Rescan(context context.Context, request *v1beta2.RescanRequest, opts ...grpc.CallOption) (*v1beta2.RescanResponse, error) {
+	return w.client.Rescan(context, request, opts...)
+}
+
+func (w *Client) SetAttachState(context context.Context, request *v1beta2.SetAttachStateRequest, opts ...grpc.CallOption) (*v1beta2.SetAttachStateResponse, error) {
+	return w.client.SetAttachState(context, request, opts...)
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index ee68dcea..c3307740 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -44,6 +44,7 @@ github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1
 github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta2
 github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3
 github.com/kubernetes-csi/csi-proxy/client/apiversion
+github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta2
 github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3
 github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta2
 github.com/kubernetes-csi/csi-proxy/client/groups/iscsi/v1alpha2

From aec71518a287178a65e722aec3b634e3155a653b Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 04:49:46 +0000
Subject: [PATCH 13/22] nil map assignment fixed in conversion function for
 disk api v1beta{1,2}

---
 internal/server/disk/internal/v1beta1/conversion.go | 1 +
 internal/server/disk/internal/v1beta2/conversion.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/internal/server/disk/internal/v1beta1/conversion.go b/internal/server/disk/internal/v1beta1/conversion.go
index c4299ba6..7f60934b 100644
--- a/internal/server/disk/internal/v1beta1/conversion.go
+++ b/internal/server/disk/internal/v1beta1/conversion.go
@@ -46,6 +46,7 @@ func Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *int
 			newVal := new(v1beta1.DiskIDs)
 
 			// copy internal.DiskIDs struct to a map by known keys (page83 and serialNumber)
+			newVal.Identifiers = make(map[string]string)
 			newVal.Identifiers["page83"] = val.Page83
 			newVal.Identifiers["serialNumber"] = val.SerialNumber
 			(*out)[strconv.FormatUint(uint64(key), 10)] = newVal
diff --git a/internal/server/disk/internal/v1beta2/conversion.go b/internal/server/disk/internal/v1beta2/conversion.go
index 05983e4b..474e7b63 100644
--- a/internal/server/disk/internal/v1beta2/conversion.go
+++ b/internal/server/disk/internal/v1beta2/conversion.go
@@ -46,6 +46,7 @@ func Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *int
 			newVal := new(v1beta2.DiskIDs)
 
 			// copy internal.DiskIDs struct to a map by known keys (page83 and serialNumber)
+			newVal.Identifiers = make(map[string]string)
 			newVal.Identifiers["page83"] = val.Page83
 			newVal.Identifiers["serialNumber"] = val.SerialNumber
 			(*out)[strconv.FormatUint(uint64(key), 10)] = newVal

From 13236bb2725724e6fc41c55a8c37d8f7217af30b Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 05:02:45 +0000
Subject: [PATCH 14/22] add v1beta1 disk integration test

---
 integrationtests/disk_v1beta1_test.go         | 149 ++++++++++++++++++
 integrationtests/disk_v1beta2_test.go         |   6 +-
 integrationtests/disk_v1beta3_test.go         |   4 +-
 .../groups/disk/v1beta1/client_generated.go   |  86 ++++++++++
 vendor/modules.txt                            |   1 +
 5 files changed, 243 insertions(+), 3 deletions(-)
 create mode 100644 integrationtests/disk_v1beta1_test.go
 create mode 100644 vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1/client_generated.go

diff --git a/integrationtests/disk_v1beta1_test.go b/integrationtests/disk_v1beta1_test.go
new file mode 100644
index 00000000..b19451f1
--- /dev/null
+++ b/integrationtests/disk_v1beta1_test.go
@@ -0,0 +1,149 @@
+package integrationtests
+
+import (
+	"context"
+	"fmt"
+	"math/rand"
+	"strconv"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
+	diskv1beta1client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1"
+	"github.com/stretchr/testify/require"
+)
+
+func v1beta1DiskTests(t *testing.T) {
+	t.Run("ListDiskIDs,ListDiskLocations", func(t *testing.T) {
+		// even though this test doesn't need the VHD API it failed in Github Actions
+		// see https://github.com/kubernetes-csi/csi-proxy/pull/140/checks?check_run_id=2671787129
+		skipTestOnCondition(t, isRunningOnGhActions())
+
+		client, err := diskv1beta1client.NewClient()
+		require.Nil(t, err)
+		defer client.Close()
+
+		listRequest := &v1beta1.ListDiskIDsRequest{}
+		diskIDsResponse, err := client.ListDiskIDs(context.TODO(), listRequest)
+		require.Nil(t, err)
+
+		// example output for GCE (0 is ok, others are virtual disks)
+		// diskIDs:{key:0  value:{page83:"Google  persistent-disk-0"  serial_number:"                    "}}
+		// diskIDs:{key:1  value:{page83:"4d53465420202020328d59b360875845ac645473be8267bf"}}
+		// diskIDs:{key:2  value:{page83:"4d534654202020208956a91dadfe3d48865f9b9bcbdb8d3e"}}
+		// diskIDs:{key:3  value:{page83:"4d534654202020207a3d18d72787ee47bdc127cb4f06403a"}}
+		t.Logf("diskIDsResponse=%v", diskIDsResponse)
+
+		cmd := "hostname"
+		hostname, err := runPowershellCmd(t, cmd)
+		if err != nil {
+			t.Errorf("Error: %v. Command: %s. Out: %s", err, cmd, hostname)
+		}
+
+		hostname = strings.TrimSpace(hostname)
+		diskIDsMap := diskIDsResponse.DiskIDs
+		if len(diskIDsMap) == 0 {
+			t.Errorf("Expected to get at least one diskIDs, instead got diskIDsResponse.DiskIDs=%+v", diskIDsMap)
+		}
+
+		// first disk is the VM disk (other disks might be VHD)
+		diskNumber := 0
+		diskIDs, found := diskIDsMap[strconv.FormatUint(uint64(diskNumber), 10)]
+		if !found {
+			t.Errorf("Cannot find Disk %d", diskNumber)
+		}
+		page83 := diskIDs.Identifiers["page83"]
+		if page83 == "" {
+			t.Errorf("page83 field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+		}
+		serialNumber := diskIDs.Identifiers["serialNumber"]
+		if serialNumber == "" {
+			t.Errorf("serialNumber field of diskNumber=%d should be defined, instead got diskIDs=%v", diskNumber, diskIDs)
+		}
+
+		listDiskLocationsRequest := &v1beta1.ListDiskLocationsRequest{}
+		listDiskLocationsResponse, err := client.ListDiskLocations(context.TODO(), listDiskLocationsRequest)
+		require.Nil(t, err)
+		t.Logf("listDiskLocationsResponse=%v", listDiskLocationsResponse)
+		if len(listDiskLocationsResponse.DiskLocations) == 0 {
+			t.Errorf("Expected to get at least one diskLocation, instead got DiskLocations=%+v", listDiskLocationsResponse.DiskLocations)
+		}
+	})
+
+	t.Run("Get/SetDiskState", func(t *testing.T) {
+		skipTestOnCondition(t, isRunningOnGhActions())
+
+		client, err := diskv1beta1client.NewClient()
+		require.NoError(t, err)
+
+		defer client.Close()
+
+		// initialize disk
+		vhd, vhdCleanup := diskInit(t)
+		defer vhdCleanup()
+
+		diskID := strconv.FormatUint(uint64(vhd.DiskNumber), 10)
+
+		// disk stats
+		diskStatsRequest := &v1beta1.DiskStatsRequest{
+			DiskID: diskID,
+		}
+		diskStatsResponse, err := client.DiskStats(context.TODO(), diskStatsRequest)
+		require.NoError(t, err)
+		if !sizeIsAround(t, diskStatsResponse.DiskSize, vhd.InitialSize) {
+			t.Fatalf("DiskStats doesn't have the expected size, wanted (close to)=%d got=%d", vhd.InitialSize, diskStatsResponse.DiskSize)
+		}
+
+		// Rescan
+		_, err = client.Rescan(context.TODO(), &v1beta1.RescanRequest{})
+		require.NoError(t, err)
+	})
+
+	t.Run("PartitionDisk", func(t *testing.T) {
+		skipTestOnCondition(t, isRunningOnGhActions())
+
+		var err error
+		client, err := diskv1beta1client.NewClient()
+		require.NoError(t, err)
+		defer client.Close()
+
+		// initialize disk but don't partition it using `diskInit`
+		s1 := rand.NewSource(time.Now().UTC().UnixNano())
+		r1 := rand.New(s1)
+
+		testPluginPath := fmt.Sprintf("C:\\var\\lib\\kubelet\\plugins\\testplugin-%d.csi.io\\", r1.Intn(100))
+		mountPath := fmt.Sprintf("%smount-%d", testPluginPath, r1.Intn(100))
+		vhdxPath := fmt.Sprintf("%sdisk-%d.vhdx", testPluginPath, r1.Intn(100))
+
+		var cmd, out string
+		const initialSize = 1 * 1024 * 1024 * 1024
+		const partitionStyle = "GPT"
+
+		cmd = fmt.Sprintf("mkdir %s", mountPath)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s", err, cmd, out)
+		}
+		cmd = fmt.Sprintf("New-VHD -Path %s -SizeBytes %d", vhdxPath, initialSize)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s.", err, cmd, out)
+		}
+		cmd = fmt.Sprintf("Mount-VHD -Path %s", vhdxPath)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s", err, cmd, out)
+		}
+
+		var diskNumUnparsed string
+		cmd = fmt.Sprintf("(Get-VHD -Path %s).DiskNumber", vhdxPath)
+		if diskNumUnparsed, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %s", err, cmd)
+		}
+
+		// make disk partition request
+		diskPartitionRequest := &v1beta1.PartitionDiskRequest{
+			DiskID: strings.TrimSpace(diskNumUnparsed),
+		}
+		_, err = client.PartitionDisk(context.TODO(), diskPartitionRequest)
+		require.NoError(t, err)
+	})
+}
diff --git a/integrationtests/disk_v1beta2_test.go b/integrationtests/disk_v1beta2_test.go
index d781064c..d36beae8 100644
--- a/integrationtests/disk_v1beta2_test.go
+++ b/integrationtests/disk_v1beta2_test.go
@@ -17,7 +17,9 @@ import (
 
 func v1beta2DiskTests(t *testing.T) {
 	t.Run("ListDiskIDs,ListDiskLocations", func(t *testing.T) {
-		// NOTE: this test can run in Github Actions because it doesn't use VHDs
+		// even though this test doesn't need the VHD API it failed in Github Actions
+		// see https://github.com/kubernetes-csi/csi-proxy/pull/140/checks?check_run_id=2671787129
+		skipTestOnCondition(t, isRunningOnGhActions())
 
 		client, err := diskv1beta2client.NewClient()
 		require.Nil(t, err)
@@ -180,7 +182,7 @@ func v1beta2DiskTests(t *testing.T) {
 
 		// make disk partition request
 		diskPartitionRequest := &v1beta2.PartitionDiskRequest{
-			DiskID: diskNumUnparsed,
+			DiskID: strings.TrimSpace(diskNumUnparsed),
 		}
 		_, err = client.PartitionDisk(context.TODO(), diskPartitionRequest)
 		require.NoError(t, err)
diff --git a/integrationtests/disk_v1beta3_test.go b/integrationtests/disk_v1beta3_test.go
index aef3ca63..23d44b1e 100644
--- a/integrationtests/disk_v1beta3_test.go
+++ b/integrationtests/disk_v1beta3_test.go
@@ -17,7 +17,9 @@ import (
 
 func v1beta3DiskTests(t *testing.T) {
 	t.Run("ListDiskIDs,ListDiskLocations", func(t *testing.T) {
-		// NOTE: this test can run in Github Actions because it doesn't use VHDs
+		// even though this test doesn't need the VHD API it failed in Github Actions
+		// see https://github.com/kubernetes-csi/csi-proxy/pull/140/checks?check_run_id=2671787129
+		skipTestOnCondition(t, isRunningOnGhActions())
 
 		client, err := diskv1beta3client.NewClient()
 		require.Nil(t, err)
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1/client_generated.go b/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1/client_generated.go
new file mode 100644
index 00000000..a3179948
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1/client_generated.go
@@ -0,0 +1,86 @@
+// Code generated by csi-proxy-api-gen. DO NOT EDIT.
+
+package v1beta1
+
+import (
+	"context"
+	"net"
+
+	"github.com/Microsoft/go-winio"
+	"github.com/kubernetes-csi/csi-proxy/client"
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
+	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
+	"google.golang.org/grpc"
+)
+
+// GroupName is the group name of this API.
+const GroupName = "disk"
+
+// Version is the api version.
+var Version = apiversion.NewVersionOrPanic("v1beta1")
+
+type Client struct {
+	client     v1beta1.DiskClient
+	connection *grpc.ClientConn
+}
+
+// NewClient returns a client to make calls to the disk API group version v1beta1.
+// It's the caller's responsibility to Close the client when done.
+func NewClient() (*Client, error) {
+	pipePath := client.PipePath(GroupName, Version)
+	return NewClientWithPipePath(pipePath)
+}
+
+// NewClientWithPipePath returns a client to make calls to the named pipe located at "pipePath".
+// It's the caller's responsibility to Close the client when done.
+func NewClientWithPipePath(pipePath string) (*Client, error) {
+
+	// verify that the pipe exists
+	_, err := winio.DialPipe(pipePath, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	connection, err := grpc.Dial(pipePath,
+		grpc.WithContextDialer(func(context context.Context, s string) (net.Conn, error) {
+			return winio.DialPipeContext(context, s)
+		}),
+		grpc.WithInsecure())
+	if err != nil {
+		return nil, err
+	}
+
+	client := v1beta1.NewDiskClient(connection)
+	return &Client{
+		client:     client,
+		connection: connection,
+	}, nil
+}
+
+// Close closes the client. It must be called before the client gets GC-ed.
+func (w *Client) Close() error {
+	return w.connection.Close()
+}
+
+// ensures we implement all the required methods
+var _ v1beta1.DiskClient = &Client{}
+
+func (w *Client) DiskStats(context context.Context, request *v1beta1.DiskStatsRequest, opts ...grpc.CallOption) (*v1beta1.DiskStatsResponse, error) {
+	return w.client.DiskStats(context, request, opts...)
+}
+
+func (w *Client) ListDiskIDs(context context.Context, request *v1beta1.ListDiskIDsRequest, opts ...grpc.CallOption) (*v1beta1.ListDiskIDsResponse, error) {
+	return w.client.ListDiskIDs(context, request, opts...)
+}
+
+func (w *Client) ListDiskLocations(context context.Context, request *v1beta1.ListDiskLocationsRequest, opts ...grpc.CallOption) (*v1beta1.ListDiskLocationsResponse, error) {
+	return w.client.ListDiskLocations(context, request, opts...)
+}
+
+func (w *Client) PartitionDisk(context context.Context, request *v1beta1.PartitionDiskRequest, opts ...grpc.CallOption) (*v1beta1.PartitionDiskResponse, error) {
+	return w.client.PartitionDisk(context, request, opts...)
+}
+
+func (w *Client) Rescan(context context.Context, request *v1beta1.RescanRequest, opts ...grpc.CallOption) (*v1beta1.RescanResponse, error) {
+	return w.client.Rescan(context, request, opts...)
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index c3307740..81819625 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -44,6 +44,7 @@ github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1
 github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta2
 github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3
 github.com/kubernetes-csi/csi-proxy/client/apiversion
+github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1
 github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta2
 github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3
 github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta2

From 2f77efa8b2ff9aa6d5ef8aee79bfdf8e5c0bd08e Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 05:08:19 +0000
Subject: [PATCH 15/22] add v1alpha1 disk integration tests

---
 integrationtests/disk_test.go                 | 12 +--
 integrationtests/disk_v1alpha1_test.go        | 94 +++++++++++++++++++
 .../groups/disk/v1alpha1/client_generated.go  | 82 ++++++++++++++++
 vendor/modules.txt                            |  1 +
 4 files changed, 183 insertions(+), 6 deletions(-)
 create mode 100644 integrationtests/disk_v1alpha1_test.go
 create mode 100644 vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1alpha1/client_generated.go

diff --git a/integrationtests/disk_test.go b/integrationtests/disk_test.go
index 2f349372..628e2f0e 100644
--- a/integrationtests/disk_test.go
+++ b/integrationtests/disk_test.go
@@ -14,10 +14,10 @@ func TestDiskAPIGroup(t *testing.T) {
 	t.Run("v1beta2Tests", func(t *testing.T) {
 		v1beta2DiskTests(t)
 	})
-	// t.Run("v1beta1Tests", func(t *testing.T) {
-	// 	v1beta1DiskTests(t)
-	// })
-	// t.Run("v1alpha1Tests", func(t *testing.T) {
-	// 	v1alpha1DiskTests(t)
-	// })
+	t.Run("v1beta1Tests", func(t *testing.T) {
+		v1beta1DiskTests(t)
+	})
+	t.Run("v1alpha1Tests", func(t *testing.T) {
+		v1alpha1DiskTests(t)
+	})
 }
diff --git a/integrationtests/disk_v1alpha1_test.go b/integrationtests/disk_v1alpha1_test.go
new file mode 100644
index 00000000..cad0ad48
--- /dev/null
+++ b/integrationtests/disk_v1alpha1_test.go
@@ -0,0 +1,94 @@
+package integrationtests
+
+import (
+	"context"
+	"fmt"
+	"math/rand"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
+	diskv1alpha1client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1alpha1"
+	"github.com/stretchr/testify/require"
+)
+
+func v1alpha1DiskTests(t *testing.T) {
+	t.Run("ListDiskIDs,ListDiskLocations", func(t *testing.T) {
+		// even though this test doesn't need the VHD API it failed in Github Actions
+		// see https://github.com/kubernetes-csi/csi-proxy/pull/140/checks?check_run_id=2671787129
+		skipTestOnCondition(t, isRunningOnGhActions())
+
+		client, err := diskv1alpha1client.NewClient()
+		require.Nil(t, err)
+		defer client.Close()
+
+		listDiskLocationsRequest := &v1alpha1.ListDiskLocationsRequest{}
+		listDiskLocationsResponse, err := client.ListDiskLocations(context.TODO(), listDiskLocationsRequest)
+		require.Nil(t, err)
+		t.Logf("listDiskLocationsResponse=%v", listDiskLocationsResponse)
+		if len(listDiskLocationsResponse.DiskLocations) == 0 {
+			t.Errorf("Expected to get at least one diskLocation, instead got DiskLocations=%+v", listDiskLocationsResponse.DiskLocations)
+		}
+	})
+
+	t.Run("Rescan", func(t *testing.T) {
+		skipTestOnCondition(t, isRunningOnGhActions())
+
+		client, err := diskv1alpha1client.NewClient()
+		require.NoError(t, err)
+
+		defer client.Close()
+
+		// Rescan
+		_, err = client.Rescan(context.TODO(), &v1alpha1.RescanRequest{})
+		require.NoError(t, err)
+	})
+
+	t.Run("PartitionDisk", func(t *testing.T) {
+		skipTestOnCondition(t, isRunningOnGhActions())
+
+		var err error
+		client, err := diskv1alpha1client.NewClient()
+		require.NoError(t, err)
+		defer client.Close()
+
+		// initialize disk but don't partition it using `diskInit`
+		s1 := rand.NewSource(time.Now().UTC().UnixNano())
+		r1 := rand.New(s1)
+
+		testPluginPath := fmt.Sprintf("C:\\var\\lib\\kubelet\\plugins\\testplugin-%d.csi.io\\", r1.Intn(100))
+		mountPath := fmt.Sprintf("%smount-%d", testPluginPath, r1.Intn(100))
+		vhdxPath := fmt.Sprintf("%sdisk-%d.vhdx", testPluginPath, r1.Intn(100))
+
+		var cmd, out string
+		const initialSize = 1 * 1024 * 1024 * 1024
+		const partitionStyle = "GPT"
+
+		cmd = fmt.Sprintf("mkdir %s", mountPath)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s", err, cmd, out)
+		}
+		cmd = fmt.Sprintf("New-VHD -Path %s -SizeBytes %d", vhdxPath, initialSize)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s.", err, cmd, out)
+		}
+		cmd = fmt.Sprintf("Mount-VHD -Path %s", vhdxPath)
+		if out, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %q. Out: %s", err, cmd, out)
+		}
+
+		var diskNumUnparsed string
+		cmd = fmt.Sprintf("(Get-VHD -Path %s).DiskNumber", vhdxPath)
+		if diskNumUnparsed, err = runPowershellCmd(t, cmd); err != nil {
+			t.Fatalf("Error: %v. Command: %s", err, cmd)
+		}
+
+		// make disk partition request
+		diskPartitionRequest := &v1alpha1.PartitionDiskRequest{
+			DiskID: strings.TrimSpace(diskNumUnparsed),
+		}
+		_, err = client.PartitionDisk(context.TODO(), diskPartitionRequest)
+		require.NoError(t, err)
+	})
+}
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1alpha1/client_generated.go b/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1alpha1/client_generated.go
new file mode 100644
index 00000000..c05d16de
--- /dev/null
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1alpha1/client_generated.go
@@ -0,0 +1,82 @@
+// Code generated by csi-proxy-api-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	"context"
+	"net"
+
+	"github.com/Microsoft/go-winio"
+	"github.com/kubernetes-csi/csi-proxy/client"
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
+	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
+	"google.golang.org/grpc"
+)
+
+// GroupName is the group name of this API.
+const GroupName = "disk"
+
+// Version is the api version.
+var Version = apiversion.NewVersionOrPanic("v1alpha1")
+
+type Client struct {
+	client     v1alpha1.DiskClient
+	connection *grpc.ClientConn
+}
+
+// NewClient returns a client to make calls to the disk API group version v1alpha1.
+// It's the caller's responsibility to Close the client when done.
+func NewClient() (*Client, error) {
+	pipePath := client.PipePath(GroupName, Version)
+	return NewClientWithPipePath(pipePath)
+}
+
+// NewClientWithPipePath returns a client to make calls to the named pipe located at "pipePath".
+// It's the caller's responsibility to Close the client when done.
+func NewClientWithPipePath(pipePath string) (*Client, error) {
+
+	// verify that the pipe exists
+	_, err := winio.DialPipe(pipePath, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	connection, err := grpc.Dial(pipePath,
+		grpc.WithContextDialer(func(context context.Context, s string) (net.Conn, error) {
+			return winio.DialPipeContext(context, s)
+		}),
+		grpc.WithInsecure())
+	if err != nil {
+		return nil, err
+	}
+
+	client := v1alpha1.NewDiskClient(connection)
+	return &Client{
+		client:     client,
+		connection: connection,
+	}, nil
+}
+
+// Close closes the client. It must be called before the client gets GC-ed.
+func (w *Client) Close() error {
+	return w.connection.Close()
+}
+
+// ensures we implement all the required methods
+var _ v1alpha1.DiskClient = &Client{}
+
+func (w *Client) GetDiskNumberByName(context context.Context, request *v1alpha1.GetDiskNumberByNameRequest, opts ...grpc.CallOption) (*v1alpha1.GetDiskNumberByNameResponse, error) {
+	return w.client.GetDiskNumberByName(context, request, opts...)
+}
+
+func (w *Client) ListDiskLocations(context context.Context, request *v1alpha1.ListDiskLocationsRequest, opts ...grpc.CallOption) (*v1alpha1.ListDiskLocationsResponse, error) {
+	return w.client.ListDiskLocations(context, request, opts...)
+}
+
+func (w *Client) PartitionDisk(context context.Context, request *v1alpha1.PartitionDiskRequest, opts ...grpc.CallOption) (*v1alpha1.PartitionDiskResponse, error) {
+	return w.client.PartitionDisk(context, request, opts...)
+}
+
+func (w *Client) Rescan(context context.Context, request *v1alpha1.RescanRequest, opts ...grpc.CallOption) (*v1alpha1.RescanResponse, error) {
+	return w.client.Rescan(context, request, opts...)
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 81819625..e3893d0a 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -44,6 +44,7 @@ github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1
 github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta2
 github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3
 github.com/kubernetes-csi/csi-proxy/client/apiversion
+github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1alpha1
 github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1
 github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta2
 github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3

From 090db5bb323e6ae251d7b0e0707550aa2ec4ce86 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Wed, 26 May 2021 05:21:59 +0000
Subject: [PATCH 16/22] update go.sum

---
 go.sum | 2 --
 1 file changed, 2 deletions(-)

diff --git a/go.sum b/go.sum
index 3feea8db..f9a1627d 100644
--- a/go.sum
+++ b/go.sum
@@ -50,8 +50,6 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/wk8/gengo v0.0.0-20191007012548-3d2530bfe606 h1:i5JAp+X9ISMaGt0R/9nsiFuNyYN0hXSK9KtphOk/r94=
-github.com/wk8/gengo v0.0.0-20191007012548-3d2530bfe606/go.mod h1:7+jn4yanRF/Ylvd5qyNPUq0VhvOMDhjXrViFtHMcHxI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

From 2af3193e726fc671e207ec20e086bc2f1c057969 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Tue, 1 Jun 2021 18:01:59 +0000
Subject: [PATCH 17/22] update GetDiskStats comment, trigger failure of v1beta3
 integration test

---
 client/api/disk/v1beta3/api.pb.go                             | 4 ++--
 client/api/disk/v1beta3/api.proto                             | 2 +-
 integrationtests/disk_v1beta3_test.go                         | 2 +-
 .../csi-proxy/client/api/disk/v1beta3/api.pb.go               | 4 ++--
 .../csi-proxy/client/api/disk/v1beta3/api.proto               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/api/disk/v1beta3/api.pb.go b/client/api/disk/v1beta3/api.pb.go
index 423e9dd1..e20b831e 100644
--- a/client/api/disk/v1beta3/api.pb.go
+++ b/client/api/disk/v1beta3/api.pb.go
@@ -1189,7 +1189,7 @@ type DiskClient interface {
 	Rescan(ctx context.Context, in *RescanRequest, opts ...grpc.CallOption) (*RescanResponse, error)
 	// ListDiskIDs returns a map of DiskID objects where the key is the disk number.
 	ListDiskIDs(ctx context.Context, in *ListDiskIDsRequest, opts ...grpc.CallOption) (*ListDiskIDsResponse, error)
-	// GetDiskStats returns the stats of a disk.
+	// GetDiskStats returns the stats of a disk (currently it returns the disk size).
 	GetDiskStats(ctx context.Context, in *GetDiskStatsRequest, opts ...grpc.CallOption) (*GetDiskStatsResponse, error)
 	// SetDiskState sets the offline/online state of a disk.
 	SetDiskState(ctx context.Context, in *SetDiskStateRequest, opts ...grpc.CallOption) (*SetDiskStateResponse, error)
@@ -1280,7 +1280,7 @@ type DiskServer interface {
 	Rescan(context.Context, *RescanRequest) (*RescanResponse, error)
 	// ListDiskIDs returns a map of DiskID objects where the key is the disk number.
 	ListDiskIDs(context.Context, *ListDiskIDsRequest) (*ListDiskIDsResponse, error)
-	// GetDiskStats returns the stats of a disk.
+	// GetDiskStats returns the stats of a disk (currently it returns the disk size).
 	GetDiskStats(context.Context, *GetDiskStatsRequest) (*GetDiskStatsResponse, error)
 	// SetDiskState sets the offline/online state of a disk.
 	SetDiskState(context.Context, *SetDiskStateRequest) (*SetDiskStateResponse, error)
diff --git a/client/api/disk/v1beta3/api.proto b/client/api/disk/v1beta3/api.proto
index 7d561367..8f8283e8 100644
--- a/client/api/disk/v1beta3/api.proto
+++ b/client/api/disk/v1beta3/api.proto
@@ -19,7 +19,7 @@ service Disk {
     // ListDiskIDs returns a map of DiskID objects where the key is the disk number.
     rpc ListDiskIDs(ListDiskIDsRequest) returns (ListDiskIDsResponse) {}
 
-    // GetDiskStats returns the stats of a disk.
+    // GetDiskStats returns the stats of a disk (currently it returns the disk size).
     rpc GetDiskStats(GetDiskStatsRequest) returns (GetDiskStatsResponse) {}
 
     // SetDiskState sets the offline/online state of a disk.
diff --git a/integrationtests/disk_v1beta3_test.go b/integrationtests/disk_v1beta3_test.go
index 23d44b1e..700b54a0 100644
--- a/integrationtests/disk_v1beta3_test.go
+++ b/integrationtests/disk_v1beta3_test.go
@@ -19,7 +19,7 @@ func v1beta3DiskTests(t *testing.T) {
 	t.Run("ListDiskIDs,ListDiskLocations", func(t *testing.T) {
 		// even though this test doesn't need the VHD API it failed in Github Actions
 		// see https://github.com/kubernetes-csi/csi-proxy/pull/140/checks?check_run_id=2671787129
-		skipTestOnCondition(t, isRunningOnGhActions())
+		// skipTestOnCondition(t, isRunningOnGhActions())
 
 		client, err := diskv1beta3client.NewClient()
 		require.Nil(t, err)
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
index 423e9dd1..e20b831e 100644
--- a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.pb.go
@@ -1189,7 +1189,7 @@ type DiskClient interface {
 	Rescan(ctx context.Context, in *RescanRequest, opts ...grpc.CallOption) (*RescanResponse, error)
 	// ListDiskIDs returns a map of DiskID objects where the key is the disk number.
 	ListDiskIDs(ctx context.Context, in *ListDiskIDsRequest, opts ...grpc.CallOption) (*ListDiskIDsResponse, error)
-	// GetDiskStats returns the stats of a disk.
+	// GetDiskStats returns the stats of a disk (currently it returns the disk size).
 	GetDiskStats(ctx context.Context, in *GetDiskStatsRequest, opts ...grpc.CallOption) (*GetDiskStatsResponse, error)
 	// SetDiskState sets the offline/online state of a disk.
 	SetDiskState(ctx context.Context, in *SetDiskStateRequest, opts ...grpc.CallOption) (*SetDiskStateResponse, error)
@@ -1280,7 +1280,7 @@ type DiskServer interface {
 	Rescan(context.Context, *RescanRequest) (*RescanResponse, error)
 	// ListDiskIDs returns a map of DiskID objects where the key is the disk number.
 	ListDiskIDs(context.Context, *ListDiskIDsRequest) (*ListDiskIDsResponse, error)
-	// GetDiskStats returns the stats of a disk.
+	// GetDiskStats returns the stats of a disk (currently it returns the disk size).
 	GetDiskStats(context.Context, *GetDiskStatsRequest) (*GetDiskStatsResponse, error)
 	// SetDiskState sets the offline/online state of a disk.
 	SetDiskState(context.Context, *SetDiskStateRequest) (*SetDiskStateResponse, error)
diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
index 7d561367..8f8283e8 100644
--- a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
+++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3/api.proto
@@ -19,7 +19,7 @@ service Disk {
     // ListDiskIDs returns a map of DiskID objects where the key is the disk number.
     rpc ListDiskIDs(ListDiskIDsRequest) returns (ListDiskIDsResponse) {}
 
-    // GetDiskStats returns the stats of a disk.
+    // GetDiskStats returns the stats of a disk (currently it returns the disk size).
     rpc GetDiskStats(GetDiskStatsRequest) returns (GetDiskStatsResponse) {}
 
     // SetDiskState sets the offline/online state of a disk.

From 889f29aeac3c7658690fbeb28c30517c42a6bc7c Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Tue, 1 Jun 2021 18:11:24 +0000
Subject: [PATCH 18/22] run ListDiskLocations v1alpha1 disk test

Also skip the same test in all of the other APIs because of the usage
of VM API that's not available in Github Actions
---
 docs/DEVELOPMENT.md                    | 2 ++
 integrationtests/disk_v1alpha1_test.go | 6 +-----
 integrationtests/disk_v1beta3_test.go  | 7 +++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index bfa443f7..db0225c4 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -118,3 +118,5 @@ go build -v -a -o ./bin/csi-proxy.exe ./cmd/csi-proxy
 # terminal 2 (run E2E tests)
 go test -v .\integrationtests\ -run TestVolumeAPIs
 ```
+
+You can also edit the files directly in the VM using vim or a similar editor.
diff --git a/integrationtests/disk_v1alpha1_test.go b/integrationtests/disk_v1alpha1_test.go
index cad0ad48..082386e4 100644
--- a/integrationtests/disk_v1alpha1_test.go
+++ b/integrationtests/disk_v1alpha1_test.go
@@ -14,11 +14,7 @@ import (
 )
 
 func v1alpha1DiskTests(t *testing.T) {
-	t.Run("ListDiskIDs,ListDiskLocations", func(t *testing.T) {
-		// even though this test doesn't need the VHD API it failed in Github Actions
-		// see https://github.com/kubernetes-csi/csi-proxy/pull/140/checks?check_run_id=2671787129
-		skipTestOnCondition(t, isRunningOnGhActions())
-
+	t.Run("ListDiskLocations", func(t *testing.T) {
 		client, err := diskv1alpha1client.NewClient()
 		require.Nil(t, err)
 		defer client.Close()
diff --git a/integrationtests/disk_v1beta3_test.go b/integrationtests/disk_v1beta3_test.go
index 700b54a0..b61cf1d4 100644
--- a/integrationtests/disk_v1beta3_test.go
+++ b/integrationtests/disk_v1beta3_test.go
@@ -18,8 +18,11 @@ import (
 func v1beta3DiskTests(t *testing.T) {
 	t.Run("ListDiskIDs,ListDiskLocations", func(t *testing.T) {
 		// even though this test doesn't need the VHD API it failed in Github Actions
-		// see https://github.com/kubernetes-csi/csi-proxy/pull/140/checks?check_run_id=2671787129
-		// skipTestOnCondition(t, isRunningOnGhActions())
+		//     disk_v1beta3_test.go:30:
+		// Error Trace:	disk_v1beta3_test.go:30
+		// Error:      	Expected nil, but got: &status.statusError{state:impl.MessageState{NoUnkeyedLiterals:pragma.NoUnkeyedLiterals{}, DoNotCompare:pragma.DoNotCompare{}, DoNotCopy:pragma.DoNotCopy{}, atomicMessageInfo:(*impl.MessageInfo)(nil)}, sizeCache:0, unknownFields:[]uint8(nil), Code:2, Message:"Could not get page83 ID: IOCTL_STORAGE_QUERY_PROPERTY failed: Incorrect function.", Details:[]*anypb.Any(nil)}
+		// Test:       	TestDiskAPIGroup/v1beta3Tests/ListDiskIDs,ListDiskLocations
+		skipTestOnCondition(t, isRunningOnGhActions())
 
 		client, err := diskv1beta3client.NewClient()
 		require.Nil(t, err)

From 5ccb4d16a7268c7e4398449c3592a642fe6c889e Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Tue, 1 Jun 2021 21:24:03 +0000
Subject: [PATCH 19/22] Update GetDiskNumberByName comment

---
 integrationtests/disk_v1alpha1_test.go | 5 +++++
 internal/os/disk/api.go                | 8 ++++----
 internal/server/disk/internal/types.go | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/integrationtests/disk_v1alpha1_test.go b/integrationtests/disk_v1alpha1_test.go
index 082386e4..d251656d 100644
--- a/integrationtests/disk_v1alpha1_test.go
+++ b/integrationtests/disk_v1alpha1_test.go
@@ -15,6 +15,11 @@ import (
 
 func v1alpha1DiskTests(t *testing.T) {
 	t.Run("ListDiskLocations", func(t *testing.T) {
+		// fails in Github Actions with
+		// Error:     disk_v1alpha1_test.go:25: listDiskLocationsResponse=
+		// Error:     disk_v1alpha1_test.go:27: Expected to get at least one diskLocation, instead got DiskLocations=map[]
+		skipTestOnCondition(t, isRunningOnGhActions())
+
 		client, err := diskv1alpha1client.NewClient()
 		require.Nil(t, err)
 		defer client.Close()
diff --git a/internal/os/disk/api.go b/internal/os/disk/api.go
index b53d6c7b..79b42c8d 100644
--- a/internal/os/disk/api.go
+++ b/internal/os/disk/api.go
@@ -39,8 +39,8 @@ type API interface {
 	CreatePartition(diskNumber uint32) error
 	// Rescan updates the host storage cache (re-enumerates disk, partition and volume objects)
 	Rescan() error
-	// GetDiskNumberByName gets a disk number by `diskName`.
-	GetDiskNumberByName(diskName string) (uint32, error)
+	// GetDiskNumberByName gets a disk number by page83 ID (disk name)
+	GetDiskNumberByName(page83ID string) (uint32, error)
 	// ListDiskIDs list all disks by disk number.
 	ListDiskIDs() (map[uint32]shared.DiskIDs, error)
 	// GetDiskStats gets the disk stats of the disk `diskNumber`.
@@ -179,8 +179,8 @@ func (DiskAPI) CreatePartition(diskNumber uint32) error {
 	return nil
 }
 
-func (imp DiskAPI) GetDiskNumberByName(diskName string) (uint32, error) {
-	diskNumber, err := imp.GetDiskNumberWithID(diskName)
+func (imp DiskAPI) GetDiskNumberByName(page83ID string) (uint32, error) {
+	diskNumber, err := imp.GetDiskNumberWithID(page83ID)
 	return diskNumber, err
 }
 
diff --git a/internal/server/disk/internal/types.go b/internal/server/disk/internal/types.go
index 8ce8a7df..9d95b555 100644
--- a/internal/server/disk/internal/types.go
+++ b/internal/server/disk/internal/types.go
@@ -30,7 +30,7 @@ type RescanResponse struct {
 }
 
 type GetDiskNumberByNameRequest struct {
-	// Disk device ID of the disk to partition
+	// Disk name is the page83 ID of the disk
 	DiskName string
 }
 

From a8b429e382b55d75a2c58ff5f9cb8904a5e6fedf Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Tue, 1 Jun 2021 21:52:12 +0000
Subject: [PATCH 20/22] force deletion of mountPath and testPluginPath during
 diskCleanup

---
 integrationtests/utils.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/integrationtests/utils.go b/integrationtests/utils.go
index bcdad7d5..73dc4959 100644
--- a/integrationtests/utils.go
+++ b/integrationtests/utils.go
@@ -184,12 +184,12 @@ func diskCleanup(t *testing.T, vhdxPath, mountPath, testPluginPath string) {
 	if out, err = runPowershellCmd(t, cmd); err != nil {
 		t.Errorf("Error: %v. Command: %s. Out: %s", err, cmd, out)
 	}
-	cmd = fmt.Sprintf("rmdir %s", mountPath)
+	cmd = fmt.Sprintf("rm -r -fo %s", mountPath)
 	if out, err = runPowershellCmd(t, cmd); err != nil {
 		t.Errorf("Error: %v. Command: %s. Out: %s", err, cmd, out)
 	}
 	if testPluginPath != "" {
-		cmd = fmt.Sprintf("rmdir %s", testPluginPath)
+		cmd = fmt.Sprintf("rm -r -fo %s", testPluginPath)
 		if out, err = runPowershellCmd(t, cmd); err != nil {
 			t.Errorf("Error: %v. Command: %s. Out: %s", err, cmd, out)
 		}

From 6ed2ce6401e2ea527fb94eb28ec127b39f1ab95a Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Tue, 1 Jun 2021 22:27:54 +0000
Subject: [PATCH 21/22] choose a single folder for tests

---
 integrationtests/utils.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/integrationtests/utils.go b/integrationtests/utils.go
index 73dc4959..bb949b6e 100644
--- a/integrationtests/utils.go
+++ b/integrationtests/utils.go
@@ -209,9 +209,10 @@ func diskInit(t *testing.T) (*VirtualHardDisk, func()) {
 	s1 := rand.NewSource(time.Now().UTC().UnixNano())
 	r1 := rand.New(s1)
 
-	testPluginPath := fmt.Sprintf("C:\\var\\lib\\kubelet\\plugins\\testplugin-%d.csi.io\\", r1.Intn(100))
-	mountPath := fmt.Sprintf("%smount-%d", testPluginPath, r1.Intn(100))
-	vhdxPath := fmt.Sprintf("%sdisk-%d.vhdx", testPluginPath, r1.Intn(100))
+	testId := r1.Intn(1000)
+	testPluginPath := fmt.Sprintf("C:\\var\\lib\\kubelet\\plugins\\testplugin-%d.csi.io\\", testId)
+	mountPath := fmt.Sprintf("%smount-%d", testPluginPath, testId)
+	vhdxPath := fmt.Sprintf("%sdisk-%d.vhdx", testPluginPath, testId)
 
 	var cmd, out string
 	var err error

From e2d4768d123c68320f7afb352e03b35e10d78101 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Tue, 1 Jun 2021 22:44:01 +0000
Subject: [PATCH 22/22] Use rmdir instead of rm recursive and force

---
 integrationtests/utils.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/integrationtests/utils.go b/integrationtests/utils.go
index bb949b6e..2fd0b525 100644
--- a/integrationtests/utils.go
+++ b/integrationtests/utils.go
@@ -184,12 +184,12 @@ func diskCleanup(t *testing.T, vhdxPath, mountPath, testPluginPath string) {
 	if out, err = runPowershellCmd(t, cmd); err != nil {
 		t.Errorf("Error: %v. Command: %s. Out: %s", err, cmd, out)
 	}
-	cmd = fmt.Sprintf("rm -r -fo %s", mountPath)
+	cmd = fmt.Sprintf("rmdir %s", mountPath)
 	if out, err = runPowershellCmd(t, cmd); err != nil {
 		t.Errorf("Error: %v. Command: %s. Out: %s", err, cmd, out)
 	}
 	if testPluginPath != "" {
-		cmd = fmt.Sprintf("rm -r -fo %s", testPluginPath)
+		cmd = fmt.Sprintf("rmdir %s", testPluginPath)
 		if out, err = runPowershellCmd(t, cmd); err != nil {
 			t.Errorf("Error: %v. Command: %s. Out: %s", err, cmd, out)
 		}