From 4a37d04f529a3e45a821043d0105f6028f59269a Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Fri, 14 Jun 2019 10:43:35 +0000 Subject: [PATCH] fix: make azure disk URI case insensitive --- .../azure/azure_managedDiskController.go | 2 +- .../src/k8s.io/legacy-cloud-providers/azure/azure_test.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go index c6acbf280de..178348c2949 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go @@ -262,7 +262,7 @@ func (c *ManagedDiskController) ResizeDisk(diskURI string, oldSize resource.Quan // according to https://docs.microsoft.com/en-us/rest/api/compute/disks/get func getResourceGroupFromDiskURI(diskURI string) (string, error) { fields := strings.Split(diskURI, "/") - if len(fields) != 9 || fields[3] != "resourceGroups" { + if len(fields) != 9 || strings.ToLower(fields[3]) != "resourcegroups" { return "", fmt.Errorf("invalid disk URI: %s", diskURI) } return fields[4], nil diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go index 08a02c1585f..3438635885e 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go @@ -2705,6 +2705,12 @@ func TestGetResourceGroupFromDiskURI(t *testing.T) { expectedResult: "azure-k8s1102", expectError: false, }, + { + // case insentive check + diskURL: "/subscriptions/4be8920b-2978-43d7-axyz-04d8549c1d05/resourcegroups/azure-k8s1102/providers/Microsoft.Compute/disks/andy-mghyb1102-dynamic-pvc-f7f014c9-49f4-11e8-ab5c-000d3af7b38e", + expectedResult: "azure-k8s1102", + expectError: false, + }, { diskURL: "/4be8920b-2978-43d7-axyz-04d8549c1d05/resourceGroups/azure-k8s1102/providers/Microsoft.Compute/disks/andy-mghyb1102-dynamic-pvc-f7f014c9-49f4-11e8-ab5c-000d3af7b38e", expectedResult: "",