case insensitive selector evaluation for strings

Author: bwagner5

README.md

@@ -395,8 +395,8 @@ Filter Flags:
   -z, --availability-zones strings                     Availability zones or zone ids to check EC2 capacity offered in specific AZs
       --baremetal                                      Bare Metal instance types (.metal instances)
   -b, --burst-support                                  Burstable instance types
-  -a, --cpu-architecture string                        CPU architecture [x86_64, amd64, x86_64_mac, i386, or arm64]
-      --cpu-manufacturer string                        CPU manufacturer [amd, intel, aws]
+  -a, --cpu-architecture string                        CPU architecture [x86_64, amd64, x86_64_mac, i386, arm64, or arm64_mac]
+      --cpu-manufacturer string                        CPU manufacturer [amd, intel, aws, apple]
       --current-generation                             Current generation instance types (explicitly set this to false to not return current generation instance types)
       --dedicated-hosts                                Dedicated Hosts supported
       --deny-list string                               List of instance types which should be excluded w/ regex syntax (Example: m[1-2]\.*)

cmd/main.go

@@ -168,8 +168,8 @@ Full docs can be found at github.com/aws/amazon-` + binName
 	cli.Int32MinMaxRangeFlags(vcpus, cli.StringMe("c"), nil, "Number of vcpus available to the instance type.")
 	cli.ByteQuantityMinMaxRangeFlags(memory, cli.StringMe("m"), nil, "Amount of Memory available (Example: 4 GiB)")
 	cli.RatioFlag(vcpusToMemoryRatio, nil, nil, "The ratio of vcpus to GiBs of memory. (Example: 1:2)")
-	cli.StringOptionsFlag(cpuArchitecture, cli.StringMe("a"), nil, "CPU architecture [x86_64, amd64, x86_64_mac, i386, or arm64]", []string{"x86_64", "x86_64_mac", "amd64", "i386", "arm64"})
-	cli.StringOptionsFlag(cpuManufacturer, nil, nil, "CPU manufacturer [amd, intel, aws]", []string{"amd", "intel", "aws"})
+	cli.StringOptionsFlag(cpuArchitecture, cli.StringMe("a"), nil, "CPU architecture [x86_64, amd64, x86_64_mac, i386, arm64, or arm64_mac]", []string{"x86_64", "x86_64_mac", "amd64", "i386", "arm64", "arm64_mac"})
+	cli.StringOptionsFlag(cpuManufacturer, nil, nil, "CPU manufacturer [amd, intel, aws, apple]", []string{"amd", "intel", "aws", "apple"})
 	cli.Int32MinMaxRangeFlags(gpus, cli.StringMe("g"), nil, "Total Number of GPUs (Example: 4)")
 	cli.ByteQuantityMinMaxRangeFlags(gpuMemoryTotal, nil, nil, "Number of GPUs' total memory (Example: 4 GiB)")
 	cli.StringFlag(gpuManufacturer, nil, nil, "GPU Manufacturer name (Example: NVIDIA)", nil)

pkg/cli/flags.go

@@ -386,7 +386,7 @@ func (cl *CommandLineInterface) StringOptionsFlagOnFlagSet(flagSet *pflag.FlagSe
 			return nil
 		}
 		for _, v := range validOpts {
-			if v == *val.(*string) {
+			if strings.EqualFold(v, *val.(*string)) {
 				return nil
 			}
 		}

pkg/selector/comparators.go

@@ -29,7 +29,6 @@ const (
 )
 
 var (
-	amdRegex      = regexp.MustCompile(`[a-zA-Z0-9]+a\\.[a-zA-Z0-9]`)
 	networkPerfRE = regexp.MustCompile(`[0-9]+ Gigabit`)
 	generationRE  = regexp.MustCompile(`[a-zA-Z]+([0-9]+)`)
 )
@@ -41,7 +40,7 @@ func isSupportedFromString(instanceTypeValue *string, target *string) bool {
 	if instanceTypeValue == nil {
 		return false
 	}
-	return *instanceTypeValue == *target
+	return strings.EqualFold(*instanceTypeValue, *target)
 }
 
 func isSupportedFromStrings(instanceTypeValues []*string, target *string) bool {
@@ -83,7 +82,7 @@ func isSupportedUsageClassType(instanceTypeValue []ec2types.UsageClassType, targ
 	}
 
 	for _, potentialType := range instanceTypeValue {
-		if potentialType == *target {
+		if strings.EqualFold(string(potentialType), string(*target)) {
 			return true
 		}
 	}
@@ -102,7 +101,7 @@ func isSupportedArchitectureType(instanceTypeValue []ec2types.ArchitectureType,
 	}
 
 	for _, potentialType := range instanceTypeValue {
-		if potentialType == *target {
+		if strings.EqualFold(string(potentialType), string(*target)) {
 			return true
 		}
 	}
@@ -120,7 +119,7 @@ func isSupportedVirtualizationType(instanceTypeValue []ec2types.VirtualizationTy
 		return true
 	}
 	for _, potentialType := range instanceTypeValue {
-		if potentialType == *target {
+		if strings.EqualFold(string(potentialType), string(*target)) {
 			return true
 		}
 	}
@@ -134,7 +133,7 @@ func isSupportedInstanceTypeHypervisorType(instanceTypeValue ec2types.InstanceTy
 	if reflect.ValueOf(*target).IsZero() {
 		return true
 	}
-	if instanceTypeValue == *target {
+	if strings.EqualFold(string(instanceTypeValue), string(*target)) {
 		return true
 	}
 	return false
@@ -151,7 +150,7 @@ func isSupportedRootDeviceType(instanceTypeValue []ec2types.RootDeviceType, targ
 		return true
 	}
 	for _, potentialType := range instanceTypeValue {
-		if potentialType == *target {
+		if strings.EqualFold(string(potentialType), string(*target)) {
 			return true
 		}
 	}
@@ -165,7 +164,7 @@ func isMatchingCpuArchitecture(instanceTypeValue CPUManufacturer, target *CPUMan
 	if reflect.ValueOf(*target).IsZero() {
 		return true
 	}
-	if instanceTypeValue == *target {
+	if strings.EqualFold(string(instanceTypeValue), string(*target)) {
 		return true
 	}
 	return false
@@ -376,19 +375,6 @@ func getEBSOptimizedBaselineIOPS(ebsInfo *ec2types.EbsInfo) *int32 {
 	return ebsInfo.EbsOptimizedInfo.BaselineIops
 }
 
-func getCPUManufacturer(instanceTypeInfo *ec2types.InstanceTypeInfo) CPUManufacturer {
-	for _, it := range instanceTypeInfo.ProcessorInfo.SupportedArchitectures {
-		if it == ec2types.ArchitectureTypeArm64 {
-			return CPUManufacturerAWS
-		}
-	}
-
-	if amdRegex.Match([]byte(instanceTypeInfo.InstanceType)) {
-		return CPUManufacturerAMD
-	}
-	return CPUManufacturerIntel
-}
-
 // getInstanceTypeGeneration returns the generation from an instance type name
 // i.e. c7i.xlarge -> 7
 // if any error occurs, 0 will be returned.

pkg/selector/selector.go

@@ -309,11 +309,16 @@ func (s Selector) prepareFilter(ctx context.Context, filters Filters, instanceTy
 		filterInstanceTypes = nil
 	}
 
+	var cpuManufacturerFilter *string
+	if filters.CPUManufacturer != nil {
+		cpuManufacturerFilter = aws.String(string(*filters.CPUManufacturer))
+	}
+
 	// filterToInstanceSpecMappingPairs is a map of filter name [key] to filter pair [value].
 	// A filter pair includes user input filter value and instance spec value retrieved from DescribeInstanceTypes
 	filterToInstanceSpecMappingPairs := map[string]filterPair{
 		cpuArchitecture:                  {filters.CPUArchitecture, instanceTypeInfo.ProcessorInfo.SupportedArchitectures},
-		cpuManufacturer:                  {filters.CPUManufacturer, getCPUManufacturer(&instanceTypeInfo.InstanceTypeInfo)},
+		cpuManufacturer:                  {cpuManufacturerFilter, instanceTypeInfo.ProcessorInfo.Manufacturer},
 		usageClass:                       {filters.UsageClass, instanceTypeInfo.SupportedUsageClasses},
 		rootDeviceType:                   {filters.RootDeviceType, instanceTypeInfo.SupportedRootDeviceTypes},
 		hibernationSupported:             {filters.HibernationSupported, instanceTypeInfo.HibernationSupported},