feat: Shorten outputs (removing this_) (#39)

Author: antonbabenko

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.48.0
+    rev: v1.50.0
     hooks:
       - id: terraform_fmt
       - id: terraform_validate

README.md

@@ -97,9 +97,9 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_this_ecs_cluster_arn"></a> [this\_ecs\_cluster\_arn](#output\_this\_ecs\_cluster\_arn) | ARN of the ECS Cluster |
-| <a name="output_this_ecs_cluster_id"></a> [this\_ecs\_cluster\_id](#output\_this\_ecs\_cluster\_id) | ID of the ECS Cluster |
-| <a name="output_this_ecs_cluster_name"></a> [this\_ecs\_cluster\_name](#output\_this\_ecs\_cluster\_name) | The name of the ECS cluster |
+| <a name="output_ecs_cluster_arn"></a> [ecs\_cluster\_arn](#output\_ecs\_cluster\_arn) | ARN of the ECS Cluster |
+| <a name="output_ecs_cluster_id"></a> [ecs\_cluster\_id](#output\_ecs\_cluster\_id) | ID of the ECS Cluster |
+| <a name="output_ecs_cluster_name"></a> [ecs\_cluster\_name](#output\_ecs\_cluster\_name) | The name of the ECS cluster |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 ## Authors

examples/complete-ecs/README.md

@@ -58,12 +58,12 @@ Current version creates an high-available VPC with instances that are attached t
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_asg"></a> [asg](#module\_asg) | terraform-aws-modules/autoscaling/aws | ~> 3.0 |
+| <a name="module_asg"></a> [asg](#module\_asg) | terraform-aws-modules/autoscaling/aws | ~> 4.0 |
 | <a name="module_disabled_ecs"></a> [disabled\_ecs](#module\_disabled\_ecs) | ../../ |  |
 | <a name="module_ec2_profile"></a> [ec2\_profile](#module\_ec2\_profile) | ../../modules/ecs-instance-profile |  |
 | <a name="module_ecs"></a> [ecs](#module\_ecs) | ../../ |  |
 | <a name="module_hello_world"></a> [hello\_world](#module\_hello\_world) | ./service-hello-world |  |
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 2.0 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
 
 ## Resources
 

examples/complete-ecs/main.tf

@@ -12,7 +12,7 @@ data "aws_availability_zones" "available" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 2.0"
+  version = "~> 3.0"
 
   name = local.name
 
@@ -63,7 +63,7 @@ resource "aws_ecs_capacity_provider" "prov1" {
   name = "prov1"
 
   auto_scaling_group_provider {
-    auto_scaling_group_arn = module.asg.this_autoscaling_group_arn
+    auto_scaling_group_arn = module.asg.autoscaling_group_arn
   }
 
 }
@@ -72,7 +72,7 @@ resource "aws_ecs_capacity_provider" "prov1" {
 module "hello_world" {
   source = "./service-hello-world"
 
-  cluster_id = module.ecs.this_ecs_cluster_id
+  cluster_id = module.ecs.ecs_cluster_id
 }
 
 #----- ECS  Resources--------
@@ -96,21 +96,20 @@ data "aws_ami" "amazon_linux_ecs" {
 
 module "asg" {
   source  = "terraform-aws-modules/autoscaling/aws"
-  version = "~> 3.0"
+  version = "~> 4.0"
 
   name = local.ec2_resources_name
 
   # Launch configuration
   lc_name = local.ec2_resources_name
 
-  image_id             = data.aws_ami.amazon_linux_ecs.id
-  instance_type        = "t2.micro"
-  security_groups      = [module.vpc.default_security_group_id]
-  iam_instance_profile = module.ec2_profile.this_iam_instance_profile_id
-  user_data            = data.template_file.user_data.rendered
+  image_id                 = data.aws_ami.amazon_linux_ecs.id
+  instance_type            = "t2.micro"
+  security_groups          = [module.vpc.default_security_group_id]
+  iam_instance_profile_arn = module.ec2_profile.iam_instance_profile_arn
+  user_data                = data.template_file.user_data.rendered
 
   # Auto scaling group
-  asg_name                  = local.ec2_resources_name
   vpc_zone_identifier       = module.vpc.private_subnets
   health_check_type         = "EC2"
   min_size                  = 0

modules/ecs-instance-profile/README.md

@@ -46,7 +46,7 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_this_iam_instance_profile_arn"></a> [this\_iam\_instance\_profile\_arn](#output\_this\_iam\_instance\_profile\_arn) | ARN of the IAM instance profile |
-| <a name="output_this_iam_instance_profile_id"></a> [this\_iam\_instance\_profile\_id](#output\_this\_iam\_instance\_profile\_id) | ID of the IAM instance profile |
-| <a name="output_this_iam_role_id"></a> [this\_iam\_role\_id](#output\_this\_iam\_role\_id) | ID of the IAM role |
+| <a name="output_iam_instance_profile_arn"></a> [iam\_instance\_profile\_arn](#output\_iam\_instance\_profile\_arn) | ARN of the IAM instance profile |
+| <a name="output_iam_instance_profile_id"></a> [iam\_instance\_profile\_id](#output\_iam\_instance\_profile\_id) | ID of the IAM instance profile |
+| <a name="output_iam_role_id"></a> [iam\_role\_id](#output\_iam\_role\_id) | ID of the IAM role |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

modules/ecs-instance-profile/outputs.tf

@@ -1,14 +1,14 @@
-output "this_iam_instance_profile_id" {
+output "iam_instance_profile_id" {
   description = "ID of the IAM instance profile"
   value       = aws_iam_instance_profile.this.id
 }
 
-output "this_iam_instance_profile_arn" {
+output "iam_instance_profile_arn" {
   description = "ARN of the IAM instance profile"
   value       = aws_iam_instance_profile.this.arn
 }
 
-output "this_iam_role_id" {
+output "iam_role_id" {
   description = "ID of the IAM role"
   value       = aws_iam_role.this.id
 }

outputs.tf

@@ -1,14 +1,14 @@
-output "this_ecs_cluster_id" {
+output "ecs_cluster_id" {
   description = "ID of the ECS Cluster"
   value       = concat(aws_ecs_cluster.this.*.id, [""])[0]
 }
 
-output "this_ecs_cluster_arn" {
+output "ecs_cluster_arn" {
   description = "ARN of the ECS Cluster"
   value       = concat(aws_ecs_cluster.this.*.arn, [""])[0]
 }
 
-output "this_ecs_cluster_name" {
+output "ecs_cluster_name" {
   description = "The name of the ECS cluster"
   value       = var.name
 }