use existing bucket for logs

jwa-lab · Jan 13, 2023 · 28c222b · 28c222b
1 parent 2e08b68
commit 28c222b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 36 deletions.
diff --git a/data.tf b/data.tf
@@ -31,6 +31,10 @@ data "aws_subnets" "private_apps" {
   }
 }
 
+data "aws_s3_bucket" "aws_bucket" {
+  bucket = var.aws_bucket_id
+}
+
 data "aws_region" "current" {}
 
 data "aws_caller_identity" "current" {}

diff --git a/logs-bucket.tf b/logs-bucket.tf
diff --git a/security-groups.tf b/security-groups.tf
@@ -51,7 +51,7 @@ resource "aws_security_group" "beanstalk_instances_security_group" {
   vpc_id = var.vpc_id
 
   tags = {
-    Name = "${terraform.workspace}-beanstalk-instances"
+    Name = "${var.env_name}-beanstalk-instances"
   }
 }
 

diff --git a/settings.tf b/settings.tf
@@ -208,7 +208,7 @@ locals {
     {
       namespace = "aws:elbv2:loadbalancer"
       name = "AccessLogsS3Bucket"
-      value = aws_s3_bucket.aws_logs_bucket.id
+      value = data.aws_s3_bucket.aws_bucket.id
     },
     {
       namespace = "aws:elbv2:loadbalancer"

diff --git a/variables.tf b/variables.tf
@@ -55,3 +55,8 @@ variable "instance_type" {
   description = "An AWS instance type to use for the environment. Defaults to t4g.small for production environments and t4g.micro for non-production environments"
   default = null
 }
+
+variable "aws_bucket_id" {
+  type = string
+  description = "Name of the S3 Bucket where AWS artifacts (mainly logs) can be written"
+}