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

Author: antonbabenko

README.md

@@ -10,7 +10,7 @@ These types of resources are supported:
 
 ## Terraform versions
 
-Terraform 0.12 or newer. Pin module version to `~> v2.0`. Submit pull-requests to `master` branch.
+Terraform 0.12 or newer. Pin module version to `~> v2.0` or newer. Submit pull-requests to `master` branch.
 
 Terraform 0.11. Pin module version to `~> v1.0`. Submit pull-requests to `terraform011` branch.
 
@@ -19,7 +19,7 @@ Terraform 0.11. Pin module version to `~> v1.0`. Submit pull-requests to `terraf
 ```hcl
 module "redshift" {
   source  = "terraform-aws-modules/redshift/aws"
-  version = "~> 2.0"
+  version = "~> 3.0"
 
   cluster_identifier      = "my-cluster"
   cluster_node_type       = "dc1.large"
@@ -116,28 +116,28 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_this_redshift_cluster_arn"></a> [this\_redshift\_cluster\_arn](#output\_this\_redshift\_cluster\_arn) | The Redshift cluster ARN |
-| <a name="output_this_redshift_cluster_automated_snapshot_retention_period"></a> [this\_redshift\_cluster\_automated\_snapshot\_retention\_period](#output\_this\_redshift\_cluster\_automated\_snapshot\_retention\_period) | The backup retention period |
-| <a name="output_this_redshift_cluster_availability_zone"></a> [this\_redshift\_cluster\_availability\_zone](#output\_this\_redshift\_cluster\_availability\_zone) | The availability zone of the Cluster |
-| <a name="output_this_redshift_cluster_database_name"></a> [this\_redshift\_cluster\_database\_name](#output\_this\_redshift\_cluster\_database\_name) | The name of the default database in the Cluster |
-| <a name="output_this_redshift_cluster_encrypted"></a> [this\_redshift\_cluster\_encrypted](#output\_this\_redshift\_cluster\_encrypted) | Whether the data in the cluster is encrypted |
-| <a name="output_this_redshift_cluster_endpoint"></a> [this\_redshift\_cluster\_endpoint](#output\_this\_redshift\_cluster\_endpoint) | The connection endpoint |
-| <a name="output_this_redshift_cluster_hostname"></a> [this\_redshift\_cluster\_hostname](#output\_this\_redshift\_cluster\_hostname) | The hostname of the Redshift cluster |
-| <a name="output_this_redshift_cluster_id"></a> [this\_redshift\_cluster\_id](#output\_this\_redshift\_cluster\_id) | The Redshift cluster ID |
-| <a name="output_this_redshift_cluster_identifier"></a> [this\_redshift\_cluster\_identifier](#output\_this\_redshift\_cluster\_identifier) | The Redshift cluster identifier |
-| <a name="output_this_redshift_cluster_node_type"></a> [this\_redshift\_cluster\_node\_type](#output\_this\_redshift\_cluster\_node\_type) | The type of nodes in the cluster |
-| <a name="output_this_redshift_cluster_parameter_group_name"></a> [this\_redshift\_cluster\_parameter\_group\_name](#output\_this\_redshift\_cluster\_parameter\_group\_name) | The name of the parameter group to be associated with this cluster |
-| <a name="output_this_redshift_cluster_port"></a> [this\_redshift\_cluster\_port](#output\_this\_redshift\_cluster\_port) | The port the cluster responds on |
-| <a name="output_this_redshift_cluster_preferred_maintenance_window"></a> [this\_redshift\_cluster\_preferred\_maintenance\_window](#output\_this\_redshift\_cluster\_preferred\_maintenance\_window) | The backup window |
-| <a name="output_this_redshift_cluster_public_key"></a> [this\_redshift\_cluster\_public\_key](#output\_this\_redshift\_cluster\_public\_key) | The public key for the cluster |
-| <a name="output_this_redshift_cluster_revision_number"></a> [this\_redshift\_cluster\_revision\_number](#output\_this\_redshift\_cluster\_revision\_number) | The specific revision number of the database in the cluster |
-| <a name="output_this_redshift_cluster_security_groups"></a> [this\_redshift\_cluster\_security\_groups](#output\_this\_redshift\_cluster\_security\_groups) | The security groups associated with the cluster |
-| <a name="output_this_redshift_cluster_subnet_group_name"></a> [this\_redshift\_cluster\_subnet\_group\_name](#output\_this\_redshift\_cluster\_subnet\_group\_name) | The name of a cluster subnet group to be associated with this cluster |
-| <a name="output_this_redshift_cluster_type"></a> [this\_redshift\_cluster\_type](#output\_this\_redshift\_cluster\_type) | The Redshift cluster type |
-| <a name="output_this_redshift_cluster_version"></a> [this\_redshift\_cluster\_version](#output\_this\_redshift\_cluster\_version) | The version of Redshift engine software |
-| <a name="output_this_redshift_cluster_vpc_security_group_ids"></a> [this\_redshift\_cluster\_vpc\_security\_group\_ids](#output\_this\_redshift\_cluster\_vpc\_security\_group\_ids) | The VPC security group ids associated with the cluster |
-| <a name="output_this_redshift_parameter_group_id"></a> [this\_redshift\_parameter\_group\_id](#output\_this\_redshift\_parameter\_group\_id) | The ID of Redshift parameter group created by this module |
-| <a name="output_this_redshift_subnet_group_id"></a> [this\_redshift\_subnet\_group\_id](#output\_this\_redshift\_subnet\_group\_id) | The ID of Redshift subnet group created by this module |
+| <a name="output_redshift_cluster_arn"></a> [redshift\_cluster\_arn](#output\_redshift\_cluster\_arn) | The Redshift cluster ARN |
+| <a name="output_redshift_cluster_automated_snapshot_retention_period"></a> [redshift\_cluster\_automated\_snapshot\_retention\_period](#output\_redshift\_cluster\_automated\_snapshot\_retention\_period) | The backup retention period |
+| <a name="output_redshift_cluster_availability_zone"></a> [redshift\_cluster\_availability\_zone](#output\_redshift\_cluster\_availability\_zone) | The availability zone of the Cluster |
+| <a name="output_redshift_cluster_database_name"></a> [redshift\_cluster\_database\_name](#output\_redshift\_cluster\_database\_name) | The name of the default database in the Cluster |
+| <a name="output_redshift_cluster_encrypted"></a> [redshift\_cluster\_encrypted](#output\_redshift\_cluster\_encrypted) | Whether the data in the cluster is encrypted |
+| <a name="output_redshift_cluster_endpoint"></a> [redshift\_cluster\_endpoint](#output\_redshift\_cluster\_endpoint) | The connection endpoint |
+| <a name="output_redshift_cluster_hostname"></a> [redshift\_cluster\_hostname](#output\_redshift\_cluster\_hostname) | The hostname of the Redshift cluster |
+| <a name="output_redshift_cluster_id"></a> [redshift\_cluster\_id](#output\_redshift\_cluster\_id) | The Redshift cluster ID |
+| <a name="output_redshift_cluster_identifier"></a> [redshift\_cluster\_identifier](#output\_redshift\_cluster\_identifier) | The Redshift cluster identifier |
+| <a name="output_redshift_cluster_node_type"></a> [redshift\_cluster\_node\_type](#output\_redshift\_cluster\_node\_type) | The type of nodes in the cluster |
+| <a name="output_redshift_cluster_parameter_group_name"></a> [redshift\_cluster\_parameter\_group\_name](#output\_redshift\_cluster\_parameter\_group\_name) | The name of the parameter group to be associated with this cluster |
+| <a name="output_redshift_cluster_port"></a> [redshift\_cluster\_port](#output\_redshift\_cluster\_port) | The port the cluster responds on |
+| <a name="output_redshift_cluster_preferred_maintenance_window"></a> [redshift\_cluster\_preferred\_maintenance\_window](#output\_redshift\_cluster\_preferred\_maintenance\_window) | The backup window |
+| <a name="output_redshift_cluster_public_key"></a> [redshift\_cluster\_public\_key](#output\_redshift\_cluster\_public\_key) | The public key for the cluster |
+| <a name="output_redshift_cluster_revision_number"></a> [redshift\_cluster\_revision\_number](#output\_redshift\_cluster\_revision\_number) | The specific revision number of the database in the cluster |
+| <a name="output_redshift_cluster_security_groups"></a> [redshift\_cluster\_security\_groups](#output\_redshift\_cluster\_security\_groups) | The security groups associated with the cluster |
+| <a name="output_redshift_cluster_subnet_group_name"></a> [redshift\_cluster\_subnet\_group\_name](#output\_redshift\_cluster\_subnet\_group\_name) | The name of a cluster subnet group to be associated with this cluster |
+| <a name="output_redshift_cluster_type"></a> [redshift\_cluster\_type](#output\_redshift\_cluster\_type) | The Redshift cluster type |
+| <a name="output_redshift_cluster_version"></a> [redshift\_cluster\_version](#output\_redshift\_cluster\_version) | The version of Redshift engine software |
+| <a name="output_redshift_cluster_vpc_security_group_ids"></a> [redshift\_cluster\_vpc\_security\_group\_ids](#output\_redshift\_cluster\_vpc\_security\_group\_ids) | The VPC security group ids associated with the cluster |
+| <a name="output_redshift_parameter_group_id"></a> [redshift\_parameter\_group\_id](#output\_redshift\_parameter\_group\_id) | The ID of Redshift parameter group created by this module |
+| <a name="output_redshift_subnet_group_id"></a> [redshift\_subnet\_group\_id](#output\_redshift\_subnet\_group\_id) | The ID of Redshift subnet group created by this module |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 ## Authors

examples/complete/README.md

@@ -31,8 +31,8 @@ No providers.
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_redshift"></a> [redshift](#module\_redshift) | ../../ |  |
-| <a name="module_sg"></a> [sg](#module\_sg) | terraform-aws-modules/security-group/aws//modules/redshift | ~> 3.0 |
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 2.0 |
+| <a name="module_sg"></a> [sg](#module\_sg) | terraform-aws-modules/security-group/aws//modules/redshift | ~> 4.0 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
 
 ## Resources
 
@@ -46,10 +46,10 @@ No inputs.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_this_redshift_cluster_endpoint"></a> [this\_redshift\_cluster\_endpoint](#output\_this\_redshift\_cluster\_endpoint) | Redshift endpoint |
-| <a name="output_this_redshift_cluster_hostname"></a> [this\_redshift\_cluster\_hostname](#output\_this\_redshift\_cluster\_hostname) | Redshift hostname |
-| <a name="output_this_redshift_cluster_id"></a> [this\_redshift\_cluster\_id](#output\_this\_redshift\_cluster\_id) | The availability zone of the RDS instance |
-| <a name="output_this_redshift_cluster_port"></a> [this\_redshift\_cluster\_port](#output\_this\_redshift\_cluster\_port) | Redshift port |
-| <a name="output_this_security_group_id"></a> [this\_security\_group\_id](#output\_this\_security\_group\_id) | The ID of the security group |
+| <a name="output_redshift_cluster_endpoint"></a> [redshift\_cluster\_endpoint](#output\_redshift\_cluster\_endpoint) | Redshift endpoint |
+| <a name="output_redshift_cluster_hostname"></a> [redshift\_cluster\_hostname](#output\_redshift\_cluster\_hostname) | Redshift hostname |
+| <a name="output_redshift_cluster_id"></a> [redshift\_cluster\_id](#output\_redshift\_cluster\_id) | The availability zone of the RDS instance |
+| <a name="output_redshift_cluster_port"></a> [redshift\_cluster\_port](#output\_redshift\_cluster\_port) | Redshift port |
+| <a name="output_security_group_id"></a> [security\_group\_id](#output\_security\_group\_id) | The ID of the security group |
 | <a name="output_vpc_id"></a> [vpc\_id](#output\_vpc\_id) | The ID of the VPC |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/complete/main.tf

@@ -7,7 +7,7 @@ provider "aws" {
 ######
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 2.0"
+  version = "~> 3.0"
 
   name = "demo-vpc"
 
@@ -22,7 +22,7 @@ module "vpc" {
 ###########################
 module "sg" {
   source  = "terraform-aws-modules/security-group/aws//modules/redshift"
-  version = "~> 3.0"
+  version = "~> 4.0"
 
   name   = "demo-redshift"
   vpc_id = module.vpc.vpc_id
@@ -49,7 +49,7 @@ module "redshift" {
   cluster_master_password = "MySecretPassw0rd"
 
   subnets                = module.vpc.redshift_subnets
-  vpc_security_group_ids = [module.sg.this_security_group_id]
+  vpc_security_group_ids = [module.sg.security_group_id]
 
   #  redshift_subnet_group_name = module.vpc.redshift_subnet_group
 }

examples/complete/outputs.tf

@@ -3,27 +3,27 @@ output "vpc_id" {
   value       = module.vpc.vpc_id
 }
 
-output "this_security_group_id" {
+output "security_group_id" {
   description = "The ID of the security group"
-  value       = module.sg.this_security_group_id
+  value       = module.sg.security_group_id
 }
 
-output "this_redshift_cluster_id" {
+output "redshift_cluster_id" {
   description = "The availability zone of the RDS instance"
-  value       = module.redshift.this_redshift_cluster_id
+  value       = module.redshift.redshift_cluster_id
 }
 
-output "this_redshift_cluster_endpoint" {
+output "redshift_cluster_endpoint" {
   description = "Redshift endpoint"
-  value       = module.redshift.this_redshift_cluster_endpoint
+  value       = module.redshift.redshift_cluster_endpoint
 }
 
-output "this_redshift_cluster_hostname" {
+output "redshift_cluster_hostname" {
   description = "Redshift hostname"
-  value       = module.redshift.this_redshift_cluster_hostname
+  value       = module.redshift.redshift_cluster_hostname
 }
 
-output "this_redshift_cluster_port" {
+output "redshift_cluster_port" {
   description = "Redshift port"
-  value       = module.redshift.this_redshift_cluster_port
+  value       = module.redshift.redshift_cluster_port
 }

outputs.tf

@@ -1,54 +1,54 @@
-output "this_redshift_cluster_arn" {
+output "redshift_cluster_arn" {
   description = "The Redshift cluster ARN"
   value       = aws_redshift_cluster.this.arn
 }
 
-output "this_redshift_cluster_id" {
+output "redshift_cluster_id" {
   description = "The Redshift cluster ID"
   value       = aws_redshift_cluster.this.id
 }
 
-output "this_redshift_cluster_identifier" {
+output "redshift_cluster_identifier" {
   description = "The Redshift cluster identifier"
   value       = aws_redshift_cluster.this.cluster_identifier
 }
 
-output "this_redshift_cluster_type" {
+output "redshift_cluster_type" {
   description = "The Redshift cluster type"
   value       = aws_redshift_cluster.this.cluster_type
 }
 
-output "this_redshift_cluster_node_type" {
+output "redshift_cluster_node_type" {
   description = "The type of nodes in the cluster"
   value       = aws_redshift_cluster.this.node_type
 }
 
-output "this_redshift_cluster_database_name" {
+output "redshift_cluster_database_name" {
   description = "The name of the default database in the Cluster"
   value       = aws_redshift_cluster.this.database_name
 }
 
-output "this_redshift_cluster_availability_zone" {
+output "redshift_cluster_availability_zone" {
   description = "The availability zone of the Cluster"
   value       = aws_redshift_cluster.this.availability_zone
 }
 
-output "this_redshift_cluster_automated_snapshot_retention_period" {
+output "redshift_cluster_automated_snapshot_retention_period" {
   description = "The backup retention period"
   value       = aws_redshift_cluster.this.automated_snapshot_retention_period
 }
 
-output "this_redshift_cluster_preferred_maintenance_window" {
+output "redshift_cluster_preferred_maintenance_window" {
   description = "The backup window"
   value       = aws_redshift_cluster.this.preferred_maintenance_window
 }
 
-output "this_redshift_cluster_endpoint" {
+output "redshift_cluster_endpoint" {
   description = "The connection endpoint"
   value       = aws_redshift_cluster.this.endpoint
 }
 
-output "this_redshift_cluster_hostname" {
+output "redshift_cluster_hostname" {
   description = "The hostname of the Redshift cluster"
   value = replace(
     aws_redshift_cluster.this.endpoint,
@@ -57,57 +57,57 @@ output "this_redshift_cluster_hostname" {
   )
 }
 
-output "this_redshift_cluster_encrypted" {
+output "redshift_cluster_encrypted" {
   description = "Whether the data in the cluster is encrypted"
   value       = aws_redshift_cluster.this.encrypted
 }
 
-output "this_redshift_cluster_security_groups" {
+output "redshift_cluster_security_groups" {
   description = "The security groups associated with the cluster"
   value       = aws_redshift_cluster.this.cluster_security_groups
 }
 
-output "this_redshift_cluster_vpc_security_group_ids" {
+output "redshift_cluster_vpc_security_group_ids" {
   description = "The VPC security group ids associated with the cluster"
   value       = aws_redshift_cluster.this.vpc_security_group_ids
 }
 
-output "this_redshift_cluster_port" {
+output "redshift_cluster_port" {
   description = "The port the cluster responds on"
   value       = aws_redshift_cluster.this.port
 }
 
-output "this_redshift_cluster_version" {
+output "redshift_cluster_version" {
   description = "The version of Redshift engine software"
   value       = aws_redshift_cluster.this.cluster_version
 }
 
-output "this_redshift_cluster_parameter_group_name" {
+output "redshift_cluster_parameter_group_name" {
   description = "The name of the parameter group to be associated with this cluster"
   value       = aws_redshift_cluster.this.cluster_parameter_group_name
 }
 
-output "this_redshift_cluster_subnet_group_name" {
+output "redshift_cluster_subnet_group_name" {
   description = "The name of a cluster subnet group to be associated with this cluster"
   value       = aws_redshift_cluster.this.cluster_subnet_group_name
 }
 
-output "this_redshift_cluster_public_key" {
+output "redshift_cluster_public_key" {
   description = "The public key for the cluster"
   value       = aws_redshift_cluster.this.cluster_public_key
 }
 
-output "this_redshift_cluster_revision_number" {
+output "redshift_cluster_revision_number" {
   description = "The specific revision number of the database in the cluster"
   value       = aws_redshift_cluster.this.cluster_revision_number
 }
 
-output "this_redshift_subnet_group_id" {
+output "redshift_subnet_group_id" {
   description = "The ID of Redshift subnet group created by this module"
   value       = element(concat(aws_redshift_subnet_group.this.*.id, [""]), 0)
 }
 
-output "this_redshift_parameter_group_id" {
+output "redshift_parameter_group_id" {
   description = "The ID of Redshift parameter group created by this module"
   value       = element(concat(aws_redshift_parameter_group.this.*.id, [""]), 0)
 }