Merge pull request #7 from ministryofjustice/versions

Fix versions, variables and add outputs.tf file
ministryofjustice · Feb 9, 2021 · 68fbeec · 68fbeec
2 parents de29ec3 + 47079c5
commit 68fbeec
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/main.tf b/main.tf
@@ -14,7 +14,7 @@ resource "aws_s3_bucket" "default" {
     prevent_destroy = true
   }
 
-  dynamic lifecycle_rule {
+  dynamic "lifecycle_rule" {
     for_each = var.enable_lifecycle_rules ? [var.enable_lifecycle_rules] : []
 
     content {
@@ -32,7 +32,7 @@ resource "aws_s3_bucket" "default" {
     }
   }
 
-  dynamic logging {
+  dynamic "logging" {
     for_each = (length(var.log_bucket) > 0) ? [var.log_bucket] : []
 
     content {

diff --git a/output.tf b/output.tf
diff --git a/outputs.tf b/outputs.tf
@@ -0,0 +1,4 @@
+output "bucket" {
+  value       = aws_s3_bucket.default
+  description = "Direct aws_s3_bucket resource with all attributes"
+}
diff --git a/variables.tf b/variables.tf
@@ -7,7 +7,7 @@ variable "acl" {
 variable "bucket_policy" {
   type        = string
   description = "JSON for the bucket policy"
-  default     = ""
+  default     = "{}"
 }
 
 variable "bucket_prefix" {
@@ -52,6 +52,6 @@ variable "replication_role_arn" {
 }
 
 variable "tags" {
-  type        = map
+  type        = map(any)
   description = "Tags to apply to resources, where applicable"
 }
diff --git a/versions.tf b/versions.tf
@@ -1,7 +1,8 @@
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
+      source  = "hashicorp/aws"
+      version = ">= 3.20.0"
     }
   }
   required_version = ">= 0.13"