From 6373b0b0f1f8ba53585c4cc66e9b23909fe2cb06 Mon Sep 17 00:00:00 2001
From: pmikus <peter.mikus@protonmail.ch>
Date: Fri, 23 Sep 2022 09:57:11 +0200
Subject: [PATCH] fix(terraform): AWS

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: Id2d09ae88d34154f003a6d69b82a234a4c08dc15
---
 fdio.infra.terraform/terraform-aws-1n-aws-c5n/main.tf      |  2 --
 fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf | 14 +-------------
 fdio.infra.terraform/terraform-aws-1n-aws-c5n/versions.tf  |  6 +++---
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/main.tf b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/main.tf
index c99d839bd2..da6367e922 100644
--- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/main.tf
+++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/main.tf
@@ -40,8 +40,6 @@ module "subnet_b" {
 # Create Private Key
 resource "tls_private_key" "private_key" {
   algorithm   = var.private_key_algorithm
-  ecdsa_curve = var.private_key_ecdsa_curve
-  rsa_bits    = var.private_key_rsa_bits
 }
 
 # Create Key Pair
diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf
index 0eb6bcc769..f560b8fa71 100644
--- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf
@@ -24,19 +24,7 @@ variable "testbed_name" {
 variable "private_key_algorithm" {
   description = "The name of the algorithm to use for the key."
   type        = string
-  default     = "RSA"
-}
-
-variable "private_key_ecdsa_curve" {
-  description = "When algorithm is ECDSA, the name of the elliptic curve to use."
-  type        = string
-  default     = "P521"
-}
-
-variable "private_key_rsa_bits" {
-  description = "When algorithm is RSA, the size of the generated RSA key in bits."
-  type        = number
-  default     = 4096
+  default     = "ED25519"
 }
 
 # Variables for Placement Group
diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/versions.tf b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/versions.tf
index 0eead1fc01..8bbe0c431c 100644
--- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/versions.tf
+++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/versions.tf
@@ -6,14 +6,14 @@ terraform {
     }
     null = {
       source  = "hashicorp/null"
-      version = "~> 3.1.0"
+      version = ">= 3.1.1"
     }
     tls = {
       source  = "hashicorp/tls"
-      version = "~> 3.1.0"
+      version = ">= 4.0.3"
     }
     vault = {
-      version = ">=2.22.1"
+      version = ">= 2.22.1"
     }
   }
   required_version = ">= 1.0.4"
-- 
2.16.6