github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix string trim func isBackendPoolOnSameLB in azure

Browse Source 
add a test case to prove this trimming bugfix
This commit is contained in:
Guangming Wang
2019-10-15 22:08:36 +08:00
parent 1679bed803
commit 51db06a5de
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/legacy-cloud-providers/azure/azure_wrap.go
View File

@@ -350,7 +350,7 @@ func isBackendPoolOnSameLB(newBackendPoolID string, existingBackendPools []strin
} }
newLBName := matches[1] newLBName := matches[1]
newLBNameTrimmed := strings.TrimRight(newLBName, InternalLoadBalancerNameSuffix) newLBNameTrimmed := strings.TrimSuffix(newLBName, InternalLoadBalancerNameSuffix)
for _, backendPool := range existingBackendPools { for _, backendPool := range existingBackendPools {
matches := backendPoolIDRE.FindStringSubmatch(backendPool) matches := backendPoolIDRE.FindStringSubmatch(backendPool)
if len(matches) != 2 { if len(matches) != 2 {
@@ -358,7 +358,7 @@ func isBackendPoolOnSameLB(newBackendPoolID string, existingBackendPools []strin
} }
lbName := matches[1] lbName := matches[1]
if !strings.EqualFold(strings.TrimRight(lbName, InternalLoadBalancerNameSuffix), newLBNameTrimmed) { if !strings.EqualFold(strings.TrimSuffix(lbName, InternalLoadBalancerNameSuffix), newLBNameTrimmed) {
return false, lbName, nil return false, lbName, nil
} }
} }

8
staging/src/k8s.io/legacy-cloud-providers/azure/azure_wrap_test.go
View File

@@ -263,6 +263,14 @@ func TestIsBackendPoolOnSameLB(t *testing.T) {
}, },
expectError: true, expectError: true,
}, },
{
backendPoolID: "/subscriptions/sub/resourceGroups/rg/providers/Microsoft.Network/loadBalancers/malformed-lb1-internal/backendAddressPools/pool1",
existingBackendPools: []string{
"/subscriptions/sub/resourceGroups/rg/providers/Microsoft.Network/loadBalancers/malformed-lb1-lanretni/backendAddressPools/pool2",
},
expected: false,
expectedLBName: "malformed-lb1-lanretni",
},
} }
for _, test := range tests { for _, test := range tests {