X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=fdio.infra.terraform%2Fterraform-aws-elastic-beanstalk-environment%2Fmain.tf;fp=fdio.infra.terraform%2F1n_aws_t3%2Fmain.tf;h=7fbf50c711626057a822fcee336ab48df2183752;hp=eb0c046b2ed4ce9c415ed220fe260f50e385a753;hb=6c8ca0ad2a9fe0bab2033e41c6b056226cf9a856;hpb=273a9aa49bba07740b7f7e15277d05f334ab6cc1

diff --git a/fdio.infra.terraform/1n_aws_t3/main.tf b/fdio.infra.terraform/terraform-aws-elastic-beanstalk-environment/main.tf
similarity index 92%
rename from fdio.infra.terraform/1n_aws_t3/main.tf
rename to fdio.infra.terraform/terraform-aws-elastic-beanstalk-environment/main.tf
index eb0c046b2e..7fbf50c711 100644
--- a/fdio.infra.terraform/1n_aws_t3/main.tf
+++ b/fdio.infra.terraform/terraform-aws-elastic-beanstalk-environment/main.tf
@@ -1,5 +1,4 @@
 locals {
-  bucket = "${var.application_name}-bucket"
   tags = {
     "Name"        = "${var.application_name}"
     "Environment" = "${var.application_name}"
@@ -305,51 +304,6 @@ resource "aws_iam_role_policy" "default" {
   role   = aws_iam_role.ec2.id
 }
 
-# Create elastic beanstalk Application
-resource "aws_s3_bucket" "bucket" {
-  bucket = local.bucket
-  tags   = local.tags
-}
-
-resource "aws_s3_object" "object" {
-  bucket = aws_s3_bucket.bucket.id
-  key    = "beanstalk/app.zip"
-  source = "app.zip"
-  tags   = local.tags
-}
-
-resource "aws_elastic_beanstalk_application_version" "application_version" {
-  depends_on = [
-    aws_elastic_beanstalk_application.application
-  ]
-  name        = "${var.application_name}-base"
-  application = var.application_name
-  description = var.application_description
-  bucket      = aws_s3_bucket.bucket.id
-  key         = aws_s3_object.object.id
-  tags        = local.tags
-}
-
-resource "aws_elastic_beanstalk_application" "application" {
-  depends_on = [
-    aws_vpc.vpc,
-    aws_subnet.subnet,
-    aws_ssm_activation.ec2
-  ]
-  name        = var.application_name
-  description = var.application_description
-
-  dynamic "appversion_lifecycle" {
-    for_each = var.appversion_lifecycle_service_role_arn != "" ? ["true"] : []
-    content {
-      service_role          = var.appversion_lifecycle_service_role_arn
-      max_count             = var.appversion_lifecycle_max_count
-      delete_source_from_s3 = var.appversion_lifecycle_delete_source_from_s3
-    }
-  }
-  tags = local.tags
-}
-
 # Create elastic beanstalk Environment
 resource "aws_elastic_beanstalk_environment" "environment" {
   depends_on = [
@@ -357,7 +311,7 @@ resource "aws_elastic_beanstalk_environment" "environment" {
     aws_subnet.subnet,
     aws_ssm_activation.ec2
   ]
-  application            = aws_elastic_beanstalk_application.application.name
+  application            = var.environment_application
   description            = var.environment_description
   name                   = var.environment_name
   solution_stack_name    = var.environment_solution_stack_name