fix(terraform): AWS changes compliance

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: Ibc4ec833c1cc44513b727ddd7d81e6db42bc9f4b

diff --git a/fdio.infra.terraform/terraform-aws-elastic-beanstalk-environment/main.tf b/fdio.infra.terraform/terraform-aws-elastic-beanstalk-environment/main.tf
index fd570ab..2e6fb44 100644 (file)
--- a/fdio.infra.terraform/terraform-aws-elastic-beanstalk-environment/main.tf
+++ b/fdio.infra.terraform/terraform-aws-elastic-beanstalk-environment/main.tf
@@ -422,6 +422,12 @@ resource "aws_elastic_beanstalk_environment" "environment" {
     value     = aws_iam_instance_profile.ec2_iam_instance_profile.name
   }
 
     value     = aws_iam_instance_profile.ec2_iam_instance_profile.name
   }
 

+  setting {
+    namespace = "aws:autoscaling:launchconfiguration"
+    name      = "DisableIMDSv1"
+    value     = true
+  }
+

   # aws:autoscaling:updatepolicy:rollingupdate
   setting {
     namespace = "aws:autoscaling:updatepolicy:rollingupdate"
   # aws:autoscaling:updatepolicy:rollingupdate
   setting {
     namespace = "aws:autoscaling:updatepolicy:rollingupdate"

diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf
index 9b26aff..62fed9d 100644 (file)
--- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf
+++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf
@@ -11,7 +11,7 @@ module "elastic_beanstalk_application" {
   source = "../terraform-aws-elastic-beanstalk-application"
 
   # application
   source = "../terraform-aws-elastic-beanstalk-application"
 
   # application

-  application_description                    = "FD.io CSIT Results Dashboard"
+  application_description                    = "FD.io CDASH"

   application_name                           = "fdio-csit-dash-app"
   appversion_lifecycle_service_role_arn      = ""
   appversion_lifecycle_max_count             = 2
   application_name                           = "fdio-csit-dash-app"
   appversion_lifecycle_service_role_arn      = ""
   appversion_lifecycle_max_count             = 2


@@ -34,13 +34,13 @@ module "elastic_beanstalk_environment" {
   environment_application            = module.elastic_beanstalk_application.application_name
   environment_description            = module.elastic_beanstalk_application.application_description
   environment_name                   = "fdio-csit-dash-env"
   environment_application            = module.elastic_beanstalk_application.application_name
   environment_description            = module.elastic_beanstalk_application.application_description
   environment_name                   = "fdio-csit-dash-env"

-  environment_solution_stack_name    = "64bit Amazon Linux 2 v3.4.0 running Python 3.8"
+  environment_solution_stack_name    = "64bit Amazon Linux 2 v3.4.2 running Python 3.8"

   environment_tier                   = "WebServer"
   environment_wait_for_ready_timeout = "25m"
   environment_version_label          = ""
 
   # aws:ec2:instances
   environment_tier                   = "WebServer"
   environment_wait_for_ready_timeout = "25m"
   environment_version_label          = ""
 
   # aws:ec2:instances

-  instances_instance_types = "t3a.medium"
+  instances_instance_types = "t3a.large"

 
   # aws:ec2:vpc
   associate_public_ip_address = true
 
   # aws:ec2:vpc
   associate_public_ip_address = true

diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf
index 4afbbc0..7143823 100644 (file)
--- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf
+++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf
@@ -1,6 +1,6 @@
 terraform {
   backend "consul" {
 terraform {
   backend "consul" {

-    address = "10.32.8.14:8500"
+    address = "consul.service.consul:8500"

     scheme  = "http"
     path    = "terraform/dash"
   }
     scheme  = "http"
     path    = "terraform/dash"
   }