Added root files

robg-test · robg-test · commit c410b26f436c · 2023-07-06T15:35:00.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,5 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@
 .terraform.lock.hcl
 terraform.tfstate
 terraform.tfstate.backup
-.terraform.tfstate.lock.info
+.terraform.tfstate.lock.info
diff --git a/.terraform-docs.yml b/.terraform-docs.yml
@@ -4,4 +4,4 @@ output:
   file: README.md
 
 settings:
-  hide-empty: true
+  hide-empty: true
diff --git a/modules/aws/ec2/main.tf b/modules/aws/ec2/main.tf
@@ -46,20 +46,18 @@ 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      = var aws_key_pair.key_pair.key_name
+  key_name      = aws_key_pair.key_pair.key_name
   ami           = var.ami_id
   metadata_options {
     http_endpoint = "enabled"

Original file line number	Diff line number	Diff line change
`@@ -46,20 +46,18 @@ resource "aws_iam_role_policy_attachment" "instance_role" {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`resource "tls_private_key" "private_key" {`
`49`		`- count = var.custom_ssh_key == "" ? 0 : 1`
`50`	`49`	`algorithm = "RSA"`
`51`	`50`	`rsa_bits = 4096`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`resource "aws_key_pair" "key_pair" {`
`55`		`- count = var.custom_ssh_key == "" ? 0 : 1`
`56`	`54`	`key_name = "${var.project_name}-key-pair"`
`57`	`55`	`public_key = tls_private_key.private_key.public_key_openssh`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`resource "aws_instance" "ec2" {`
`61`	`59`	`instance_type = var.ec2_instance_type`
`62`		`- key_name = var aws_key_pair.key_pair.key_name`
	`60`	`+ key_name = aws_key_pair.key_pair.key_name`
`63`	`61`	`ami = var.ami_id`
`64`	`62`	`metadata_options {`
`65`	`63`	`http_endpoint = "enabled"`