From 88aab59332107eb910e417e187dc0acde3c4cf4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Mu=C3=9Fler?= <janm81@gmail.com>
Date: Wed, 9 Dec 2020 15:00:30 +0100
Subject: [PATCH] Reflect k8s volume id in test data. Extract aws volume id
 from k8s value.

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

diff --git a/pkg/cluster/volumes.go b/pkg/cluster/volumes.go
index 533d5c4f8..6c628ed36 100644
--- a/pkg/cluster/volumes.go
+++ b/pkg/cluster/volumes.go
@@ -265,8 +265,13 @@ func (c *Cluster) executeEBSMigration() error {
 	c.logger.Debugf("found %d volumes, size of known volumes %d", len(pvs), len(c.EBSVolumes))
 
 	volumeIds := []string{}
+	var volumeID string
 	for _, pv := range pvs {
-		volumeID := pv.Spec.AWSElasticBlockStore.VolumeID
+		volumeID, err = c.VolumeResizer.GetProviderVolumeID(pv)
+		if err != nil {
+			continue
+		}
+
 		volumeIds = append(volumeIds, volumeID)
 	}
 
diff --git a/pkg/cluster/volumes_test.go b/pkg/cluster/volumes_test.go
index eb5ca979c..c61082f14 100644
--- a/pkg/cluster/volumes_test.go
+++ b/pkg/cluster/volumes_test.go
@@ -234,11 +234,11 @@ func TestMigrateEBS(t *testing.T) {
 
 	ps := v1.PersistentVolumeSpec{}
 	ps.AWSElasticBlockStore = &v1.AWSElasticBlockStoreVolumeSource{}
-	ps.AWSElasticBlockStore.VolumeID = "ebs-volume-1"
+	ps.AWSElasticBlockStore.VolumeID = "aws://eu-central-1b/ebs-volume-1"
 
 	ps2 := v1.PersistentVolumeSpec{}
 	ps2.AWSElasticBlockStore = &v1.AWSElasticBlockStoreVolumeSource{}
-	ps2.AWSElasticBlockStore.VolumeID = "ebs-volume-2"
+	ps2.AWSElasticBlockStore.VolumeID = "aws://eu-central-1b/ebs-volume-2"
 
 	pvList := &v1.PersistentVolumeList{
 		Items: []v1.PersistentVolume{
diff --git a/pkg/util/volumes/ebs.go b/pkg/util/volumes/ebs.go
index f04504a79..3db422080 100644
--- a/pkg/util/volumes/ebs.go
+++ b/pkg/util/volumes/ebs.go
@@ -47,7 +47,7 @@ func (r *EBSVolumeResizer) GetProviderVolumeID(pv *v1.PersistentVolume) (string,
 	}
 	idx := strings.LastIndex(volumeID, constants.EBSVolumeIDStart) + 1
 	if idx == 0 {
-		return "", fmt.Errorf("malfored EBS volume id %q", volumeID)
+		return "", fmt.Errorf("malformed EBS volume id %q", volumeID)
 	}
 	return volumeID[idx:], nil
 }