From c868c7fbca27676336a1747c521cb7185977d37e Mon Sep 17 00:00:00 2001
From: Grzegorz Huber <ghuber@aarete.com>
Date: Thu, 6 Jun 2024 17:28:21 +0200
Subject: [PATCH] terraform refactor - update EC2 key

---
 streamlit-server/main.tf            |  4 ++--
 streamlit-server/variables.tf       | 15 ++-------------
 streamlit-server/vars-dev.tfvars    |  3 ++-
 streamlit-server/vars-uat.tfvars    |  3 ++-
 textract-pipeline/terraform/main.tf |  3 +--
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/streamlit-server/main.tf b/streamlit-server/main.tf
index 0a82054..112322c 100644
--- a/streamlit-server/main.tf
+++ b/streamlit-server/main.tf
@@ -87,8 +87,8 @@ resource "aws_instance" "streamlit_server" {
   vpc_security_group_ids = data.aws_security_groups.security_groups.ids
   iam_instance_profile = aws_iam_instance_profile.ec2_instance_profile.name
   associate_public_ip_address = false
-  key_name = "tf-uat-key" # Created using TF and uploaded to S3. Prerequisite
-
+  key_name = var.key_name
+  
   root_block_device {
     volume_size = 30 # Variable
     encrypted = true # Mandatory
diff --git a/streamlit-server/variables.tf b/streamlit-server/variables.tf
index 7e18a5f..b5bec10 100644
--- a/streamlit-server/variables.tf
+++ b/streamlit-server/variables.tf
@@ -69,16 +69,5 @@ variable "acm_arns" {
   }
 }
 
-#variable "secret_key" {
-#  type    = string
-#}
-#
-## required
-#variable "access_key" {
-#  type    = string
-#}
-#
-## required
-#variable "token" {
-#  type    = string
-#}
+variable "key_name" {
+}
diff --git a/streamlit-server/vars-dev.tfvars b/streamlit-server/vars-dev.tfvars
index 5857322..50fcb55 100644
--- a/streamlit-server/vars-dev.tfvars
+++ b/streamlit-server/vars-dev.tfvars
@@ -1 +1,2 @@
-vpc_id = "vpc-0f9d7c913f6522079"
\ No newline at end of file
+vpc_id = "vpc-0f9d7c913f6522079"
+key_name = "tf-test-key"
\ No newline at end of file
diff --git a/streamlit-server/vars-uat.tfvars b/streamlit-server/vars-uat.tfvars
index 689920a..96cb6a8 100644
--- a/streamlit-server/vars-uat.tfvars
+++ b/streamlit-server/vars-uat.tfvars
@@ -1 +1,2 @@
-vpc_id = "vpc-0392396d0e7bdd77f"
\ No newline at end of file
+vpc_id = "vpc-0392396d0e7bdd77f"
+key_name = "tf-uat-key"
\ No newline at end of file
diff --git a/textract-pipeline/terraform/main.tf b/textract-pipeline/terraform/main.tf
index 0284a95..bc472fb 100644
--- a/textract-pipeline/terraform/main.tf
+++ b/textract-pipeline/terraform/main.tf
@@ -54,7 +54,7 @@ locals {
 
   # global prefix
   global_prefix = "${var.project_name}-${local.region_short_name}-${local.environment_short_name}-infra"
-  
+
   # Resource prefix
   iam_role_prefix = "${local.global_prefix}-rol"
 
@@ -68,7 +68,6 @@ locals {
   }
 }
 provider "aws" {
-#  profile = var.aws_profile
 
   default_tags {
     tags = local.common_tags