Commit 623d32a6 authored by Dong Liu's avatar Dong Liu

Fix splitProviderID for Azure

parent 4457e43e
...@@ -779,7 +779,7 @@ func TestSplitProviderID(t *testing.T) { ...@@ -779,7 +779,7 @@ func TestSplitProviderID(t *testing.T) {
}{ }{
{ {
providerID: CloudProviderName + ":///subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/virtualMachines/k8s-agent-AAAAAAAA-0", providerID: CloudProviderName + ":///subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/virtualMachines/k8s-agent-AAAAAAAA-0",
name: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/virtualMachines/k8s-agent-AAAAAAAA-0", name: "k8s-agent-AAAAAAAA-0",
fail: false, fail: false,
}, },
{ {
......
...@@ -46,7 +46,7 @@ const ( ...@@ -46,7 +46,7 @@ const (
securityRuleIDTemplate = "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/networkSecurityGroups/%s/securityRules/%s" securityRuleIDTemplate = "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/networkSecurityGroups/%s/securityRules/%s"
) )
var providerIDRE = regexp.MustCompile(`^` + CloudProviderName + `://(.+)$`) var providerIDRE = regexp.MustCompile(`^` + CloudProviderName + `://(?:.*)/Microsoft.Compute/virtualMachines/(.+)$`)
// returns the full identifier of a machine // returns the full identifier of a machine
func (az *Cloud) getMachineID(machineName string) string { func (az *Cloud) getMachineID(machineName string) string {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment