Upgrade terraform version to 0.14 and update

Author: dhyanio

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.30.0
+    rev: v1.45.0
     hooks:
       - id: terraform_fmt
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.1.0
+    rev: v3.4.0
     hooks:
       - id: check-merge-conflict
       - id: trailing-whitespace

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Cloud Drove
+Copyright (c) 2021 Cloud Drove
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.yaml

@@ -16,7 +16,7 @@ github_repo: clouddrove/terraform-aws-elasticache
 # Badges to display
 badges:
   - name: "Terraform"
-    image: "https://img.shields.io/badge/terraform-v0.13-green"
+    image: "https://img.shields.io/badge/terraform-v0.14-green"
     url: "https://www.terraform.io"
   - name: "Licence"
     image: "https://img.shields.io/badge/License-MIT-blue.svg"
@@ -40,7 +40,7 @@ usage : |-
       module "redis" {
       source                       = "git::https://github.com/clouddrove/terraform-aws-elasticache?ref=tags/0.13.0"
       name                         = "redis"
-      application                  = "clouddrove"
+      repository                   = "clouddrove"
       environment                  = "test"
       label_order                  = ["environment", "application", "name"]
       engine                       = "redis"

_example/memcached/example.tf

@@ -3,23 +3,23 @@ provider "aws" {
 }
 
 module "vpc" {
-  source = "git::https://github.com/clouddrove/terraform-aws-vpc.git?ref=tags/0.13.0"
+  source = "git::https://github.com/clouddrove/terraform-aws-vpc.git?ref=0.14"
 
   name        = "vpc"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   cidr_block = "172.16.0.0/16"
 }
 
 module "subnets" {
-  source = "git::https://github.com/clouddrove/terraform-aws-subnet.git"
+  source = "git::https://github.com/clouddrove/terraform-aws-subnet.git?ref=0.14"
 
   name        = "subnets"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/subnet/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   availability_zones = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
   vpc_id             = module.vpc.vpc_id
@@ -30,12 +30,12 @@ module "subnets" {
 }
 
 module "memcached-sg" {
-  source = "git::https://github.com/clouddrove/terraform-aws-security-group.git"
+  source = "git::https://github.com/clouddrove/terraform-aws-security-group.git?ref=0.14"
 
   name        = "ssh"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   vpc_id        = module.vpc.vpc_id
   allowed_ip    = [module.vpc.vpc_cidr_block]
@@ -46,9 +46,9 @@ module "memcached" {
   source = "./../../"
 
   name        = "memcached"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   cluster_enabled    = true
   engine             = "memcached"

_example/redis-cluster/example.tf

@@ -6,9 +6,9 @@ module "vpc" {
   source = "git::https://github.com/clouddrove/terraform-aws-vpc.git?ref=tags/0.13.0"
 
   name        = "vpc"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   cidr_block = "172.16.0.0/16"
 }
@@ -17,10 +17,9 @@ module "subnets" {
   source = "git::https://github.com/clouddrove/terraform-aws-subnet.git"
 
   name        = "subnets"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/subnet/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
-
+  label_order = ["name", "environment"]
   availability_zones = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
   vpc_id             = module.vpc.vpc_id
   type               = "public"
@@ -33,9 +32,9 @@ module "redis-sg" {
   source = "git::https://github.com/clouddrove/terraform-aws-security-group.git"
 
   name        = "ssh"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   vpc_id        = module.vpc.vpc_id
   allowed_ip    = [module.vpc.vpc_cidr_block]
@@ -46,9 +45,9 @@ module "redis-cluster" {
   source = "./../../"
 
   name        = "cluster"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   cluster_replication_enabled = true
   engine                      = "redis"

_example/redis/example.tf

@@ -6,20 +6,19 @@ module "vpc" {
   source = "git::https://github.com/clouddrove/terraform-aws-vpc.git?ref=tags/0.13.0"
 
   name        = "vpc"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
-
+  label_order = ["name", "environment"]
   cidr_block = "172.16.0.0/16"
 }
 
 module "subnets" {
   source = "git::https://github.com/clouddrove/terraform-aws-subnet.git"
 
   name        = "subnets"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/subnet/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   availability_zones = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
   vpc_id             = module.vpc.vpc_id
@@ -33,9 +32,9 @@ module "redis-sg" {
   source = "git::https://github.com/clouddrove/terraform-aws-security-group.git"
 
   name        = "ssh"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   vpc_id        = module.vpc.vpc_id
   allowed_ip    = [module.vpc.vpc_cidr_block]
@@ -45,9 +44,9 @@ module "redis-sg" {
 module "redis" {
   source      = "./../../"
   name        = "redis"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   replication_enabled        = true
   engine                     = "redis"

main.tf

@@ -8,11 +8,11 @@
 #              tags for resources. You can use terraform-labels to implement a strict
 #              naming convention.
 module "labels" {
-  source = "git::https://github.com/clouddrove/terraform-labels.git?ref=tags/0.13.0"
+  source = "git::https://github.com/clouddrove/terraform-labels.git?ref=0.14"
 
   enabled     = var.enable
   name        = var.name
-  application = var.application
+  repository = var.repository
   environment = var.environment
   managedby   = var.managedby
   label_order = var.label_order

variables.tf

@@ -6,10 +6,16 @@ variable "name" {
   description = "Name  (e.g. `app` or `cluster`)."
 }
 
-variable "application" {
+variable "repository" {
   type        = string
   default     = ""
-  description = "Application (e.g. `cd` or `clouddrove`)."
+  description = "Terraform current module repo"
+
+  validation {
+    # regex(...) fails if it cannot find a match
+    condition     = can(regex("^https://", var.repository))
+    error_message = "The module-repo value must be a valid Git repo link."
+  }
 }
 
 variable "environment" {
@@ -58,6 +64,7 @@ variable "engine" {
 variable "replication_group_id" {
   default     = ""
   description = "The replication group identifier This parameter is stored as a lowercase string."
+  sensitive   = true
 }
 
 variable "automatic_failover_enabled" {
@@ -73,6 +80,7 @@ variable "engine_version" {
 variable "port" {
   default     = ""
   description = "the port number on which each of the cache nodes will accept connections."
+  sensitive   = true
 }
 
 variable "node_type" {
@@ -83,6 +91,7 @@ variable "node_type" {
 variable "security_group_ids" {
   default     = []
   description = "One or more VPC security groups associated with the cache cluster."
+  sensitive   = true
 }
 
 variable "security_group_names" {
@@ -98,6 +107,7 @@ variable "snapshot_arns" {
 variable "snapshot_name" {
   default     = ""
   description = "The name of a snapshot from which to restore data into the new node group. Changing the snapshot_name forces a new resource."
+  sensitive   = true
 }
 
 variable "snapshot_window" {
@@ -113,6 +123,7 @@ variable "snapshot_retention_limit" {
 variable "notification_topic_arn" {
   default     = ""
   description = "An Amazon Resource Name (ARN) of an SNS topic to send ElastiCache notifications to."
+  sensitive   = true
 }
 
 variable "apply_immediately" {
@@ -123,6 +134,7 @@ variable "apply_immediately" {
 variable "subnet_ids" {
   default     = []
   description = "List of VPC Subnet IDs for the cache subnet group."
+  sensitive   = true
 }
 
 variable "description" {
@@ -215,6 +227,7 @@ variable "num_node_groups" {
 variable "kms_key_id" {
   default     = ""
   description = "The ARN of the key that you wish to use if encrypting at rest. If not supplied, uses service managed encryption. Can be specified only if at_rest_encryption_enabled = true."
+  sensitive   = true
 }
 
 variable "parameter_group_name" {

versions.tf

@@ -1,6 +1,6 @@
 # Terraform version
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 0.15"
   required_providers {
     aws = {
       source = "hashicorp/aws"