mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 14:21:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add backwards-compatibility for azure snapshot ID

Browse Source 
Signed-off-by: Steve Kriss <steve@heptio.com>
This commit is contained in:
Steve Kriss
2018-04-23 10:11:16 -07:00
parent 9155baee7c
commit a466208975
2 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/cloudprovider/azure/block_store.go
View File

@@ -128,7 +128,7 @@ func (b *blockStore) Init(config map[string]string) error {
}
func (b *blockStore) CreateVolumeFromSnapshot(snapshotID, volumeType, volumeAZ string, iops *int64) (string, error) {
snapshotIdentifier, err := parseFullSnapshotName(snapshotID)
snapshotIdentifier, err := b.parseSnapshotName(snapshotID)
if err != nil {
return "", err
}
@@ -264,7 +264,7 @@ func stringPtr(s string) *string {
}
func (b *blockStore) DeleteSnapshot(snapshotID string) error {
snapshotInfo, err := parseFullSnapshotName(snapshotID)
snapshotInfo, err := b.parseSnapshotName(snapshotID)
if err != nil {
return err
}
@@ -286,8 +286,34 @@ func getComputeResourceName(subscription, resourceGroup, resource, name string)
var snapshotURIRegexp = regexp.MustCompile(
`^\/subscriptions\/(?P<subscription>.*)\/resourceGroups\/(?P<resourceGroup>.*)\/providers\/Microsoft.Compute\/snapshots\/(?P<snapshotName>.*)$`)
// parseFullSnapshotName takes a snapshot URI and returns a snapshot identifier
// or an error if the URI does not match the regexp.
// parseSnapshotName takes a snapshot name, either fully-qualified or not, and returns
// a snapshot identifier or an error if the name is not in a valid format. If the name
// is not fully-qualified, the subscription and resource group are assumed to be the
// ones that the block store is configured with.
//
// TODO(1.0) remove this function and replace usage with `parseFullSnapshotName` since
// we won't support the legacy snapshot name format for 1.0.
func (b *blockStore) parseSnapshotName(name string) (*snapshotIdentifier, error) {
switch {
// legacy format - name only (not fully-qualified)
case !strings.Contains(name, "/"):
return &snapshotIdentifier{
subscription: b.subscription,
resourceGroup: b.resourceGroup,
name: name,
}, nil
// current format - fully qualified
case snapshotURIRegexp.MatchString(name):
return parseFullSnapshotName(name)
// unrecognized format
default:
return nil, errors.New("snapshot name is not in a valid format")
}
}
// parseFullSnapshotName takes a fully-qualified snapshot name and returns
// a snapshot identifier or an error if the snapshot name does not match the
// regexp.
func parseFullSnapshotName(name string) (*snapshotIdentifier, error) {
submatches := snapshotURIRegexp.FindStringSubmatch(name)
if len(submatches) != len(snapshotURIRegexp.SubexpNames()) {

26
pkg/cloudprovider/azure/block_store_test.go
View File

@@ -90,20 +90,38 @@ func TestSetVolumeID(t *testing.T) {
assert.Equal(t, "/subscriptions/sub/resourceGroups/rg/providers/Microsoft.Compute/disks/revised", actual)
}
func TestParseFullSnapshotName(t *testing.T) {
// TODO(1.0) rename to TestParseFullSnapshotName, switch to testing
// the `parseFullSnapshotName` function, and remove case for legacy
// format
func TestParseSnapshotName(t *testing.T) {
b := &blockStore{
subscription: "default-sub",
resourceGroup: "default-rg",
}
// invalid name
fullName := "foo/bar"
_, err := parseFullSnapshotName(fullName)
_, err := b.parseSnapshotName(fullName)
assert.Error(t, err)
// valid name
// valid name (current format)
fullName = "/subscriptions/sub-1/resourceGroups/rg-1/providers/Microsoft.Compute/snapshots/snap-1"
snap, err := parseFullSnapshotName(fullName)
snap, err := b.parseSnapshotName(fullName)
require.NoError(t, err)
assert.Equal(t, "sub-1", snap.subscription)
assert.Equal(t, "rg-1", snap.resourceGroup)
assert.Equal(t, "snap-1", snap.name)
// valid name (legacy format)
// TODO(1.0) remove this test case
fullName = "foobar"
snap, err = b.parseSnapshotName(fullName)
require.NoError(t, err)
assert.Equal(t, b.subscription, snap.subscription)
assert.Equal(t, b.resourceGroup, snap.resourceGroup)
assert.Equal(t, fullName, snap.name)
}
func TestGetComputeResourceName(t *testing.T) {