👌 IMPROVE: add 0.13 support & add kms_alias_name

Author: mhmdio

.terraform-version

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

examples/basic/main.tf

@@ -30,6 +30,6 @@ 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
+  kms_alias_name = "${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}-${module.tags.name}"
   tags   = module.tags.tags
 }

examples/basic/provider.tf

@@ -0,0 +1,3 @@
+provider "aws" {
+  region = "eu-central-1"
+}

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"
+    }
   }
 }