Merge pull request #2905 from k8s-infra-cherrypick-robot/cherry-pick-2903-to-release-1.33

k8s-ci-robot · web-flow · commit 33e12d3861de · 2025-12-18T06:47:17.000-08:00
[release-1.33] fix: allow uppercase subscription ID
diff --git a/pkg/azurefile/utils.go b/pkg/azurefile/utils.go
@@ -360,7 +360,7 @@ func getFileServiceURL(accountName, storageEndpointSuffix string) string {
 }
 
 func isValidSubscriptionID(subsID string) bool {
-	return regexp.MustCompile(`^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$`).MatchString(subsID)
+	return regexp.MustCompile(`^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$`).MatchString(subsID)
 }
 
 // RemoveOptionIfExists removes the given option from the list of options
diff --git a/pkg/azurefile/utils_test.go b/pkg/azurefile/utils_test.go
@@ -1071,6 +1071,11 @@ func TestIsValidSubscriptionID(t *testing.T) {
 			subsID:   "2025-04-15T11:06:21.0000000Z",
 			expected: false,
 		},
+		{
+			desc:     "valid subscription ID - uppercase letters",
+			subsID:   "C9D2281E-DCD5-4DFD-9A97-0D50377CDF76",
+			expected: true,
+		},
 	}
 
 	for _, test := range tests {

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ func getFileServiceURL(accountName, storageEndpointSuffix string) string {`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`func isValidSubscriptionID(subsID string) bool {`
`363`		- return regexp.MustCompile(`^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$`).MatchString(subsID)
	`363`	+ return regexp.MustCompile(`^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$`).MatchString(subsID)
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`// RemoveOptionIfExists removes the given option from the list of options`