From 7a89a7c39fa9c402bdaa4817b9168acb4241ad3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Mu=C3=9Fler?= <janm81@gmail.com>
Date: Wed, 9 Dec 2020 15:18:15 +0100
Subject: [PATCH] Finalizing ebs migration.

---
 pkg/cluster/volumes.go      |  2 +-
 pkg/cluster/volumes_test.go |  4 ++++
 pkg/util/volumes/ebs.go     | 18 ++++++++++++------
 pkg/util/volumes/volumes.go |  1 +
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkg/cluster/volumes.go b/pkg/cluster/volumes.go
index 6c628ed36..d7452b0c8 100644
--- a/pkg/cluster/volumes.go
+++ b/pkg/cluster/volumes.go
@@ -267,7 +267,7 @@ func (c *Cluster) executeEBSMigration() error {
 	volumeIds := []string{}
 	var volumeID string
 	for _, pv := range pvs {
-		volumeID, err = c.VolumeResizer.GetProviderVolumeID(pv)
+		volumeID, err = c.VolumeResizer.ExtractVolumeID(pv.Spec.AWSElasticBlockStore.VolumeID)
 		if err != nil {
 			continue
 		}
diff --git a/pkg/cluster/volumes_test.go b/pkg/cluster/volumes_test.go
index c61082f14..39ab984a0 100644
--- a/pkg/cluster/volumes_test.go
+++ b/pkg/cluster/volumes_test.go
@@ -289,6 +289,10 @@ func TestMigrateEBS(t *testing.T) {
 	defer ctrl.Finish()
 
 	resizer := mocks.NewMockVolumeResizer(ctrl)
+
+	resizer.EXPECT().ExtractVolumeID(gomock.Eq("aws://eu-central-1b/ebs-volume-1")).Return("ebs-volume-1", nil)
+	resizer.EXPECT().ExtractVolumeID(gomock.Eq("aws://eu-central-1b/ebs-volume-2")).Return("ebs-volume-2", nil)
+
 	resizer.EXPECT().DescribeVolumes(gomock.Eq([]string{"ebs-volume-1", "ebs-volume-2"})).Return(
 		[]volumes.VolumeProperties{
 			{VolumeID: "ebs-volume-1", VolumeType: "gp2", Size: 100},
diff --git a/pkg/util/volumes/ebs.go b/pkg/util/volumes/ebs.go
index 3db422080..25b033396 100644
--- a/pkg/util/volumes/ebs.go
+++ b/pkg/util/volumes/ebs.go
@@ -39,12 +39,8 @@ func (r *EBSVolumeResizer) VolumeBelongsToProvider(pv *v1.PersistentVolume) bool
 	return pv.Spec.AWSElasticBlockStore != nil && pv.Annotations[constants.VolumeStorateProvisionerAnnotation] == constants.EBSProvisioner
 }
 
-// GetProviderVolumeID converts aws://eu-central-1b/vol-00f93d4827217c629 to vol-00f93d4827217c629 for EBS volumes
-func (r *EBSVolumeResizer) GetProviderVolumeID(pv *v1.PersistentVolume) (string, error) {
-	volumeID := pv.Spec.AWSElasticBlockStore.VolumeID
-	if volumeID == "" {
-		return "", fmt.Errorf("volume id is empty for volume %q", pv.Name)
-	}
+// ExtractVolumeID extracts volumeID
+func (r *EBSVolumeResizer) ExtractVolumeID(volumeID string) (string, error) {
 	idx := strings.LastIndex(volumeID, constants.EBSVolumeIDStart) + 1
 	if idx == 0 {
 		return "", fmt.Errorf("malformed EBS volume id %q", volumeID)
@@ -52,6 +48,16 @@ func (r *EBSVolumeResizer) GetProviderVolumeID(pv *v1.PersistentVolume) (string,
 	return volumeID[idx:], nil
 }
 
+// GetProviderVolumeID converts aws://eu-central-1b/vol-00f93d4827217c629 to vol-00f93d4827217c629 for EBS volumes
+func (r *EBSVolumeResizer) GetProviderVolumeID(pv *v1.PersistentVolume) (string, error) {
+	volumeID := pv.Spec.AWSElasticBlockStore.VolumeID
+	if volumeID == "" {
+		return "", fmt.Errorf("got empty volume id for volume %v", pv)
+	}
+
+	return r.ExtractVolumeID(volumeID)
+}
+
 // DescribeVolumes ...
 func (r *EBSVolumeResizer) DescribeVolumes(volumeIds []string) ([]VolumeProperties, error) {
 	if !r.IsConnectedToProvider() {
diff --git a/pkg/util/volumes/volumes.go b/pkg/util/volumes/volumes.go
index a0d519071..9b44c0d00 100644
--- a/pkg/util/volumes/volumes.go
+++ b/pkg/util/volumes/volumes.go
@@ -19,6 +19,7 @@ type VolumeResizer interface {
 	IsConnectedToProvider() bool
 	VolumeBelongsToProvider(pv *v1.PersistentVolume) bool
 	GetProviderVolumeID(pv *v1.PersistentVolume) (string, error)
+	ExtractVolumeID(volumeID string) (string, error)
 	ResizeVolume(providerVolumeID string, newSize int64) error
 	ModifyVolume(providerVolumeID string, newType string, newSize int64, iops int64, throughput int64) error
 	DisconnectFromProvider() error