github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90874 from Jeffwan/local_zone

Browse Source 
Extend AWS azToRegion method to support Local Zones
This commit is contained in:
Kubernetes Prow Robot 2020-06-10 04:38:52 -07:00 committed by GitHub
commit f00932fa46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/legacy-cloud-providers/aws/aws.go
View File

@ -25,6 +25,7 @@ import (
"io"
"net"
"path"
"regexp"
"sort"
"strconv"
"strings"
@ -1208,7 +1209,13 @@ func azToRegion(az string) (string, error) {
if len(az) < 1 {
return "", fmt.Errorf("invalid (empty) AZ")
}
region := az[:len(az)-1]
r := regexp.MustCompile(`^([a-zA-Z]+-)+\d+`)
region := r.FindString(az)
if region == "" {
return "", fmt.Errorf("invalid AZ: %s", az)
}
return region, nil
}

20
staging/src/k8s.io/legacy-cloud-providers/aws/aws_test.go
View File

@ -2534,3 +2534,23 @@ func newMockedFakeAWSServices(id string) *FakeAWSServices {
s.elb = &MockedFakeELB{FakeELB: s.elb.(*FakeELB)}
return s
}
func TestAzToRegion(t *testing.T) {
testCases := []struct {
az string
region string
}{
{"us-west-2a", "us-west-2"},
{"us-west-2-lax-1a", "us-west-2"},
{"ap-northeast-2a", "ap-northeast-2"},
{"us-gov-east-1a", "us-gov-east-1"},
{"us-iso-east-1a", "us-iso-east-1"},
{"us-isob-east-1a", "us-isob-east-1"},
}
for _, testCase := range testCases {
result, err := azToRegion(testCase.az)
assert.NoError(t, err)
assert.Equal(t, testCase.region, result)
}
}