Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Addition of block device information in outputs #319

Merged
merged 5 commits into from
Apr 21, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ No modules.
| <a name="output_ami"></a> [ami](#output\_ami) | AMI ID that was used to create the instance. |
| <a name="output_arn"></a> [arn](#output\_arn) | The ARN of the instance |
| <a name="output_capacity_reservation_specification"></a> [capacity\_reservation\_specification](#output\_capacity\_reservation\_specification) | Capacity reservation specification of the instance |
| <a name="output_ebs_block_devices"></a> [ebs\_block\_devices](#output\_ebs\_block\_devices) | EBS block devices information |
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
| <a name="output_ephemeral_block_devices"></a> [ephemeral\_block\_devices](#output\_ephemeral\_block\_devices) | Ephemeral block devices information |
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
| <a name="output_iam_instance_profile_arn"></a> [iam\_instance\_profile\_arn](#output\_iam\_instance\_profile\_arn) | ARN assigned by AWS to the instance profile |
| <a name="output_iam_instance_profile_id"></a> [iam\_instance\_profile\_id](#output\_iam\_instance\_profile\_id) | Instance profile's ID |
| <a name="output_iam_instance_profile_unique"></a> [iam\_instance\_profile\_unique](#output\_iam\_instance\_profile\_unique) | Stable and unique string identifying the IAM instance profile |
Expand All @@ -284,6 +286,7 @@ No modules.
| <a name="output_private_ip"></a> [private\_ip](#output\_private\_ip) | The private IP address assigned to the instance. |
| <a name="output_public_dns"></a> [public\_dns](#output\_public\_dns) | The public DNS name assigned to the instance. For EC2-VPC, this is only available if you've enabled DNS hostnames for your VPC |
| <a name="output_public_ip"></a> [public\_ip](#output\_public\_ip) | The public IP address assigned to the instance, if applicable. NOTE: If you are using an aws\_eip with your instance, you should refer to the EIP's address directly and not use `public_ip` as this field will change after the EIP is attached |
| <a name="output_root_block_device"></a> [root\_block\_device](#output\_root\_block\_device) | Root block device information |
| <a name="output_spot_bid_status"></a> [spot\_bid\_status](#output\_spot\_bid\_status) | The current bid status of the Spot Instance Request |
| <a name="output_spot_instance_id"></a> [spot\_instance\_id](#output\_spot\_instance\_id) | The Instance ID (if any) that is currently fulfilling the Spot Instance request |
| <a name="output_spot_request_state"></a> [spot\_request\_state](#output\_spot\_request\_state) | The current request state of the Spot Instance Request |
Expand Down
3 changes: 3 additions & 0 deletions examples/complete/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ No inputs.
|------|-------------|
| <a name="output_ec2_complete_arn"></a> [ec2\_complete\_arn](#output\_ec2\_complete\_arn) | The ARN of the instance |
| <a name="output_ec2_complete_capacity_reservation_specification"></a> [ec2\_complete\_capacity\_reservation\_specification](#output\_ec2\_complete\_capacity\_reservation\_specification) | Capacity reservation specification of the instance |
| <a name="output_ec2_complete_ebs_block_devices"></a> [ec2\_complete\_ebs\_block\_devices](#output\_ec2\_complete\_ebs\_block\_devices) | EBS block devices information |
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
| <a name="output_ec2_complete_ephemeral_block_devices"></a> [ec2\_complete\_ephemeral\_block\_devices](#output\_ec2\_complete\_ephemeral\_block\_devices) | Ephemeral block devices information |
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
| <a name="output_ec2_complete_iam_instance_profile_arn"></a> [ec2\_complete\_iam\_instance\_profile\_arn](#output\_ec2\_complete\_iam\_instance\_profile\_arn) | ARN assigned by AWS to the instance profile |
| <a name="output_ec2_complete_iam_instance_profile_id"></a> [ec2\_complete\_iam\_instance\_profile\_id](#output\_ec2\_complete\_iam\_instance\_profile\_id) | Instance profile's ID |
| <a name="output_ec2_complete_iam_instance_profile_unique"></a> [ec2\_complete\_iam\_instance\_profile\_unique](#output\_ec2\_complete\_iam\_instance\_profile\_unique) | Stable and unique string identifying the IAM instance profile |
Expand All @@ -78,6 +80,7 @@ No inputs.
| <a name="output_ec2_complete_private_dns"></a> [ec2\_complete\_private\_dns](#output\_ec2\_complete\_private\_dns) | The private DNS name assigned to the instance. Can only be used inside the Amazon EC2, and only available if you've enabled DNS hostnames for your VPC |
| <a name="output_ec2_complete_public_dns"></a> [ec2\_complete\_public\_dns](#output\_ec2\_complete\_public\_dns) | The public DNS name assigned to the instance. For EC2-VPC, this is only available if you've enabled DNS hostnames for your VPC |
| <a name="output_ec2_complete_public_ip"></a> [ec2\_complete\_public\_ip](#output\_ec2\_complete\_public\_ip) | The public IP address assigned to the instance, if applicable. NOTE: If you are using an aws\_eip with your instance, you should refer to the EIP's address directly and not use `public_ip` as this field will change after the EIP is attached |
| <a name="output_ec2_complete_root_block_device"></a> [ec2\_complete\_root\_block\_device](#output\_ec2\_complete\_root\_block\_device) | Root block device information |
| <a name="output_ec2_complete_tags_all"></a> [ec2\_complete\_tags\_all](#output\_ec2\_complete\_tags\_all) | A map of tags assigned to the resource, including those inherited from the provider default\_tags configuration block |
| <a name="output_ec2_multiple"></a> [ec2\_multiple](#output\_ec2\_multiple) | The full output of the `ec2_module` module |
| <a name="output_ec2_spot_instance_arn"></a> [ec2\_spot\_instance\_arn](#output\_ec2\_spot\_instance\_arn) | The ARN of the instance |
Expand Down
15 changes: 15 additions & 0 deletions examples/complete/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,21 @@ output "ec2_complete_iam_instance_profile_unique" {
value = module.ec2_complete.iam_instance_profile_unique
}

output "ec2_complete_root_block_device" {
description = "Root block device information"
value = module.ec2_complete.root_block_device
}

output "ec2_complete_ebs_block_devices" {
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
description = "EBS block devices information"
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
value = module.ec2_complete.ebs_block_devices
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
}

output "ec2_complete_ephemeral_block_devices" {
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
description = "Ephemeral block devices information"
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
value = module.ec2_complete.ephemeral_block_devices
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
}

# EC2 T2 Unlimited
output "ec2_t2_unlimited_id" {
description = "The ID of the instance"
Expand Down
18 changes: 18 additions & 0 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,21 @@ output "iam_instance_profile_unique" {
description = "Stable and unique string identifying the IAM instance profile"
value = try(aws_iam_instance_profile.this[0].unique_id, null)
}

################################################################################
# Block Devices
################################################################################
output "root_block_device" {
description = "Root block device information"
value = try(aws_instance.this[0].root_block_device[0], null)
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
}

output "ebs_block_devices" {
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
description = "EBS block devices information"
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
value = try(aws_instance.this[0].ebs_block_device, null)
}

output "ephemeral_block_devices" {
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
description = "Ephemeral block devices information"
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
value = try(aws_instance.this[0].ephemeral_block_device, null)
}