From b2b16b3c850a5bb121af770abf9ec5adb3a64719 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Tue, 13 Mar 2018 17:03:14 -0700 Subject: [PATCH] Azure: fix bug preventing snapshot deletion Signed-off-by: Steve Kriss --- pkg/cloudprovider/azure/block_store.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/cloudprovider/azure/block_store.go b/pkg/cloudprovider/azure/block_store.go index b99ff1301..7d08d6ec2 100644 --- a/pkg/cloudprovider/azure/block_store.go +++ b/pkg/cloudprovider/azure/block_store.go @@ -233,12 +233,17 @@ func (b *blockStore) CreateSnapshot(volumeID, volumeAZ string, tags map[string]s } func (b *blockStore) DeleteSnapshot(snapshotID string) error { + snapshotInfo, err := parseFullSnapshotName(snapshotID) + if err != nil { + return err + } + ctx, cancel := context.WithTimeout(context.Background(), b.apiTimeout) defer cancel() - _, errChan := b.snaps.Delete(b.resourceGroup, snapshotID, ctx.Done()) + _, errChan := b.snaps.Delete(snapshotInfo.resourceGroup, snapshotInfo.name, ctx.Done()) - err := <-errChan + err = <-errChan return errors.WithStack(err) }