From e7b5bdbf5695c702ba08d5dddfd753fbc092c53e Mon Sep 17 00:00:00 2001
From: Manuel Romero <mjromper@gmail.com>
Date: Thu, 22 Jun 2023 13:31:18 +0200
Subject: [PATCH] fixes emr

---
 databases/aws-emr/main.tf    | 23 ++++++++++-------------
 databases/aws-emr/outputs.tf | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/databases/aws-emr/main.tf b/databases/aws-emr/main.tf
index f1ffcd2..6a4a2cc 100644
--- a/databases/aws-emr/main.tf
+++ b/databases/aws-emr/main.tf
@@ -9,17 +9,14 @@ terraform {
   }
 }
 
-resource "random_password" "password" {
-  length = 16
-  special = true
-  override_special = "_!"
-  upper = true
-  lower = true
-  numeric = true
-  min_lower = 2
-  min_upper = 2
-  min_numeric = 1
-  min_special = 2
+
+module "qmi-s3-bucket" {
+
+  source = "git::https://gitlab.com/qmi/qmi-cloud-tf-modules.git//s3-bucket"
+  
+  provision_id                  = var.provision_id
+  region                        = var.region
+  user_id                       = var.user_id
 }
 
 module "emr" {
@@ -100,7 +97,7 @@ module "emr" {
   vpc_id = var.vpc_id_us
 
   list_steps_states  = ["PENDING", "RUNNING", "FAILED", "INTERRUPTED"]
-  log_uri            = "s3://qmi-emr/${var.provision_id}"
+  log_uri            = "s3://${module.qmi-s3-bucket.bucket}/"
 
   scale_down_behavior    = "TERMINATE_AT_TASK_COMPLETION"
   step_concurrency_level = 3
@@ -108,7 +105,7 @@ module "emr" {
   visible_to_all_users   = true
   
   is_private_cluster = false
-  
+
   tags = {
     Terraform   = "true"
     Environment = "dev"
diff --git a/databases/aws-emr/outputs.tf b/databases/aws-emr/outputs.tf
index e69de29..d8ec635 100644
--- a/databases/aws-emr/outputs.tf
+++ b/databases/aws-emr/outputs.tf
@@ -0,0 +1,15 @@
+output "s3_bucket" {
+  value = module.qmi-s3-bucket.bucket
+}
+
+output "s3_iam_name" {
+  value = module.qmi-s3-bucket.iam_name
+}
+
+output "s3_iam_access_key" {
+  value = module.qmi-s3-bucket.iam_access_key
+}
+
+output "s3_iam_access_secret" {
+  value =  module.qmi-s3-bucket.iam_access_secret
+}
\ No newline at end of file