Added .editorconfig file and fixed missing EOL's on files

Author: robg-test

modules/aws/ec2/examples/example.tf

@@ -103,4 +103,3 @@ DATABASE_ENGINE=django.db.backends.mysql
 EOL
   EOF
 }
-

modules/aws/ec2/main.tf

@@ -46,18 +46,20 @@ resource "aws_iam_role_policy_attachment" "instance_role" {
 }
 
 resource "tls_private_key" "private_key" {
+  count     = var.custom_ssh_key == "" ? 0 : 1
   algorithm = "RSA"
   rsa_bits  = 4096
 }
 
 resource "aws_key_pair" "key_pair" {
+  count      = var.custom_ssh_key == "" ? 0 : 1
   key_name   = "${var.project_name}-key-pair"
   public_key = tls_private_key.private_key.public_key_openssh
 }
 
 resource "aws_instance" "ec2" {
   instance_type = var.ec2_instance_type
-  key_name      = aws_key_pair.key_pair.key_name
+  key_name      = var aws_key_pair.key_pair.key_name
   ami           = var.ami_id
   metadata_options {
     http_endpoint = "enabled"

modules/aws/ec2/output.tf

@@ -12,4 +12,4 @@ output "private_key" {
   value       = tls_private_key.private_key.private_key_pem
   description = "This outputs the private key."
   sensitive   = true
-}
+}

modules/aws/ec2/variables.tf

@@ -62,4 +62,10 @@ variable "user_data_replace_on_change" {
   type        = bool
   default     = true
   description = "This value indicates whether changes to the `user_data` value triggers a rebuild of the EC2 instance."
-}
+}
+
+variable "custom_ssh_key" {
+  type        = string
+  description = "Provide a SSH Key to have that key used for this box, by default the SSH key will be managed by this module"
+  default     = ""
+}

modules/aws/rds_serverless_cluster/examples/example.tf

@@ -56,4 +56,4 @@ module "rds_cluster_setup" {
   database_security_groups        = [aws_security_group.aws_sg.id]
   replicate_on_availability_zones = [module.vpc_subnet.az_zones[1]]
   prevent_deletion                = false
-}
+}

modules/aws/rds_serverless_cluster/examples/outputs.tf

@@ -21,4 +21,4 @@ output "rds_cluster_replica_instance_endpoints" {
 }
 output "rds_cluster_replica_instance_ports" {
   value = module.rds_cluster_setup.rds_cluster_replica_instance_ports
-}
+}

modules/aws/rds_serverless_cluster/main.tf

@@ -110,4 +110,4 @@ resource "random_password" "password" {
 
 resource "random_id" "secrets_id" {
   byte_length = 8
-}
+}

modules/aws/rds_serverless_cluster/output.tf

@@ -33,4 +33,4 @@ output "rds_cluster_master_password" {
 output "rds_cluster_instance_db_name" {
   value       = aws_rds_cluster.rds_cluster.database_name
   description = "This is the name of the database created. This value should be used when referencing the `DATABASE_NAME` in your configuration. This output is of type `string`."
-}
+}

modules/aws/rds_serverless_cluster/variables.tf

@@ -100,4 +100,4 @@ variable "database_auto_minor_version_upgrade" {
 
 variable "prevent_deletion" {
   type = bool
-}
+}

modules/aws/state_manager/locals.tf

@@ -1,3 +1,3 @@
 locals {
   state_management_key = "global/${var.environment}/s3/terraform.tfstate"
-}
+}