diff --git a/org-logging/README.md b/org-logging/README.md index e67fe9a..bedbe74 100644 --- a/org-logging/README.md +++ b/org-logging/README.md @@ -120,15 +120,16 @@ module "org_logging" { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12 | +| [terraform](#requirement\_terraform) | >= 0.13 | | [aws](#requirement\_aws) | >= 3.66.0 | +| [time](#requirement\_time) | >= 0.9.1 | ## Providers | Name | Version | |------|---------| | [aws](#provider\_aws) | >= 3.66.0 | -| [null](#provider\_null) | n/a | +| [time](#provider\_time) | >= 0.9.1 | ## Modules @@ -160,7 +161,7 @@ No modules. | [aws_sqs_queue_policy.additional_logging_sqs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sqs_queue_policy) | resource | | [aws_sqs_queue_policy.logging_deadletter](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sqs_queue_policy) | resource | | [aws_sqs_queue_policy.logging_sqs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sqs_queue_policy) | resource | -| [null_resource.policy_delay](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource | +| [time_sleep.policy_delay](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource | | [aws_arn.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/arn) | data source | | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | | [aws_iam_policy_document.additional_logging_deadletter](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source | diff --git a/org-logging/s3.tf b/org-logging/s3.tf index 63a86cd..e3e52ab 100644 --- a/org-logging/s3.tf +++ b/org-logging/s3.tf @@ -103,7 +103,7 @@ data "aws_iam_policy_document" "bucket_policy" { resource "aws_s3_bucket_policy" "policy" { bucket = aws_s3_bucket.this.bucket policy = data.aws_iam_policy_document.bucket_policy.json - depends_on = [null_resource.policy_delay] + depends_on = [time_sleep.policy_delay] } resource "aws_s3_bucket_public_access_block" "this" { @@ -114,16 +114,23 @@ resource "aws_s3_bucket_public_access_block" "this" { restrict_public_buckets = true } -#--- -# 180s delay needed for bucket to create and policy to apply, before -# creating a logging to point to it -#--- -resource "null_resource" "policy_delay" { +## #--- +## # 180s delay needed for bucket to create and policy to apply, before +## # creating a logging to point to it +## #--- +## resource "null_resource" "policy_delay" { +## triggers = { +## bucket = aws_s3_bucket.this.id +## } +## provisioner "local-exec" { +## when = create +## command = "sleep 180" +## } +## } + +resource "time_sleep" "policy_delay" { triggers = { bucket = aws_s3_bucket.this.id } - provisioner "local-exec" { - when = create - command = "sleep 180" - } + create_duration = "180s" } diff --git a/org-logging/versions.tf b/org-logging/versions.tf index 3d116e6..6b09f22 100644 --- a/org-logging/versions.tf +++ b/org-logging/versions.tf @@ -4,11 +4,15 @@ terraform { source = "hashicorp/aws" version = ">= 3.66.0" } + time = { + source = "hashicorp/time" + version = ">= 0.9.1" + } # ldap = { # source = "trevex/ldap" # version = ">= 0.5.4" # } } - required_version = ">= 0.12" - # required_version = ">= 0.13" + # required_version = ">= 0.12" + required_version = ">= 0.13" }