Consistent naming for region constants

eksctl-io · Dec 18, 2018 · 74752c8 · 74752c8
1 parent 3a15f74
commit 74752c8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -16,7 +16,7 @@ const (
 	deleteTimeout = 15 * time.Minute
 	getTimeout    = 1 * time.Minute
 	scaleTimeout  = 5 * time.Minute
-	region        = api.DefaultEKSRegion
+	region        = api.DefaultRegion
 )
 
 var (

diff --git a/pkg/eks/api.go b/pkg/eks/api.go
@@ -205,7 +205,7 @@ func (c *ClusterProvider) SetAvailabilityZones(spec *api.ClusterConfig, given []
 	if len(given) == 0 {
 		logger.Debug("determining availability zones")
 		azSelector := az.NewSelectorWithDefaults(c.Provider.EC2())
-		if c.Provider.Region() == api.EKSRegionUSEast1 {
+		if c.Provider.Region() == api.RegionUSEast1 {
 			azSelector = az.NewSelectorWithMinRequired(c.Provider.EC2())
 		}
 		zones, err := azSelector.SelectZones(c.Provider.Region())
@@ -278,8 +278,8 @@ func (c *ClusterProvider) newSession(spec *api.ProviderConfig, endpoint string,
 			spec.Region = *s.Config.Region
 		} else {
 			// if session config doesn't have region set, make recursive call forcing default region
-			logger.Debug("no region specified in flags or config, setting to %s", api.DefaultEKSRegion)
-			spec.Region = api.DefaultEKSRegion
+			logger.Debug("no region specified in flags or config, setting to %s", api.DefaultRegion)
+			spec.Region = api.DefaultRegion
 			return c.newSession(spec, endpoint, credentials)
 		}
 	}

diff --git a/pkg/eks/api/api.go b/pkg/eks/api/api.go
@@ -14,33 +14,33 @@ const (
 	// AWSDebugLevel defines the LogLevel for AWS produced logs
 	AWSDebugLevel = 5
 
-	// EKSRegionUSWest2 represents the US West Region Oregon
-	EKSRegionUSWest2 = "us-west-2"
+	// RegionUSWest2 represents the US West Region Oregon
+	RegionUSWest2 = "us-west-2"
 
-	// EKSRegionUSEast1 represents the US East Region North Virgina
-	EKSRegionUSEast1 = "us-east-1"
+	// RegionUSEast1 represents the US East Region North Virgina
+	RegionUSEast1 = "us-east-1"
 
-	// EKSRegionUSEast2 represents the US East Region Ohio
-	EKSRegionUSEast2 = "us-east-2"
+	// RegionUSEast2 represents the US East Region Ohio
+	RegionUSEast2 = "us-east-2"
 
-	// EKSRegionEUWest1 represents the EU West Region Ireland
-	EKSRegionEUWest1 = "eu-west-1"
+	// RegionEUWest1 represents the EU West Region Ireland
+	RegionEUWest1 = "eu-west-1"
 
-	// EKSRegionEUNorth1 represents the EU North Region Stockholm
-	EKSRegionEUNorth1 = "eu-north-1"
+	// RegionEUNorth1 represents the EU North Region Stockholm
+	RegionEUNorth1 = "eu-north-1"
 
-	// DefaultEKSRegion defines the default region, where to deploy the EKS cluster
-	DefaultEKSRegion = EKSRegionUSWest2
+	// DefaultRegion defines the default region, where to deploy the EKS cluster
+	DefaultRegion = RegionUSWest2
 )
 
 // SupportedRegions are the regions where EKS is available
 func SupportedRegions() []string {
 	return []string{
-		EKSRegionUSWest2,
-		EKSRegionUSEast1,
-		EKSRegionUSEast2,
-		EKSRegionEUWest1,
-		EKSRegionEUNorth1,
+		RegionUSWest2,
+		RegionUSEast1,
+		RegionUSEast2,
+		RegionEUWest1,
+		RegionEUNorth1,
 	}
 }
 

diff --git a/pkg/testutils/mock_provider.go b/pkg/testutils/mock_provider.go
@@ -31,7 +31,7 @@ func NewMockProvider() *MockProvider {
 
 // ProviderConfig holds current global config
 var ProviderConfig = &api.ProviderConfig{
-	Region:      api.DefaultEKSRegion,
+	Region:      api.DefaultRegion,
 	Profile:     "default",
 	Version:     "1.10",
 	WaitTimeout: 1200000000000,