Merge pull request #9 from mhmdio/master

 👌 IMPROVE & 🐛 FIX

Author: sblack4

.terraform-version

@@ -1 +1 @@
-0.12.20
+0.13.5

README.md

@@ -58,21 +58,22 @@ region               = "us-east-1"
 
 | Name | Version |
 |------|---------|
-| terraform | >= 0.12.19 |
-| aws | ~> 2.37 |
+| terraform | >= 0.13 |
+| aws | ~> 3.15.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | ~> 2.37 |
+| aws | ~> 3.15.0 |
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | allowed\_account\_ids | Account IDs that are allowed to access the bucket/KMS key | `list(string)` | `[]` | no |
 | bucket | Name of bucket to create (do not provide if using `remote_bucket`) | `string` | `""` | no |
+| kms\_alias\_name | Name of KMS Alias | `string` | `""` | no |
 | kms\_key\_id | ARN for KMS key for all encryption operations. | `string` | `""` | no |
 | logging\_target\_bucket | The name of the bucket that will receive the log objects | `string` | `null` | no |
 | logging\_target\_prefix | A key prefix for log objects | `string` | `"TFStateLogs/"` | no |

examples/basic/main.tf

@@ -29,7 +29,7 @@ module "tags" {
 module "backend" {
   source = "../.."
 
-  bucket = "${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}-${module.tags.name}"
-  region = data.aws_region.current.name
-  tags   = module.tags.tags
+  bucket         = "${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}-${module.tags.name}"
+  kms_alias_name = "${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}-${module.tags.name}"
+  tags           = module.tags.tags
 }

examples/external-logging/main.tf

@@ -26,16 +26,12 @@ module "tags" {
 }
 
 module "bucket" {
-  source  = "rhythmictech/bucket/s3logging"
-  version = "1.0.1"
-
+  source        = "rhythmictech/s3logging-bucket/aws"
+  version       = "2.0.0"
   bucket_suffix = "tfstate-logging"
-  region        = local.region
 }
 
 module "backend" {
-  source = "../.."
-
-  logging_target_bucket = module.bucket.s3logging_bucket_name
-  region                = local.region
+  source                = "../.."
+  logging_target_bucket = module.bucket.s3_bucket_name
 }

kms.tf

@@ -38,14 +38,14 @@ resource "aws_kms_key" "this" {
   policy                  = data.aws_iam_policy_document.key.json
   tags = merge(
     {
-      "Name" = "tf-backend-key"
+      "Name" = var.kms_alias_name != "" ? var.kms_alias_name : "tf_backend_key"
     },
     var.tags
   )
 }
 
 resource "aws_kms_alias" "this" {
   count         = var.kms_key_id == "" ? 1 : 0
-  name          = "alias/tf_backend_config"
+  name          = "alias/${var.kms_alias_name != "" ? var.kms_alias_name : "tf_backend_key"}"
   target_key_id = aws_kms_key.this[0].id
 }

main.tf

@@ -21,7 +21,7 @@ resource "aws_s3_bucket" "this" {
   tags = merge(
     var.tags,
     {
-      "Name" = "tf-state"
+      "Name" = var.bucket
     },
   )
 
@@ -54,6 +54,7 @@ resource "aws_s3_bucket" "this" {
 }
 
 resource "aws_s3_bucket_public_access_block" "this" {
+  depends_on              = [aws_s3_bucket_policy.this]
   count                   = var.remote_bucket == "" ? 1 : 0
   bucket                  = aws_s3_bucket.this[0].id
   block_public_acls       = true

variables.tf

@@ -9,6 +9,11 @@ variable "bucket" {
   description = "Name of bucket to create (do not provide if using `remote_bucket`)"
   type        = string
 }
+variable "kms_alias_name" {
+  default     = ""
+  description = "Name of KMS Alias"
+  type        = string
+}
 
 variable "kms_key_id" {
   default     = ""

versions.tf

@@ -1,8 +1,11 @@
 
 terraform {
-  required_version = ">= 0.12.19"
+  required_version = ">= 0.13"
 
   required_providers {
-    aws = "~> 2.37"
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 3.15.0"
+    }
   }
 }