04b787b946
Means we can run in newly announced regions without a code change. We don't register the ECR provider in new regions, so we will still need a code change for now. This also means we do trust config / instance metadata, and don't reject incorrectly configured zones. Fix #35014
86 lines
2.0 KiB
Go
86 lines
2.0 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package aws
|
|
|
|
import (
|
|
"testing"
|
|
)
|
|
|
|
// TestRegions does basic checking of region verification / addition
|
|
func TestRegions(t *testing.T) {
|
|
RecognizeWellKnownRegions()
|
|
|
|
tests := []struct {
|
|
Add string
|
|
Lookup string
|
|
ExpectIsRegion bool
|
|
}{
|
|
{
|
|
Lookup: "us-east-1",
|
|
ExpectIsRegion: true,
|
|
},
|
|
{
|
|
Lookup: "us-east-1a",
|
|
ExpectIsRegion: false,
|
|
},
|
|
{
|
|
Add: "us-test-1",
|
|
Lookup: "us-east-1",
|
|
ExpectIsRegion: true,
|
|
},
|
|
{
|
|
Lookup: "us-test-1",
|
|
ExpectIsRegion: true,
|
|
},
|
|
{
|
|
Add: "us-test-1",
|
|
Lookup: "us-test-1",
|
|
ExpectIsRegion: true,
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
if test.Add != "" {
|
|
RecognizeRegion(test.Add)
|
|
}
|
|
|
|
if test.Lookup != "" {
|
|
if isRegionValid(test.Lookup) != test.ExpectIsRegion {
|
|
t.Fatalf("region valid mismatch: %q", test.Lookup)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// TestRecognizesNewRegion verifies that we see a region from metadata, we recognize it as valid
|
|
func TestRecognizesNewRegion(t *testing.T) {
|
|
region := "us-testrecognizesnewregion-1"
|
|
if isRegionValid(region) {
|
|
t.Fatalf("region already valid: %q", region)
|
|
}
|
|
|
|
awsServices := NewFakeAWSServices().withAz(region + "a")
|
|
_, err := newAWSCloud(nil, awsServices)
|
|
if err != nil {
|
|
t.Errorf("error building AWS cloud: %v", err)
|
|
}
|
|
|
|
if !isRegionValid(region) {
|
|
t.Fatalf("newly discovered region not valid: %q", region)
|
|
}
|
|
}
|