d/ec2_instance_type #13124

lde · 2020-05-01T14:59:46Z

Community Note

Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Release note for CHANGELOG:

New datasource ec2_instance_type to get characteristics about ec2 instance type

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccDataSourceAwsEc2InstanceType_attributes'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccDataSourceAwsEc2InstanceType_attributes -timeout 120m
=== RUN   TestAccDataSourceAwsEc2InstanceType_attributes
=== PAUSE TestAccDataSourceAwsEc2InstanceType_attributes
=== CONT  TestAccDataSourceAwsEc2InstanceType_attributes
--- PASS: TestAccDataSourceAwsEc2InstanceType_attributes (35.07s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	35.098s
...

ewbankkit · 2020-05-01T20:35:50Z

Closes #10989.

YakDriver · 2020-07-29T19:12:31Z

@lde Thank you for your effort on this! At first glance, this looks great and I'd like to help get this moving. Would you be willing to rebase?

lde · 2020-07-30T16:02:48Z

@lde Thank you for your effort on this! At first glance, this looks great and I'd like to help get this moving. Would you be willing to rebase?

Hi @YakDriver I've rebased my pr, it should be ready to merge.

iyuroch · 2020-09-07T11:50:15Z

Hi @YakDriver , we need this feature in one of our terraform modules, when can we expect this to be merged in?

YakDriver

This is looking great! Thank you for your work. It needs a few fixes. Let me know if you're willing to make the changes.

aws/data_source_aws_ec2_instance_type.go

website/docs/d/ec2_instance_type.html.markdown

YakDriver · 2020-09-23T17:04:00Z

@lde I just wanted to check in with you and see if you are willing to make the changes. If not, we can take it over or someone from the community can. We want to give you the first chance to finish if you're able. 👍

…tance type Co-authored-by: Dirk Avery <[email protected]>

lde · 2020-09-23T21:29:01Z

Hi, @YakDriver
I've update pr integrating your changes.

But i've an issue on terrafmt check.
I'm not able to get error on local for debug

terrafmt diff --check --verbose --fmtcompat aws/data_source_aws_ec2_instance_type_test.go
aws/data_source_aws_ec2_instance_type_test.go: 101 lines & 0/0 blocks need formatting.

aws/data_source_aws_ec2_instance_type_test.go

lde · 2020-10-03T17:53:23Z

Hi @YakDriver, I've splited tests and added somes missing attributes.

YakDriver

This is very close. Just a couple of small items and we should be ready to merge!

YakDriver · 2020-10-07T14:55:40Z

website/docs/d/ec2_instance_type.html.markdown

+
+~> **NOTE:** Not all attributes are set for every instance type.
+
+* `accelerators` Describes the Inference accelerators for the instance type.


I appreciate these being in alphabetical order! It makes the docs more readable!

YakDriver · 2020-10-07T14:56:42Z

aws/data_source_aws_ec2_instance_type_test.go

+`
+
+const testAccDataSourceEc2InstanceTypeAccelerator = `
+


Suggested change

The blank line is probably triggering the linter.

aws/data_source_aws_ec2_instance_type_test.go

YakDriver · 2020-10-07T14:59:53Z

aws/data_source_aws_ec2_instance_type.go

+	d.Set("instance_type", v.InstanceType)
+	d.Set("current_generation", v.CurrentGeneration)
+	d.Set("free_tier_eligible", v.FreeTierEligible)
+	d.Set("supported_usages_classes", v.SupportedUsageClasses)
+	d.Set("supported_root_device_types", v.SupportedRootDeviceTypes)
+	d.Set("supported_virtualization_types", v.SupportedVirtualizationTypes)
+	d.Set("bare_metal", v.BareMetal)
+	d.Set("hypervisor", v.Hypervisor)
+	d.Set("supported_architectures", v.ProcessorInfo.SupportedArchitectures)
+	d.Set("sustained_clock_speed", v.ProcessorInfo.SustainedClockSpeedInGhz)
+	d.Set("default_vcpus", v.VCpuInfo.DefaultVCpus)
+	d.Set("default_cores", v.VCpuInfo.DefaultCores)
+	d.Set("default_threads_per_core", v.VCpuInfo.DefaultThreadsPerCore)
+	d.Set("valid_threads_per_core", v.VCpuInfo.ValidThreadsPerCore)
+	d.Set("valid_cores", v.VCpuInfo.ValidCores)
+	d.Set("memory_size", v.MemoryInfo.SizeInMiB)
+	d.Set("instance_storage_supported", v.InstanceStorageSupported)
+	if v.InstanceStorageInfo != nil {
+		d.Set("total_instance_storage", v.InstanceStorageInfo.TotalSizeInGB)
+		if v.InstanceStorageInfo.Disks != nil {
+			diskList := make([]interface{}, len(v.InstanceStorageInfo.Disks))
+			for i, dk := range v.InstanceStorageInfo.Disks {
+				disk := map[string]interface{}{
+					"size":  aws.Int64Value(dk.SizeInGB),
+					"count": aws.Int64Value(dk.Count),
+					"type":  aws.StringValue(dk.Type),
+				}
+				diskList[i] = disk
+			}
+			d.Set("instance_disks", diskList)
+		}
+	}
+	d.Set("ebs_optimized_support", v.EbsInfo.EbsOptimizedSupport)
+	if v.EbsInfo.EbsOptimizedInfo != nil {
+		d.Set("ebs_performance_baseline_bandwidth", v.EbsInfo.EbsOptimizedInfo.BaselineBandwidthInMbps)
+		d.Set("ebs_performance_baseline_throughput", v.EbsInfo.EbsOptimizedInfo.BaselineThroughputInMBps)
+		d.Set("ebs_performance_baseline_iops", v.EbsInfo.EbsOptimizedInfo.BaselineIops)
+		d.Set("ebs_performance_maximum_bandwidth", v.EbsInfo.EbsOptimizedInfo.MaximumBandwidthInMbps)
+		d.Set("ebs_performance_maximum_throughput", v.EbsInfo.EbsOptimizedInfo.MaximumThroughputInMBps)
+		d.Set("ebs_performance_maximum_iops", v.EbsInfo.EbsOptimizedInfo.MaximumIops)
+	}
+	d.Set("ebs_encryption_support", v.EbsInfo.EncryptionSupport)
+	d.Set("ebs_nvme_support", v.EbsInfo.NvmeSupport)
+	d.Set("network_performance", v.NetworkInfo.NetworkPerformance)
+	d.Set("maximum_network_interfaces", v.NetworkInfo.MaximumNetworkInterfaces)
+	d.Set("maximum_ipv4_addresses_per_interface", v.NetworkInfo.Ipv4AddressesPerInterface)
+	d.Set("maximum_ipv6_addresses_per_interface", v.NetworkInfo.Ipv6AddressesPerInterface)
+	d.Set("ipv6_supported", v.NetworkInfo.Ipv6Supported)
+	d.Set("ena_support", v.NetworkInfo.EnaSupport)
+	d.Set("efa_supported", v.NetworkInfo.EfaSupported)
+	if v.GpuInfo != nil {
+		gpuList := make([]interface{}, len(v.GpuInfo.Gpus))
+		for i, gp := range v.GpuInfo.Gpus {
+			gpu := map[string]interface{}{
+				"manufacturer": aws.StringValue(gp.Manufacturer),
+				"name":         aws.StringValue(gp.Name),
+				"count":        aws.Int64Value(gp.Count),
+				"memory_size":  aws.Int64Value(gp.MemoryInfo.SizeInMiB),
+			}
+			gpuList[i] = gpu
+		}
+		d.Set("gpus", gpuList)
+		d.Set("total_gpu_memory", v.GpuInfo.TotalGpuMemoryInMiB)
+	}
+	if v.FpgaInfo != nil {
+		fpgaList := make([]interface{}, len(v.FpgaInfo.Fpgas))
+		for i, fpg := range v.FpgaInfo.Fpgas {
+			fpga := map[string]interface{}{
+				"manufacturer": aws.StringValue(fpg.Manufacturer),
+				"name":         aws.StringValue(fpg.Name),
+				"count":        aws.Int64Value(fpg.Count),
+				"memory_size":  aws.Int64Value(fpg.MemoryInfo.SizeInMiB),
+			}
+			fpgaList[i] = fpga
+		}
+		d.Set("fpgas", fpgaList)
+		d.Set("total_fpga_memory", v.FpgaInfo.TotalFpgaMemoryInMiB)
+	}
+	d.Set("supported_placement_strategies", v.PlacementGroupInfo.SupportedStrategies)
+	if v.InferenceAcceleratorInfo != nil {
+		acceleratorList := make([]interface{}, len(v.InferenceAcceleratorInfo.Accelerators))
+		for i, accl := range v.InferenceAcceleratorInfo.Accelerators {
+			accelerator := map[string]interface{}{
+				"manufacturer": aws.StringValue(accl.Manufacturer),
+				"name":         aws.StringValue(accl.Name),
+				"count":        aws.Int64Value(accl.Count),
+			}
+			acceleratorList[i] = accelerator
+		}
+		d.Set("accelerators", acceleratorList)
+	}
+	d.Set("hibernation_supported", v.HibernationSupported)
+	d.Set("burstable_performance_supported", v.BurstablePerformanceSupported)
+	d.Set("dedicated_hosts_supported", v.DedicatedHostsSupported)
+	d.Set("auto_recovery_supported", v.AutoRecoverySupported)


Nit: Please put all the attributes in alphabetical order. It makes maintenance easier later!

lde · 2020-10-07T17:14:54Z

Hi,
If I didn't make mistake all documentation, structures set and tests are sorted.

YakDriver

Once we make the linter happy, we are ready to go.

aws/data_source_aws_ec2_instance_type_test.go

Co-authored-by: Dirk Avery <[email protected]>

YakDriver

I apologize. I found some additional problems running the tests across partitions.

aws/data_source_aws_ec2_instance_type_test.go

lde · 2020-10-07T18:40:24Z

Hooray, linter seems to be happy !

YakDriver · 2020-10-07T18:43:34Z

@lde If you have a chance to fix these last few items in the next hour or so, we can get this in in time for 3.10.0.

Co-authored-by: Dirk Avery <[email protected]>

lde · 2020-10-07T19:00:34Z

@YakDriver I've applied your tests updates.

YakDriver · 2020-10-07T19:49:59Z

This looks great! Thank you for all your work on this. I think a lot of people will find this useful.

Tests on GovCloud:

--- PASS: TestAccDataSourceAwsEc2InstanceType_basic (15.90s)
--- PASS: TestAccDataSourceAwsEc2InstanceType_gpu (17.59s)
--- PASS: TestAccDataSourceAwsEc2InstanceType_fpga (17.61s)
--- PASS: TestAccDataSourceAwsEc2InstanceType_metal (17.62s)

Tests on Commercial:

--- PASS: TestAccDataSourceAwsEc2InstanceType_basic (11.95s)
--- PASS: TestAccDataSourceAwsEc2InstanceType_metal (12.34s)
--- PASS: TestAccDataSourceAwsEc2InstanceType_fpga (12.36s)
--- PASS: TestAccDataSourceAwsEc2InstanceType_gpu (12.50s)

ghost · 2020-10-09T16:19:01Z

This has been released in version 3.10.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

ghost · 2020-11-07T17:10:01Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

lde requested a review from a team May 1, 2020 14:59

lde force-pushed the d-aws-instance-type branch 3 times, most recently from ba8bb11 to 776c16b Compare May 1, 2020 15:57

anGie44 force-pushed the master branch from 54db70d to 48ba2f7 Compare July 21, 2020 18:26

YakDriver self-assigned this Jul 29, 2020

lde force-pushed the d-aws-instance-type branch 2 times, most recently from 8fe7d71 to b126f97 Compare July 30, 2020 15:46

YakDriver requested changes Sep 16, 2020

View reviewed changes

YakDriver added waiting-response Maintainers are waiting on response from community or contributor. and removed needs-triage Waiting for first response or review from a maintainer. labels Sep 16, 2020

lde force-pushed the d-aws-instance-type branch 4 times, most recently from 0364090 to d3016aa Compare September 23, 2020 21:20

New datasource ec2_instance_type to get characteristics about ec2 ins…

f821eda

…tance type Co-authored-by: Dirk Avery <[email protected]>

lde force-pushed the d-aws-instance-type branch from d3016aa to f821eda Compare September 23, 2020 21:24

ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Sep 23, 2020

YakDriver requested changes Sep 30, 2020

View reviewed changes

aws/data_source_aws_ec2_instance_type_test.go Outdated Show resolved Hide resolved

YakDriver added the waiting-response Maintainers are waiting on response from community or contributor. label Sep 30, 2020

split tests, add missing attributes and update documentation

4831ea9

ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Oct 3, 2020

YakDriver requested changes Oct 7, 2020

View reviewed changes

YakDriver added the waiting-response Maintainers are waiting on response from community or contributor. label Oct 7, 2020

alphabetical sort structures, docs, tests and set

5de95e4

ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Oct 7, 2020

YakDriver requested changes Oct 7, 2020

View reviewed changes

YakDriver added the waiting-response Maintainers are waiting on response from community or contributor. label Oct 7, 2020

Apply suggestions from code review

570e9e9

Co-authored-by: Dirk Avery <[email protected]>

YakDriver added this to the v3.10.0 milestone Oct 7, 2020

YakDriver requested changes Oct 7, 2020

View reviewed changes

ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Oct 7, 2020

YakDriver added the waiting-response Maintainers are waiting on response from community or contributor. label Oct 7, 2020

Adapt test for cross regions

a3d7b65

Co-authored-by: Dirk Avery <[email protected]>

ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Oct 7, 2020

YakDriver approved these changes Oct 7, 2020

View reviewed changes

YakDriver merged commit b1f3fa4 into hashicorp:master Oct 7, 2020

YakDriver added the partition/aws-us-gov Pertains to the aws-us-gov partition. label Oct 7, 2020

lde deleted the d-aws-instance-type branch October 8, 2020 05:10

ghost locked as resolved and limited conversation to collaborators Nov 7, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

d/ec2_instance_type #13124

d/ec2_instance_type #13124

lde commented May 1, 2020 •

edited

Loading

ewbankkit commented May 1, 2020

YakDriver commented Jul 29, 2020

lde commented Jul 30, 2020

iyuroch commented Sep 7, 2020

YakDriver left a comment

YakDriver commented Sep 23, 2020

lde commented Sep 23, 2020

lde commented Oct 3, 2020

YakDriver left a comment

YakDriver Oct 7, 2020

YakDriver Oct 7, 2020

YakDriver Oct 7, 2020

lde commented Oct 7, 2020

YakDriver left a comment

YakDriver left a comment •

edited

Loading

lde commented Oct 7, 2020

YakDriver commented Oct 7, 2020

lde commented Oct 7, 2020

YakDriver commented Oct 7, 2020

ghost commented Oct 9, 2020

ghost commented Nov 7, 2020


		~> NOTE: Not all attributes are set for every instance type.

		* `accelerators` Describes the Inference accelerators for the instance type.

		`

		const testAccDataSourceEc2InstanceTypeAccelerator = `

d/ec2_instance_type #13124

d/ec2_instance_type #13124

Conversation

lde commented May 1, 2020 • edited Loading

Community Note

ewbankkit commented May 1, 2020

YakDriver commented Jul 29, 2020

lde commented Jul 30, 2020

iyuroch commented Sep 7, 2020

YakDriver left a comment

Choose a reason for hiding this comment

YakDriver commented Sep 23, 2020

lde commented Sep 23, 2020

lde commented Oct 3, 2020

YakDriver left a comment

Choose a reason for hiding this comment

YakDriver Oct 7, 2020

Choose a reason for hiding this comment

YakDriver Oct 7, 2020

Choose a reason for hiding this comment

YakDriver Oct 7, 2020

Choose a reason for hiding this comment

lde commented Oct 7, 2020

YakDriver left a comment

Choose a reason for hiding this comment

YakDriver left a comment • edited Loading

Choose a reason for hiding this comment

lde commented Oct 7, 2020

YakDriver commented Oct 7, 2020

lde commented Oct 7, 2020

YakDriver commented Oct 7, 2020

ghost commented Oct 9, 2020

ghost commented Nov 7, 2020

lde commented May 1, 2020 •

edited

Loading

YakDriver left a comment •

edited

Loading