Update outputs to remove unneeded function wrappers (terraform-aws-modules#135)

Author: MDBox

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 repos:
 - repo: git://github.com/antonbabenko/pre-commit-terraform
- rev: v1.16.0
+ rev: v1.21.0
  hooks:
  - id: terraform_fmt
  - id: terraform_docs
 - repo: git://github.com/pre-commit/pre-commit-hooks
- rev: v2.2.3
+ rev: v2.4.0
  hooks:
  - id: check-merge-conflict

outputs.tf

@@ -1,98 +1,79 @@
-locals {
- this_id = compact(coalescelist(aws_instance.this.*.id, [""]))
- this_availability_zone = compact(coalescelist(aws_instance.this.*.availability_zone, [""]))
- this_key_name = compact(coalescelist(aws_instance.this.*.key_name, [""]))
- this_public_dns = compact(coalescelist(aws_instance.this.*.public_dns, [""]))
- this_public_ip = compact(coalescelist(aws_instance.this.*.public_ip, [""]))
- this_primary_network_interface_id = compact(coalescelist(aws_instance.this.*.primary_network_interface_id, [""]))
- this_private_dns = compact(coalescelist(aws_instance.this.*.private_dns, [""]))
- this_private_ip = compact(coalescelist(aws_instance.this.*.private_ip, [""]))
- this_placement_group = compact(coalescelist(aws_instance.this.*.placement_group, [""]))
- this_security_groups = coalescelist(aws_instance.this.*.security_groups, [""])
- this_vpc_security_group_ids = coalescelist(flatten(aws_instance.this.*.vpc_security_group_ids), [""])
- this_subnet_id = compact(coalescelist(aws_instance.this.*.subnet_id, [""]))
- this_credit_specification = flatten(aws_instance.this.*.credit_specification)
- this_tags = coalescelist(aws_instance.this.*.tags, [""])
- this_volume_tags = coalescelist(aws_instance.this.*.volume_tags, [""])
- this_password_data = coalescelist(aws_instance.this.*.password_data, [""])
-}
-
 output "id" {
  description = "List of IDs of instances"
- value = local.this_id
+ value = aws_instance.this.*.id
 }
 
 output "availability_zone" {
  description = "List of availability zones of instances"
- value = local.this_availability_zone
+ value = aws_instance.this.*.availability_zone
 }
 
 output "placement_group" {
  description = "List of placement groups of instances"
- value = local.this_placement_group
+ value = aws_instance.this.*.placement_group
 }
 
 output "key_name" {
  description = "List of key names of instances"
- value = local.this_key_name
+ value = aws_instance.this.*.key_name
 }
 
 output "public_dns" {
  description = "List of public DNS names assigned to the instances. For EC2-VPC, this is only available if you've enabled DNS hostnames for your VPC"
- value = local.this_public_dns
+ value = aws_instance.this.*.public_dns
 }
 
 output "public_ip" {
  description = "List of public IP addresses assigned to the instances, if applicable"
- value = local.this_public_ip
+ value = aws_instance.this.*.public_ip
 }
 
 output "primary_network_interface_id" {
  description = "List of IDs of the primary network interface of instances"
- value = local.this_primary_network_interface_id
+ value = aws_instance.this.*.primary_network_interface_id
 }
 
 output "private_dns" {
  description = "List of private DNS names assigned to the instances. Can only be used inside the Amazon EC2, and only available if you've enabled DNS hostnames for your VPC"
- value = local.this_private_dns
+ value = aws_instance.this.*.private_dns
 }
 
 output "private_ip" {
  description = "List of private IP addresses assigned to the instances"
- value = local.this_private_ip
+ value = aws_instance.this.*.private_ip
 }
 
 output "password_data" {
  description = "List of Base-64 encoded encrypted password data for the instance"
- value = local.this_password_data
+ value = aws_instance.this.*.password_data
 }
 
 output "security_groups" {
  description = "List of associated security groups of instances"
- value = local.this_security_groups
+ value = aws_instance.this.*.security_groups
 }
 
 output "vpc_security_group_ids" {
  description = "List of associated security groups of instances, if running in non-default VPC"
- value = local.this_vpc_security_group_ids
+ value = aws_instance.this.*.vpc_security_group_ids
 }
 
 output "subnet_id" {
  description = "List of IDs of VPC subnets of instances"
- value = local.this_subnet_id
+ value = aws_instance.this.*.subnet_id
 }
 
 output "credit_specification" {
  description = "List of credit specification of instances"
- value = local.this_credit_specification
+ value = aws_instance.this.*.credit_specification
 }
 
 output "tags" {
  description = "List of tags of instances"
- value = local.this_tags
+ value = aws_instance.this.*.tags
 }
 
 output "volume_tags" {
  description = "List of tags of volumes of instances"
- value = local.this_volume_tags
+ value = aws_instance.this.*.volume_tags
 }