diff --git a/README.md b/README.md index 68eca2a..5764912 100644 --- a/README.md +++ b/README.md @@ -135,15 +135,15 @@ t3a.medium 2 4 $ ec2-instance-selector --memory 4 --vcpus 2 --cpu-architecture x86_64 -r us-east-1 -o table-wide Instance Type VCPUs Mem (GiB) Hypervisor Current Gen Hibernation Support CPU Arch Network Performance ENIs GPUs GPU Mem (GiB) GPU Info On-Demand Price/Hr Spot Price/Hr (30d avg) ------------- ----- --------- ---------- ----------- ------------------- -------- ------------------- ---- ---- ------------- -------- ------------------ ----------------------- -c5.large 2 4 nitro true true x86_64 Up to 10 Gigabit 3 0 0 $0.085 $0.03706 -c5a.large 2 4 nitro true false x86_64 Up to 10 Gigabit 3 0 0 $0.077 $0.03592 +c5.large 2 4 nitro true true x86_64 Up to 10 Gigabit 3 0 0 $0.085 $0.04708 +c5a.large 2 4 nitro true false x86_64 Up to 10 Gigabit 3 0 0 $0.077 $0.03249 c5ad.large 2 4 nitro true false x86_64 Up to 10 Gigabit 3 0 0 $0.086 $0.0324 -c5d.large 2 4 nitro true true x86_64 Up to 10 Gigabit 3 0 0 $0.096 $0.03267 +c5d.large 2 4 nitro true true x86_64 Up to 10 Gigabit 3 0 0 $0.096 $0.03525 c6a.large 2 4 nitro true false x86_64 Up to 12.5 Gigabit 3 0 0 $0.0765 $0.034 -c6i.large 2 4 nitro true false x86_64 Up to 12.5 Gigabit 3 0 0 $0.085 $0.034 -t2.medium 2 4 xen true true i386, x86_64 Low to Moderate 3 0 0 $0.0464 $0.01417 +c6i.large 2 4 nitro true false x86_64 Up to 12.5 Gigabit 3 0 0 $0.085 $0.03416 +t2.medium 2 4 xen true true i386, x86_64 Low to Moderate 3 0 0 $0.0464 $0.01407 t3.medium 2 4 nitro true true x86_64 Up to 5 Gigabit 3 0 0 $0.0416 $0.0125 -t3a.medium 2 4 nitro true true x86_64 Up to 5 Gigabit 3 0 0 $0.0376 $0.0116 +t3a.medium 2 4 nitro true true x86_64 Up to 5 Gigabit 3 0 0 $0.0376 $0.01431 ``` **All CLI Options** @@ -165,44 +165,65 @@ ec2-instance-selector --vcpus 4 --region us-east-2 --availability-zones us-east- ec2-instance-selector --memory-min 4 --memory-max 8 --vcpus-min 4 --vcpus-max 8 --region us-east-2 Filter Flags: - --allow-list string List of allowed instance types to select from w/ regex syntax (Example: m[3-5]\.*) - -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] - --current-generation Current generation instance types (explicitly set this to false to not return current generation instance types) - --deny-list string List of instance types which should be excluded w/ regex syntax (Example: m[1-2]\.*) - --efa-support Instance types that support Elastic Fabric Adapters (EFA) - -e, --ena-support Instance types where ENA is supported or required - -f, --fpga-support FPGA instance types - --gpu-memory-total string Number of GPUs' total memory (Example: 4 GiB) (sets --gpu-memory-total-min and -max to the same value) - --gpu-memory-total-max string Maximum Number of GPUs' total memory (Example: 4 GiB) If --gpu-memory-total-min is not specified, the lower bound will be 0 - --gpu-memory-total-min string Minimum Number of GPUs' total memory (Example: 4 GiB) If --gpu-memory-total-max is not specified, the upper bound will be infinity - -g, --gpus int Total Number of GPUs (Example: 4) (sets --gpus-min and -max to the same value) - --gpus-max int Maximum Total Number of GPUs (Example: 4) If --gpus-min is not specified, the lower bound will be 0 - --gpus-min int Minimum Total Number of GPUs (Example: 4) If --gpus-max is not specified, the upper bound will be infinity - --hibernation-support Hibernation supported - --hypervisor string Hypervisor: [xen or nitro] - -m, --memory string Amount of Memory available (Example: 4 GiB) (sets --memory-min and -max to the same value) - --memory-max string Maximum Amount of Memory available (Example: 4 GiB) If --memory-min is not specified, the lower bound will be 0 - --memory-min string Minimum Amount of Memory available (Example: 4 GiB) If --memory-max is not specified, the upper bound will be infinity - --network-interfaces int Number of network interfaces (ENIs) that can be attached to the instance (sets --network-interfaces-min and -max to the same value) - --network-interfaces-max int Maximum Number of network interfaces (ENIs) that can be attached to the instance If --network-interfaces-min is not specified, the lower bound will be 0 - --network-interfaces-min int Minimum Number of network interfaces (ENIs) that can be attached to the instance If --network-interfaces-max is not specified, the upper bound will be infinity - --network-performance int Bandwidth in Gib/s of network performance (Example: 100) (sets --network-performance-min and -max to the same value) - --network-performance-max int Maximum Bandwidth in Gib/s of network performance (Example: 100) If --network-performance-min is not specified, the lower bound will be 0 - --network-performance-min int Minimum Bandwidth in Gib/s of network performance (Example: 100) If --network-performance-max is not specified, the upper bound will be infinity - --placement-group-strategy string Placement group strategy: [cluster, partition, spread] - --price-per-hour float Price/hour in USD (Example: 0.09) (sets --price-per-hour-min and -max to the same value) - --price-per-hour-max float Maximum Price/hour in USD (Example: 0.09) If --price-per-hour-min is not specified, the lower bound will be 0 - --price-per-hour-min float Minimum Price/hour in USD (Example: 0.09) If --price-per-hour-max is not specified, the upper bound will be infinity - --root-device-type string Supported root device types: [ebs or instance-store] - -u, --usage-class string Usage class: [spot or on-demand] - -c, --vcpus int Number of vcpus available to the instance type. (sets --vcpus-min and -max to the same value) - --vcpus-max int Maximum Number of vcpus available to the instance type. If --vcpus-min is not specified, the lower bound will be 0 - --vcpus-min int Minimum Number of vcpus available to the instance type. If --vcpus-max is not specified, the upper bound will be infinity - --vcpus-to-memory-ratio string The ratio of vcpus to GiBs of memory. (Example: 1:2) - --virtualization-type string Virtualization Type supported: [hvm or pv] + --allow-list string List of allowed instance types to select from w/ regex syntax (Example: m[3-5]\.*) + -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] + --current-generation Current generation instance types (explicitly set this to false to not return current generation instance types) + --deny-list string List of instance types which should be excluded w/ regex syntax (Example: m[1-2]\.*) + --disk-encryption EBS or local instance storage where encryption is supported or required + --disk-type string Disk Type: [hdd or ssd] + --ebs-optimized EBS Optimized is supported or default + --ebs-optimized-baseline-bandwidth string EBS Optimized baseline bandwidth (Example: 4 GiB) (sets --ebs-optimized-baseline-bandwidth-min and -max to the same value) + --ebs-optimized-baseline-bandwidth-max string Maximum EBS Optimized baseline bandwidth (Example: 4 GiB) If --ebs-optimized-baseline-bandwidth-min is not specified, the lower bound will be 0 + --ebs-optimized-baseline-bandwidth-min string Minimum EBS Optimized baseline bandwidth (Example: 4 GiB) If --ebs-optimized-baseline-bandwidth-max is not specified, the upper bound will be infinity + --ebs-optimized-baseline-iops int EBS Optimized baseline IOPS per second (Example: 10000) (sets --ebs-optimized-baseline-iops-min and -max to the same value) + --ebs-optimized-baseline-iops-max int Maximum EBS Optimized baseline IOPS per second (Example: 10000) If --ebs-optimized-baseline-iops-min is not specified, the lower bound will be 0 + --ebs-optimized-baseline-iops-min int Minimum EBS Optimized baseline IOPS per second (Example: 10000) If --ebs-optimized-baseline-iops-max is not specified, the upper bound will be infinity + --ebs-optimized-baseline-throughput string EBS Optimized baseline throughput per second (Example: 4 GiB) (sets --ebs-optimized-baseline-throughput-min and -max to the same value) + --ebs-optimized-baseline-throughput-max string Maximum EBS Optimized baseline throughput per second (Example: 4 GiB) If --ebs-optimized-baseline-throughput-min is not specified, the lower bound will be 0 + --ebs-optimized-baseline-throughput-min string Minimum EBS Optimized baseline throughput per second (Example: 4 GiB) If --ebs-optimized-baseline-throughput-max is not specified, the upper bound will be infinity + --efa-support Instance types that support Elastic Fabric Adapters (EFA) + -e, --ena-support Instance types where ENA is supported or required + -f, --fpga-support FPGA instance types + --gpu-memory-total string Number of GPUs' total memory (Example: 4 GiB) (sets --gpu-memory-total-min and -max to the same value) + --gpu-memory-total-max string Maximum Number of GPUs' total memory (Example: 4 GiB) If --gpu-memory-total-min is not specified, the lower bound will be 0 + --gpu-memory-total-min string Minimum Number of GPUs' total memory (Example: 4 GiB) If --gpu-memory-total-max is not specified, the upper bound will be infinity + -g, --gpus int Total Number of GPUs (Example: 4) (sets --gpus-min and -max to the same value) + --gpus-max int Maximum Total Number of GPUs (Example: 4) If --gpus-min is not specified, the lower bound will be 0 + --gpus-min int Minimum Total Number of GPUs (Example: 4) If --gpus-max is not specified, the upper bound will be infinity + --hibernation-support Hibernation supported + --hypervisor string Hypervisor: [xen or nitro] + --inference-accelerators int Total Number of inference accelerators (Example: 4) (sets --inference-accelerators-min and -max to the same value) + --inference-accelerators-max int Maximum Total Number of inference accelerators (Example: 4) If --inference-accelerators-min is not specified, the lower bound will be 0 + --inference-accelerators-min int Minimum Total Number of inference accelerators (Example: 4) If --inference-accelerators-max is not specified, the upper bound will be infinity + --instance-storage string Amount of local instance storage (Example: 4 GiB) (sets --instance-storage-min and -max to the same value) + --instance-storage-max string Maximum Amount of local instance storage (Example: 4 GiB) If --instance-storage-min is not specified, the lower bound will be 0 + --instance-storage-min string Minimum Amount of local instance storage (Example: 4 GiB) If --instance-storage-max is not specified, the upper bound will be infinity + --ipv6 Instance Types that support IPv6 + -m, --memory string Amount of Memory available (Example: 4 GiB) (sets --memory-min and -max to the same value) + --memory-max string Maximum Amount of Memory available (Example: 4 GiB) If --memory-min is not specified, the lower bound will be 0 + --memory-min string Minimum Amount of Memory available (Example: 4 GiB) If --memory-max is not specified, the upper bound will be infinity + --network-encryption Instance Types that support automatic network encryption in-transit + --network-interfaces int Number of network interfaces (ENIs) that can be attached to the instance (sets --network-interfaces-min and -max to the same value) + --network-interfaces-max int Maximum Number of network interfaces (ENIs) that can be attached to the instance If --network-interfaces-min is not specified, the lower bound will be 0 + --network-interfaces-min int Minimum Number of network interfaces (ENIs) that can be attached to the instance If --network-interfaces-max is not specified, the upper bound will be infinity + --network-performance int Bandwidth in Gib/s of network performance (Example: 100) (sets --network-performance-min and -max to the same value) + --network-performance-max int Maximum Bandwidth in Gib/s of network performance (Example: 100) If --network-performance-min is not specified, the lower bound will be 0 + --network-performance-min int Minimum Bandwidth in Gib/s of network performance (Example: 100) If --network-performance-max is not specified, the upper bound will be infinity + --nvme EBS or local instance storage where NVME is supported or required + --placement-group-strategy string Placement group strategy: [cluster, partition, spread] + --price-per-hour float Price/hour in USD (Example: 0.09) (sets --price-per-hour-min and -max to the same value) + --price-per-hour-max float Maximum Price/hour in USD (Example: 0.09) If --price-per-hour-min is not specified, the lower bound will be 0 + --price-per-hour-min float Minimum Price/hour in USD (Example: 0.09) If --price-per-hour-max is not specified, the upper bound will be infinity + --root-device-type string Supported root device types: [ebs or instance-store] + -u, --usage-class string Usage class: [spot or on-demand] + -c, --vcpus int Number of vcpus available to the instance type. (sets --vcpus-min and -max to the same value) + --vcpus-max int Maximum Number of vcpus available to the instance type. If --vcpus-min is not specified, the lower bound will be 0 + --vcpus-min int Minimum Number of vcpus available to the instance type. If --vcpus-max is not specified, the upper bound will be infinity + --vcpus-to-memory-ratio string The ratio of vcpus to GiBs of memory. (Example: 1:2) + --virtualization-type string Virtualization Type supported: [hvm or pv] Suite Flags: diff --git a/cmd/main.go b/cmd/main.go index ab4e5c7..e0c9ca2 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -54,30 +54,41 @@ const ( // Filter Flag Constants const ( - vcpus = "vcpus" - memory = "memory" - vcpusToMemoryRatio = "vcpus-to-memory-ratio" - cpuArchitecture = "cpu-architecture" - gpus = "gpus" - gpuMemoryTotal = "gpu-memory-total" - placementGroupStrategy = "placement-group-strategy" - usageClass = "usage-class" - rootDeviceType = "root-device-type" - enaSupport = "ena-support" - efaSupport = "efa-support" - hibernationSupport = "hibernation-support" - baremetal = "baremetal" - fpgaSupport = "fpga-support" - burstSupport = "burst-support" - hypervisor = "hypervisor" - availabilityZones = "availability-zones" - currentGeneration = "current-generation" - networkInterfaces = "network-interfaces" - networkPerformance = "network-performance" - allowList = "allow-list" - denyList = "deny-list" - virtualizationType = "virtualization-type" - pricePerHour = "price-per-hour" + vcpus = "vcpus" + memory = "memory" + vcpusToMemoryRatio = "vcpus-to-memory-ratio" + cpuArchitecture = "cpu-architecture" + gpus = "gpus" + gpuMemoryTotal = "gpu-memory-total" + inferenceAccelerators = "inference-accelerators" + placementGroupStrategy = "placement-group-strategy" + usageClass = "usage-class" + rootDeviceType = "root-device-type" + enaSupport = "ena-support" + efaSupport = "efa-support" + hibernationSupport = "hibernation-support" + baremetal = "baremetal" + fpgaSupport = "fpga-support" + burstSupport = "burst-support" + hypervisor = "hypervisor" + availabilityZones = "availability-zones" + currentGeneration = "current-generation" + networkInterfaces = "network-interfaces" + networkPerformance = "network-performance" + networkEncryption = "network-encryption" + ipv6 = "ipv6" + allowList = "allow-list" + denyList = "deny-list" + virtualizationType = "virtualization-type" + pricePerHour = "price-per-hour" + instanceStorage = "instance-storage" + diskType = "disk-type" + diskEncryption = "disk-encryption" + nvme = "nvme" + ebsOptimized = "ebs-optimized" + ebsOptimizedBaselineBandwidth = "ebs-optimized-baseline-bandwidth" + ebsOptimizedBaselineThroughput = "ebs-optimized-baseline-throughput" + ebsOptimizedBaselineIOPS = "ebs-optimized-baseline-iops" ) // Aggregate Filter Flags @@ -137,6 +148,7 @@ Full docs can be found at github.com/aws/amazon-` + binName 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.IntMinMaxRangeFlags(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.IntMinMaxRangeFlags(inferenceAccelerators, nil, nil, "Total Number of inference accelerators (Example: 4)") cli.StringOptionsFlag(placementGroupStrategy, nil, nil, "Placement group strategy: [cluster, partition, spread]", []string{"cluster", "partition", "spread"}) cli.StringOptionsFlag(usageClass, cli.StringMe("u"), nil, "Usage class: [spot or on-demand]", []string{"spot", "on-demand"}) cli.StringOptionsFlag(rootDeviceType, nil, nil, "Supported root device types: [ebs or instance-store]", []string{"ebs", "instance-store"}) @@ -151,10 +163,20 @@ Full docs can be found at github.com/aws/amazon-` + binName cli.BoolFlag(currentGeneration, nil, nil, "Current generation instance types (explicitly set this to false to not return current generation instance types)") cli.IntMinMaxRangeFlags(networkInterfaces, nil, nil, "Number of network interfaces (ENIs) that can be attached to the instance") cli.IntMinMaxRangeFlags(networkPerformance, nil, nil, "Bandwidth in Gib/s of network performance (Example: 100)") + cli.BoolFlag(networkEncryption, nil, nil, "Instance Types that support automatic network encryption in-transit") + cli.BoolFlag(ipv6, nil, nil, "Instance Types that support IPv6") cli.RegexFlag(allowList, nil, nil, "List of allowed instance types to select from w/ regex syntax (Example: m[3-5]\\.*)") cli.RegexFlag(denyList, nil, nil, "List of instance types which should be excluded w/ regex syntax (Example: m[1-2]\\.*)") cli.StringOptionsFlag(virtualizationType, nil, nil, "Virtualization Type supported: [hvm or pv]", []string{"hvm", "paravirtual", "pv"}) cli.Float64MinMaxRangeFlags(pricePerHour, nil, nil, "Price/hour in USD (Example: 0.09)") + cli.ByteQuantityMinMaxRangeFlags(instanceStorage, nil, nil, "Amount of local instance storage (Example: 4 GiB)") + cli.StringOptionsFlag(diskType, nil, nil, "Disk Type: [hdd or ssd]", []string{"hdd", "ssd"}) + cli.BoolFlag(nvme, nil, nil, "EBS or local instance storage where NVME is supported or required") + cli.BoolFlag(diskEncryption, nil, nil, "EBS or local instance storage where encryption is supported or required") + cli.BoolFlag(ebsOptimized, nil, nil, "EBS Optimized is supported or default") + cli.ByteQuantityMinMaxRangeFlags(ebsOptimizedBaselineBandwidth, nil, nil, "EBS Optimized baseline bandwidth (Example: 4 GiB)") + cli.ByteQuantityMinMaxRangeFlags(ebsOptimizedBaselineThroughput, nil, nil, "EBS Optimized baseline throughput per second (Example: 4 GiB)") + cli.IntMinMaxRangeFlags(ebsOptimizedBaselineIOPS, nil, nil, "EBS Optimized baseline IOPS per second (Example: 10000)") // Suite Flags - higher level aggregate filters that return opinionated result @@ -230,35 +252,46 @@ Full docs can be found at github.com/aws/amazon-` + binName } filters := selector.Filters{ - VCpusRange: cli.IntRangeMe(flags[vcpus]), - MemoryRange: cli.ByteQuantityRangeMe(flags[memory]), - VCpusToMemoryRatio: cli.Float64Me(flags[vcpusToMemoryRatio]), - CPUArchitecture: cli.StringMe(flags[cpuArchitecture]), - GpusRange: cli.IntRangeMe(flags[gpus]), - GpuMemoryRange: cli.ByteQuantityRangeMe(flags[gpuMemoryTotal]), - PlacementGroupStrategy: cli.StringMe(flags[placementGroupStrategy]), - UsageClass: cli.StringMe(flags[usageClass]), - RootDeviceType: cli.StringMe(flags[rootDeviceType]), - EnaSupport: cli.BoolMe(flags[enaSupport]), - EfaSupport: cli.BoolMe(flags[efaSupport]), - HibernationSupported: cli.BoolMe(flags[hibernationSupport]), - Hypervisor: cli.StringMe(flags[hypervisor]), - BareMetal: cli.BoolMe(flags[baremetal]), - Fpga: cli.BoolMe(flags[fpgaSupport]), - Burstable: cli.BoolMe(flags[burstSupport]), - Region: cli.StringMe(flags[region]), - AvailabilityZones: cli.StringSliceMe(flags[availabilityZones]), - CurrentGeneration: cli.BoolMe(flags[currentGeneration]), - MaxResults: cli.IntMe(flags[maxResults]), - NetworkInterfaces: cli.IntRangeMe(flags[networkInterfaces]), - NetworkPerformance: cli.IntRangeMe(flags[networkPerformance]), - AllowList: cli.RegexMe(flags[allowList]), - DenyList: cli.RegexMe(flags[denyList]), - InstanceTypeBase: cli.StringMe(flags[instanceTypeBase]), - Flexible: cli.BoolMe(flags[flexible]), - Service: cli.StringMe(flags[service]), - VirtualizationType: cli.StringMe(flags[virtualizationType]), - PricePerHour: cli.Float64RangeMe(flags[pricePerHour]), + VCpusRange: cli.IntRangeMe(flags[vcpus]), + MemoryRange: cli.ByteQuantityRangeMe(flags[memory]), + VCpusToMemoryRatio: cli.Float64Me(flags[vcpusToMemoryRatio]), + CPUArchitecture: cli.StringMe(flags[cpuArchitecture]), + GpusRange: cli.IntRangeMe(flags[gpus]), + GpuMemoryRange: cli.ByteQuantityRangeMe(flags[gpuMemoryTotal]), + InferenceAcceleratorsRange: cli.IntRangeMe(flags[inferenceAccelerators]), + PlacementGroupStrategy: cli.StringMe(flags[placementGroupStrategy]), + UsageClass: cli.StringMe(flags[usageClass]), + RootDeviceType: cli.StringMe(flags[rootDeviceType]), + EnaSupport: cli.BoolMe(flags[enaSupport]), + EfaSupport: cli.BoolMe(flags[efaSupport]), + HibernationSupported: cli.BoolMe(flags[hibernationSupport]), + Hypervisor: cli.StringMe(flags[hypervisor]), + BareMetal: cli.BoolMe(flags[baremetal]), + Fpga: cli.BoolMe(flags[fpgaSupport]), + Burstable: cli.BoolMe(flags[burstSupport]), + Region: cli.StringMe(flags[region]), + AvailabilityZones: cli.StringSliceMe(flags[availabilityZones]), + CurrentGeneration: cli.BoolMe(flags[currentGeneration]), + MaxResults: cli.IntMe(flags[maxResults]), + NetworkInterfaces: cli.IntRangeMe(flags[networkInterfaces]), + NetworkPerformance: cli.IntRangeMe(flags[networkPerformance]), + NetworkEncryption: cli.BoolMe(flags[networkEncryption]), + IPv6: cli.BoolMe(flags[ipv6]), + AllowList: cli.RegexMe(flags[allowList]), + DenyList: cli.RegexMe(flags[denyList]), + InstanceTypeBase: cli.StringMe(flags[instanceTypeBase]), + Flexible: cli.BoolMe(flags[flexible]), + Service: cli.StringMe(flags[service]), + VirtualizationType: cli.StringMe(flags[virtualizationType]), + PricePerHour: cli.Float64RangeMe(flags[pricePerHour]), + InstanceStorageRange: cli.ByteQuantityRangeMe(flags[instanceStorage]), + DiskType: cli.StringMe(flags[diskType]), + DiskEncryption: cli.BoolMe(flags[diskEncryption]), + NVME: cli.BoolMe(flags[nvme]), + EBSOptimized: cli.BoolMe(flags[ebsOptimized]), + EBSOptimizedBaselineBandwidth: cli.ByteQuantityRangeMe(flags[ebsOptimizedBaselineBandwidth]), + EBSOptimizedBaselineThroughput: cli.ByteQuantityRangeMe(flags[ebsOptimizedBaselineThroughput]), + EBSOptimizedBaselineIOPS: cli.IntRangeMe(flags[ebsOptimizedBaselineIOPS]), } if flags[verbose] != nil { diff --git a/go.mod b/go.mod index d84e7ff..a045201 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/aws/amazon-ec2-instance-selector/v2 go 1.17 require ( - github.com/aws/aws-sdk-go v1.38.27 + github.com/aws/aws-sdk-go v1.43.31 github.com/blang/semver/v4 v4.0.0 github.com/ghodss/yaml v1.0.0 github.com/hashicorp/hcl v1.0.0 diff --git a/go.sum b/go.sum index 740aef8..7f0c4e5 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/aws/aws-sdk-go v1.38.27 h1:jQAUnMGWH33STZ7djdeSlNlXZf/Jhuij9172x7U5/HE= -github.com/aws/aws-sdk-go v1.38.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.43.31 h1:yJZIr8nMV1hXjAvvOLUFqZRJcHV7udPQBfhJqawDzI0= +github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= @@ -125,16 +125,14 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -144,10 +142,11 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/pkg/selector/comparators.go b/pkg/selector/comparators.go index 193a2d5..33c8bb1 100644 --- a/pkg/selector/comparators.go +++ b/pkg/selector/comparators.go @@ -111,6 +111,17 @@ func isSupportedWithBool(instanceTypeValue *bool, target *bool) bool { // Helper functions for aggregating data parsed from AWS API calls +func getTotalAcceleratorsCount(acceleratorInfo *ec2.InferenceAcceleratorInfo) *int64 { + if acceleratorInfo == nil { + return nil + } + total := aws.Int64(0) + for _, accel := range acceleratorInfo.Accelerators { + total = aws.Int64(*total + *accel.Count) + } + return total +} + func getTotalGpusCount(gpusInfo *ec2.GpuInfo) *int64 { if gpusInfo == nil { return nil @@ -153,13 +164,68 @@ func getNetworkPerformance(networkPerformance *string) *int { return aws.Int(bandwidthNumber) } -// supportSyntaxToBool takes an instance spec field that uses ["unsupported", "supported", or "required"] +func getInstanceStorage(instanceStorageInfo *ec2.InstanceStorageInfo) *int64 { + if instanceStorageInfo == nil { + return aws.Int64(0) + } + return aws.Int64(*instanceStorageInfo.TotalSizeInGB * 1024) +} + +func getDiskType(instanceStorageInfo *ec2.InstanceStorageInfo) *string { + if instanceStorageInfo == nil || len(instanceStorageInfo.Disks) == 0 { + return nil + } + return instanceStorageInfo.Disks[0].Type +} + +func getNVMESupport(instanceStorageInfo *ec2.InstanceStorageInfo, ebsInfo *ec2.EbsInfo) *bool { + if instanceStorageInfo != nil { + return supportSyntaxToBool(instanceStorageInfo.NvmeSupport) + } + if ebsInfo != nil { + return supportSyntaxToBool(ebsInfo.EbsOptimizedSupport) + } + return aws.Bool(false) +} + +func getDiskEncryptionSupport(instanceStorageInfo *ec2.InstanceStorageInfo, ebsInfo *ec2.EbsInfo) *bool { + if instanceStorageInfo != nil { + return supportSyntaxToBool(instanceStorageInfo.EncryptionSupport) + } + if ebsInfo != nil { + return supportSyntaxToBool(ebsInfo.EncryptionSupport) + } + return aws.Bool(false) +} + +func getEBSOptimizedBaselineBandwidth(ebsInfo *ec2.EbsInfo) *int64 { + if ebsInfo == nil || ebsInfo.EbsOptimizedInfo == nil { + return nil + } + return ebsInfo.EbsOptimizedInfo.BaselineBandwidthInMbps +} + +func getEBSOptimizedBaselineThroughput(ebsInfo *ec2.EbsInfo) *float64 { + if ebsInfo == nil || ebsInfo.EbsOptimizedInfo == nil { + return nil + } + return ebsInfo.EbsOptimizedInfo.BaselineThroughputInMBps +} + +func getEBSOptimizedBaselineIOPS(ebsInfo *ec2.EbsInfo) *int64 { + if ebsInfo == nil || ebsInfo.EbsOptimizedInfo == nil { + return nil + } + return ebsInfo.EbsOptimizedInfo.BaselineIops +} + +// supportSyntaxToBool takes an instance spec field that uses ["unsupported", "supported", "required", or "default"] // and transforms it to a *bool to use in filter execution func supportSyntaxToBool(instanceTypeSupport *string) *bool { if instanceTypeSupport == nil { return nil } - if strings.ToLower(*instanceTypeSupport) == required || strings.ToLower(*instanceTypeSupport) == supported { + if strings.ToLower(*instanceTypeSupport) == required || strings.ToLower(*instanceTypeSupport) == supported || strings.ToLower(*instanceTypeSupport) == "default" { return aws.Bool(true) } return aws.Bool(false) diff --git a/pkg/selector/selector.go b/pkg/selector/selector.go index 8e03e6a..a7c668b 100644 --- a/pkg/selector/selector.go +++ b/pkg/selector/selector.go @@ -47,29 +47,40 @@ const ( // Filter Keys - cpuArchitecture = "cpuArchitecture" - usageClass = "usageClass" - rootDeviceType = "rootDeviceType" - hibernationSupported = "hibernationSupported" - vcpusRange = "vcpusRange" - memoryRange = "memoryRange" - gpuMemoryRange = "gpuMemoryRange" - gpusRange = "gpusRange" - placementGroupStrategy = "placementGroupStrategy" - hypervisor = "hypervisor" - baremetal = "baremetal" - burstable = "burstable" - fpga = "fpga" - enaSupport = "enaSupport" - efaSupport = "efaSupport" - vcpusToMemoryRatio = "vcpusToMemoryRatio" - currentGeneration = "currentGeneration" - networkInterfaces = "networkInterfaces" - networkPerformance = "networkPerformance" - allowList = "allowList" - denyList = "denyList" - instanceTypes = "instanceTypes" - virtualizationType = "virtualizationType" + cpuArchitecture = "cpuArchitecture" + usageClass = "usageClass" + rootDeviceType = "rootDeviceType" + hibernationSupported = "hibernationSupported" + vcpusRange = "vcpusRange" + memoryRange = "memoryRange" + gpuMemoryRange = "gpuMemoryRange" + gpusRange = "gpusRange" + inferenceAcceleratorsRange = "inferenceAcceleratorsRange" + placementGroupStrategy = "placementGroupStrategy" + hypervisor = "hypervisor" + baremetal = "baremetal" + burstable = "burstable" + fpga = "fpga" + enaSupport = "enaSupport" + efaSupport = "efaSupport" + vcpusToMemoryRatio = "vcpusToMemoryRatio" + currentGeneration = "currentGeneration" + networkInterfaces = "networkInterfaces" + networkPerformance = "networkPerformance" + networkEncryption = "networkEncryption" + ipv6 = "ipv6" + allowList = "allowList" + denyList = "denyList" + instanceTypes = "instanceTypes" + virtualizationType = "virtualizationType" + instanceStorageRange = "instanceStorageRange" + diskEncryption = "diskEncryption" + diskType = "diskType" + nvme = "nvme" + ebsOptimized = "ebsOptimized" + ebsOptimizedBaselineBandwidth = "ebsOptimizedBaselineBandwidth" + ebsOptimizedBaselineIOPS = "ebsOptimizedBaselineIOPS" + ebsOptimizedBaselineThroughput = "ebsOptimizedBaselineThroughput" cpuArchitectureAMD64 = "amd64" cpuArchitectureX8664 = "x86_64" @@ -237,28 +248,39 @@ func (itf Selector) rawFilter(filters Filters) ([]*instancetypes.Details, error) // 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}, - usageClass: {filters.UsageClass, instanceTypeInfo.SupportedUsageClasses}, - rootDeviceType: {filters.RootDeviceType, instanceTypeInfo.SupportedRootDeviceTypes}, - hibernationSupported: {filters.HibernationSupported, instanceTypeInfo.HibernationSupported}, - vcpusRange: {filters.VCpusRange, instanceTypeInfo.VCpuInfo.DefaultVCpus}, - memoryRange: {filters.MemoryRange, instanceTypeInfo.MemoryInfo.SizeInMiB}, - gpuMemoryRange: {filters.GpuMemoryRange, getTotalGpuMemory(instanceTypeInfo.GpuInfo)}, - gpusRange: {filters.GpusRange, getTotalGpusCount(instanceTypeInfo.GpuInfo)}, - placementGroupStrategy: {filters.PlacementGroupStrategy, instanceTypeInfo.PlacementGroupInfo.SupportedStrategies}, - hypervisor: {filters.Hypervisor, instanceTypeInfo.Hypervisor}, - baremetal: {filters.BareMetal, instanceTypeInfo.BareMetal}, - burstable: {filters.Burstable, instanceTypeInfo.BurstablePerformanceSupported}, - fpga: {filters.Fpga, &isFpga}, - enaSupport: {filters.EnaSupport, supportSyntaxToBool(instanceTypeInfo.NetworkInfo.EnaSupport)}, - efaSupport: {filters.EfaSupport, instanceTypeInfo.NetworkInfo.EfaSupported}, - vcpusToMemoryRatio: {filters.VCpusToMemoryRatio, calculateVCpusToMemoryRatio(instanceTypeInfo.VCpuInfo.DefaultVCpus, instanceTypeInfo.MemoryInfo.SizeInMiB)}, - currentGeneration: {filters.CurrentGeneration, instanceTypeInfo.CurrentGeneration}, - networkInterfaces: {filters.NetworkInterfaces, instanceTypeInfo.NetworkInfo.MaximumNetworkInterfaces}, - networkPerformance: {filters.NetworkPerformance, getNetworkPerformance(instanceTypeInfo.NetworkInfo.NetworkPerformance)}, - instanceTypes: {filters.InstanceTypes, instanceTypeInfo.InstanceType}, - virtualizationType: {filters.VirtualizationType, instanceTypeInfo.SupportedVirtualizationTypes}, - pricePerHour: {filters.PricePerHour, &instanceTypeHourlyPriceForFilter}, + cpuArchitecture: {filters.CPUArchitecture, instanceTypeInfo.ProcessorInfo.SupportedArchitectures}, + usageClass: {filters.UsageClass, instanceTypeInfo.SupportedUsageClasses}, + rootDeviceType: {filters.RootDeviceType, instanceTypeInfo.SupportedRootDeviceTypes}, + hibernationSupported: {filters.HibernationSupported, instanceTypeInfo.HibernationSupported}, + vcpusRange: {filters.VCpusRange, instanceTypeInfo.VCpuInfo.DefaultVCpus}, + memoryRange: {filters.MemoryRange, instanceTypeInfo.MemoryInfo.SizeInMiB}, + gpuMemoryRange: {filters.GpuMemoryRange, getTotalGpuMemory(instanceTypeInfo.GpuInfo)}, + gpusRange: {filters.GpusRange, getTotalGpusCount(instanceTypeInfo.GpuInfo)}, + inferenceAcceleratorsRange: {filters.InferenceAcceleratorsRange, getTotalAcceleratorsCount(instanceTypeInfo.InferenceAcceleratorInfo)}, + placementGroupStrategy: {filters.PlacementGroupStrategy, instanceTypeInfo.PlacementGroupInfo.SupportedStrategies}, + hypervisor: {filters.Hypervisor, instanceTypeInfo.Hypervisor}, + baremetal: {filters.BareMetal, instanceTypeInfo.BareMetal}, + burstable: {filters.Burstable, instanceTypeInfo.BurstablePerformanceSupported}, + fpga: {filters.Fpga, &isFpga}, + enaSupport: {filters.EnaSupport, supportSyntaxToBool(instanceTypeInfo.NetworkInfo.EnaSupport)}, + efaSupport: {filters.EfaSupport, instanceTypeInfo.NetworkInfo.EfaSupported}, + vcpusToMemoryRatio: {filters.VCpusToMemoryRatio, calculateVCpusToMemoryRatio(instanceTypeInfo.VCpuInfo.DefaultVCpus, instanceTypeInfo.MemoryInfo.SizeInMiB)}, + currentGeneration: {filters.CurrentGeneration, instanceTypeInfo.CurrentGeneration}, + networkInterfaces: {filters.NetworkInterfaces, instanceTypeInfo.NetworkInfo.MaximumNetworkInterfaces}, + networkPerformance: {filters.NetworkPerformance, getNetworkPerformance(instanceTypeInfo.NetworkInfo.NetworkPerformance)}, + networkEncryption: {filters.NetworkEncryption, instanceTypeInfo.NetworkInfo.EncryptionInTransitSupported}, + ipv6: {filters.IPv6, instanceTypeInfo.NetworkInfo.Ipv6Supported}, + instanceTypes: {filters.InstanceTypes, instanceTypeInfo.InstanceType}, + virtualizationType: {filters.VirtualizationType, instanceTypeInfo.SupportedVirtualizationTypes}, + pricePerHour: {filters.PricePerHour, &instanceTypeHourlyPriceForFilter}, + instanceStorageRange: {filters.InstanceStorageRange, getInstanceStorage(instanceTypeInfo.InstanceStorageInfo)}, + diskType: {filters.DiskType, getDiskType(instanceTypeInfo.InstanceStorageInfo)}, + nvme: {filters.NVME, getNVMESupport(instanceTypeInfo.InstanceStorageInfo, instanceTypeInfo.EbsInfo)}, + ebsOptimized: {filters.EBSOptimized, supportSyntaxToBool(instanceTypeInfo.EbsInfo.EbsOptimizedSupport)}, + diskEncryption: {filters.DiskEncryption, getDiskEncryptionSupport(instanceTypeInfo.InstanceStorageInfo, instanceTypeInfo.EbsInfo)}, + ebsOptimizedBaselineBandwidth: {filters.EBSOptimizedBaselineBandwidth, getEBSOptimizedBaselineBandwidth(instanceTypeInfo.EbsInfo)}, + ebsOptimizedBaselineThroughput: {filters.EBSOptimizedBaselineThroughput, getEBSOptimizedBaselineThroughput(instanceTypeInfo.EbsInfo)}, + ebsOptimizedBaselineIOPS: {filters.EBSOptimizedBaselineIOPS, getEBSOptimizedBaselineIOPS(instanceTypeInfo.EbsInfo)}, } if isInDenyList(filters.DenyList, instanceTypeName) || !isInAllowList(filters.AllowList, instanceTypeName) { @@ -371,13 +393,17 @@ func (itf Selector) executeFilters(filterToInstanceSpecMapping map[string]filter return false, nil } case *int64: - mibRange := Uint64RangeFilter{ - LowerBound: filter.LowerBound.Quantity, - UpperBound: filter.UpperBound.Quantity, - } if !isSupportedWithRangeUint64(iSpec, &mibRange) { return false, nil } + case *float64: + floatMiBRange := Float64RangeFilter{ + LowerBound: float64(filter.LowerBound.Quantity), + UpperBound: float64(filter.UpperBound.Quantity), + } + if !isSupportedWithRangeFloat64(iSpec, &floatMiBRange) { + return false, nil + } default: return false, fmt.Errorf(invalidInstanceSpecTypeMsg) } diff --git a/pkg/selector/types.go b/pkg/selector/types.go index 1634f26..ab77dc3 100644 --- a/pkg/selector/types.go +++ b/pkg/selector/types.go @@ -137,6 +137,9 @@ type Filters struct { // GpuMemoryRange filter is a range of acceptable GPU memory in Gibibytes (GiB) available to an EC2 instance type in aggreagte across all GPUs. GpuMemoryRange *ByteQuantityRangeFilter + // InferenceAcceleratorsRange filters inference acclerators available to the instance type + InferenceAcceleratorsRange *IntRangeFilter + // HibernationSupported denotes whether EC2 hibernate is supported // Possible values are: true or false HibernationSupported *bool @@ -157,6 +160,12 @@ type Filters struct { // NetworkPerformance filter is a range of network bandwidth an instance type can support NetworkPerformance *IntRangeFilter + // NetworkEncryption filters for instance types that automatically encrypt network traffic in-transit + NetworkEncryption *bool + + // IPv6 filters for instance types that support IPv6 + IPv6 *bool + // PlacementGroupStrategy is used to return instance types based on its support // for a specific placement group strategy // Possible values are: cluster, spread, or partition @@ -206,4 +215,29 @@ type Filters struct { // PricePerHour is used to return instance types that are equal to or cheaper than the specified price PricePerHour *Float64RangeFilter + + // InstanceStorageRange filters on a range of storage available as local disk + InstanceStorageRange *ByteQuantityRangeFilter + + // DiskType is the backing storage medium + // Possible values are: hdd or ssd + DiskType *string + + // NVME filters for NVME disks, including both EBS and local instance storage + NVME *bool + + // EBSOptimized filters for instance types that support EBS Optimized + EBSOptimized *bool + + // DiskEncryption filters for instance types that support EBS Encryption or local storage encryption + DiskEncryption *bool + + // EBSOptimizedBaselineBandwidth filters on a range of bandwidth that an EBS Optimized volume supports + EBSOptimizedBaselineBandwidth *ByteQuantityRangeFilter + + // EBSOptimizedBaselineThroughput filters on a range of throughput that an EBS Optimized volume supports + EBSOptimizedBaselineThroughput *ByteQuantityRangeFilter + + // EBSOptimizedBaselineIOPS filters on a range of IOPS that an EBS Optimized volume supports + EBSOptimizedBaselineIOPS *IntRangeFilter }