Use minimum versions for provider pinning and support 3.0 s3 resources (#63)

Author: woz5999

README.md

@@ -196,19 +196,19 @@ Available targets:
 
 | Name | Version |
 |------|---------|
-| terraform | >= 0.12.0, < 0.14.0 |
-| aws | ~> 2.0 |
-| local | ~> 1.2 |
-| null | ~> 2.0 |
-| template | ~> 2.0 |
+| terraform | >= 0.12.0 |
+| aws | >= 2.0 |
+| local | >= 1.2 |
+| null | >= 2.0 |
+| template | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | ~> 2.0 |
-| local | ~> 1.2 |
-| template | ~> 2.0 |
+| aws | >= 2.0 |
+| local | >= 1.2 |
+| template | >= 2.0 |
 
 ## Inputs
 
@@ -238,7 +238,6 @@ Available targets:
 | profile | AWS profile name as set in the shared credentials file | `string` | `""` | no |
 | read\_capacity | DynamoDB read capacity units | `number` | `5` | no |
 | regex\_replace\_chars | Regex to replace chars with empty string in `namespace`, `environment`, `stage` and `name`. By default only hyphens, letters and digits are allowed, all other chars are removed | `string` | `"/[^a-zA-Z0-9-]/"` | no |
-| region | AWS Region the S3 bucket should reside in | `string` | n/a | yes |
 | restrict\_public\_buckets | Whether Amazon S3 should restrict public bucket policies for this bucket | `bool` | `true` | no |
 | role\_arn | The role to be assumed | `string` | `""` | no |
 | s3\_bucket\_name | S3 bucket name. If not provided, the name will be generated by the label module in the format namespace-stage-name | `string` | `""` | no |

docs/terraform.md

@@ -3,19 +3,19 @@
 
 | Name | Version |
 |------|---------|
-| terraform | >= 0.12.0, < 0.14.0 |
-| aws | ~> 2.0 |
-| local | ~> 1.2 |
-| null | ~> 2.0 |
-| template | ~> 2.0 |
+| terraform | >= 0.12.0 |
+| aws | >= 2.0 |
+| local | >= 1.2 |
+| null | >= 2.0 |
+| template | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | ~> 2.0 |
-| local | ~> 1.2 |
-| template | ~> 2.0 |
+| aws | >= 2.0 |
+| local | >= 1.2 |
+| template | >= 2.0 |
 
 ## Inputs
 
@@ -45,7 +45,6 @@
 | profile | AWS profile name as set in the shared credentials file | `string` | `""` | no |
 | read\_capacity | DynamoDB read capacity units | `number` | `5` | no |
 | regex\_replace\_chars | Regex to replace chars with empty string in `namespace`, `environment`, `stage` and `name`. By default only hyphens, letters and digits are allowed, all other chars are removed | `string` | `"/[^a-zA-Z0-9-]/"` | no |
-| region | AWS Region the S3 bucket should reside in | `string` | n/a | yes |
 | restrict\_public\_buckets | Whether Amazon S3 should restrict public bucket policies for this bucket | `bool` | `true` | no |
 | role\_arn | The role to be assumed | `string` | `""` | no |
 | s3\_bucket\_name | S3 bucket name. If not provided, the name will be generated by the label module in the format namespace-stage-name | `string` | `""` | no |

examples/complete/main.tf

@@ -5,7 +5,6 @@ provider "aws" {
 module "tfstate_backend" {
   source = "../../"
 
-  region    = var.region
   namespace = var.namespace
   stage     = var.stage
   name      = var.name

main.tf

@@ -125,7 +125,6 @@ data "aws_iam_policy_document" "prevent_unencrypted_uploads" {
 resource "aws_s3_bucket" "default" {
   bucket        = substr(local.bucket_name, 0, 63)
   acl           = var.acl
-  region        = var.region
   force_destroy = var.force_destroy
   policy        = local.policy
 
@@ -225,11 +224,13 @@ resource "aws_dynamodb_table" "without_server_side_encryption" {
   tags = module.dynamodb_table_label.tags
 }
 
+data "aws_region" "current" {}
+
 data "template_file" "terraform_backend_config" {
   template = file(local.terraform_backend_config_template_file)
 
   vars = {
-    region = var.region
+    region = data.aws_region.current.name
     bucket = aws_s3_bucket.default.id
 
     dynamodb_table = element(

variables.tf

@@ -82,11 +82,6 @@ variable "label_order" {
   description = "The naming order of the id output and Name tag"
 }
 
-variable "region" {
-  type        = string
-  description = "AWS Region the S3 bucket should reside in"
-}
-
 variable "arn_format" {
   type        = string
   default     = "arn:aws"

versions.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 0.12.0, < 0.14.0"
+  required_version = ">= 0.12.0"
 
   required_providers {
-    aws      = "~> 2.0"
-    template = "~> 2.0"
-    local    = "~> 1.2"
-    null     = "~> 2.0"
+    aws      = ">= 2.0"
+    template = ">= 2.0"
+    local    = ">= 1.2"
+    null     = ">= 2.0"
   }
 }