fix dependecy and add workspace_id as a new output (#98)

Author: dleiva04

modules/aws-exfiltration-protection/s3.tf

@@ -21,8 +21,9 @@ resource "aws_s3_bucket_ownership_controls" "state" {
 }
 
 resource "aws_s3_bucket_acl" "acl" {
-  bucket = aws_s3_bucket.root_storage_bucket.id
-  acl    = "private"
+  bucket     = aws_s3_bucket.root_storage_bucket.id
+  acl        = "private"
+  depends_on = [aws_s3_bucket_ownership_controls.state]
 }
 
 resource "aws_s3_bucket_server_side_encryption_configuration" "root_storage_bucket" {
@@ -48,4 +49,4 @@ resource "aws_s3_bucket_policy" "root_bucket_policy" {
   bucket     = aws_s3_bucket.root_storage_bucket.id
   policy     = data.databricks_aws_bucket_policy.this.json
   depends_on = [aws_s3_bucket_public_access_block.root_storage_bucket]
-}
+}

modules/aws-workspace-basic/outputs.tf

@@ -5,4 +5,8 @@ output "databricks_host" {
 output "databricks_token" {
   value     = databricks_mws_workspaces.this.token[0].token_value
   sensitive = true
-}
+}
+
+output "workspace_id" {
+  value = databricks_mws_workspaces.this.workspace_id
+}

modules/aws-workspace-basic/s3.tf

@@ -21,8 +21,9 @@ resource "aws_s3_bucket_ownership_controls" "state" {
 }
 
 resource "aws_s3_bucket_acl" "acl" {
-  bucket = aws_s3_bucket.root_storage_bucket.id
-  acl    = "private"
+  bucket     = aws_s3_bucket.root_storage_bucket.id
+  acl        = "private"
+  depends_on = [aws_s3_bucket_ownership_controls.state]
 }
 
 resource "aws_s3_bucket_server_side_encryption_configuration" "root_storage_bucket" {
@@ -47,4 +48,4 @@ resource "aws_s3_bucket_policy" "root_bucket_policy" {
   bucket     = aws_s3_bucket.root_storage_bucket.id
   policy     = data.databricks_aws_bucket_policy.this.json
   depends_on = [aws_s3_bucket_public_access_block.root_storage_bucket]
-}
+}

modules/aws-workspace-with-firewall/s3.tf

@@ -1,5 +1,5 @@
 resource "aws_s3_bucket" "root_storage_bucket" {
-  bucket = "${local.prefix}-rootbucket"
+  bucket        = "${local.prefix}-rootbucket"
   force_destroy = true
   tags = merge(var.tags, {
     Name = "${local.prefix}-rootbucket"
@@ -40,11 +40,12 @@ resource "aws_s3_bucket_ownership_controls" "state" {
 resource "aws_s3_bucket_acl" "root_storage_bucket" {
   bucket     = aws_s3_bucket.root_storage_bucket.id
   acl        = "private"
+  depends_on = [aws_s3_bucket_ownership_controls.state]
 }
 
 resource "aws_s3_bucket_versioning" "versioning_example" {
-  bucket     = aws_s3_bucket.root_storage_bucket.id
+  bucket = aws_s3_bucket.root_storage_bucket.id
   versioning_configuration {
     status = "Disabled"
   }
-}
+}