fixup! refactor: Remove region enum values

Author: jimmidyson

api/v1alpha1/aws_clusterconfig_types.go

@@ -41,74 +41,11 @@ func (AWSClusterConfigSpec) VariableSchema() clusterv1.VariableSchema {
 
 type Region string
 
-const (
-	RegionAFSouth1     Region = "af-south-1"
-	RegionAPEast1      Region = "ap-east-1"
-	RegionAPNorthEast1 Region = "ap-northeast-1"
-	RegionAPNorthEast2 Region = "ap-northeast-2"
-	RegionAPNorthEast3 Region = "ap-northeast-3"
-	RegionAPSouth1     Region = "ap-south-1"
-	RegionAPSouth2     Region = "ap-south-2"
-	RegionAPSouthEast1 Region = "ap-southeast-1"
-	RegionAPSouthEast2 Region = "ap-southeast-2"
-	RegionAPSouthEast3 Region = "ap-southeast-3"
-	RegionAPSouthEast4 Region = "ap-southeast-4"
-	RegionCACentral1   Region = "ca-central-1"
-	RegionEUCentral1   Region = "eu-central-1"
-	RegionEUCentral2   Region = "eu-central-2"
-	RegionEUNorth1     Region = "eu-north-1"
-	RegionEUSouth1     Region = "eu-south-1"
-	RegionEUSouth2     Region = "eu-south-2"
-	RegionEUWest1      Region = "eu-west-1"
-	RegionEUWest2      Region = "eu-west-2"
-	RegionEUWest3      Region = "eu-west-3"
-	RegionILCentral1   Region = "il-central-1"
-	RegionMECentral1   Region = "me-central-1"
-	RegionMESouth1     Region = "me-south-1"
-	RegionSAEast1      Region = "sa-east-1"
-	RegionUSEast1      Region = "us-east-1"
-	RegionUSEast2      Region = "us-east-2"
-	RegionUSWest1      Region = "us-west-1"
-	RegionUSWest2      Region = "us-west-2"
-)
-
 func (Region) VariableSchema() clusterv1.VariableSchema {
-	allRegions := []Region{
-		RegionAFSouth1,
-		RegionAPEast1,
-		RegionAPNorthEast1,
-		RegionAPNorthEast2,
-		RegionAPNorthEast3,
-		RegionAPSouth1,
-		RegionAPSouth2,
-		RegionAPSouthEast1,
-		RegionAPSouthEast2,
-		RegionAPSouthEast3,
-		RegionAPSouthEast4,
-		RegionCACentral1,
-		RegionEUCentral1,
-		RegionEUCentral2,
-		RegionEUNorth1,
-		RegionEUSouth1,
-		RegionEUSouth2,
-		RegionEUWest1,
-		RegionEUWest2,
-		RegionEUWest3,
-		RegionILCentral1,
-		RegionMECentral1,
-		RegionMESouth1,
-		RegionSAEast1,
-		RegionUSEast1,
-		RegionUSEast2,
-		RegionUSWest1,
-		RegionUSWest2,
-	}
-
 	return clusterv1.VariableSchema{
 		OpenAPIV3Schema: clusterv1.JSONSchemaProps{
 			Type:        "string",
-			Enum:        variables.MustMarshalValuesToEnumJSON(allRegions...),
-			Default:     variables.MustMarshal(RegionUSWest2),
+			Default:     variables.MustMarshal("us-west-2"),
 			Description: "AWS region to create cluster in",
 		},
 	}

pkg/handlers/aws/clusterconfig/variables_test.go

@@ -20,17 +20,10 @@ func TestVariableValidation(t *testing.T) {
 		true,
 		NewVariable,
 		capitest.VariableTestDef{
-			Name: "valid region",
+			Name: "specified region",
 			Vals: v1alpha1.AWSClusterConfigSpec{
-				Region: ptr.To(v1alpha1.RegionUSWest2),
+				Region: ptr.To(v1alpha1.Region("a-specified-region")),
 			},
 		},
-		capitest.VariableTestDef{
-			Name: "invalid region",
-			Vals: v1alpha1.AWSClusterConfigSpec{
-				Region: ptr.To(v1alpha1.Region("invalid region")),
-			},
-			ExpectError: true,
-		},
 	)
 }

pkg/handlers/aws/mutation/region/inject_test.go

@@ -12,7 +12,6 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 
-	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/request"
@@ -51,7 +50,7 @@ func TestGeneratePatches(t *testing.T) {
 			Vars: []runtimehooksv1.Variable{
 				capitest.VariableWithValue(
 					variableName,
-					v1alpha1.RegionUSWest1,
+					"a-specific-region",
 				),
 			},
 			RequestItem: newAWSClusterTemplateRequestItem("1234"),
@@ -61,7 +60,7 @@ func TestGeneratePatches(t *testing.T) {
 				ValueMatcher: gomega.Equal(map[string]interface{}{
 					"template": map[string]interface{}{
 						"spec": map[string]interface{}{
-							"region": string(v1alpha1.RegionUSWest1),
+							"region": "a-specific-region",
 						},
 					},
 				}),

pkg/handlers/aws/mutation/region/variables_test.go

@@ -23,10 +23,5 @@ func TestVariableValidation(t *testing.T) {
 			Name: "valid",
 			Vals: "us-west-2",
 		},
-		capitest.VariableTestDef{
-			Name:        "invalid",
-			Vals:        "invalid region",
-			ExpectError: true,
-		},
 	)
 }