Upgrade terraform version to 0.14.0

clouddrove · Dec 18, 2020 · dd1ca4e · dd1ca4e
1 parent b718512
commit dd1ca4e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 29 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,11 +1,11 @@
 repos:
   - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.43.0
+    rev: v1.45.0
     hooks:
     - id: terraform_fmt
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v3.4.0
     hooks:
       - id: check-merge-conflict
       - id: check-yaml

diff --git a/README.yaml b/README.yaml
@@ -16,7 +16,7 @@ github_repo: clouddrove/terraform-aws-ec2
 # 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"
@@ -39,10 +39,10 @@ usage: |-
   ```hcl
       module "ec2" {
         source                      = "clouddrove/ec2/aws"
-        version                     = "0.13.0"
-        application                 = "clouddrove"
+        version                     = "0.14.0"
+        repository                  = "https://registry.terraform.io/modules/clouddrove/ec2/aws/0.14.0"
         environment                 = "test"
-        label_order                 = ["environment", "application", "name"]
+        label_order                 = ["name", "environment"]
         instance_count              = 2
         ami                         = "ami-08d658f84a6d84a80"
         instance_type               = "t2.nano"
@@ -69,10 +69,10 @@ usage: |-
   ```hcl
       module "ec2" {
         source                      = "clouddrove/ec2/aws"
-        version                     = "0.13.0"
-        application                 = "clouddrove"
+        version                     = "0.14.0"
+        repository                  = "https://registry.terraform.io/modules/clouddrove/ec2/aws/0.14.0"
         environment                 = "test"
-        label_order                 = ["environment", "application", "name"]
+        label_order                 = ["name", "environment"]
         instance_count              = 2
         ami                         = "ami-08d658f84a6d84a80"
         instance_type               = "t2.nano"

diff --git a/_example/basic_example/example.tf b/_example/basic_example/example.tf
@@ -4,24 +4,24 @@ provider "aws" {
 
 module "vpc" {
   source  = "clouddrove/vpc/aws"
-  version = "0.13.0"
+  version = "0.14.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 "public_subnets" {
   source  = "clouddrove/subnet/aws"
-  version = "0.13.0"
+  version = "0.14.0"
 
   name        = "public-subnet"
-  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-1b", "eu-west-1c"]
   vpc_id             = module.vpc.vpc_id
@@ -32,13 +32,12 @@ module "public_subnets" {
 }
 
 module "http-https" {
-  source  = "clouddrove/security-group/aws"
-  version = "0.13.0"
-
+  source      = "clouddrove/security-group/aws"
+  version     = "0.14.0"
   name        = "http-https"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/security-group/ec2/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   vpc_id        = module.vpc.vpc_id
   allowed_ip    = ["0.0.0.0/0"]
@@ -47,11 +46,11 @@ module "http-https" {
 
 module "ssh" {
   source      = "clouddrove/security-group/aws"
-  version     = "0.13.0"
+  version     = "0.14.0"
   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, "0.0.0.0/0"]
@@ -60,12 +59,12 @@ module "ssh" {
 
 module "iam-role" {
   source  = "clouddrove/iam-role/aws"
-  version = "0.13.0"
+  version = "0.14.0"
 
   name               = "iam-role"
-  application        = "clouddrove"
+  repository         = "https://registry.terraform.io/modules/clouddrove/iam-role/aws/0.14.0"
   environment        = "test"
-  label_order        = ["environment", "application", "name"]
+  label_order        = ["name", "environment"]
   assume_role_policy = data.aws_iam_policy_document.default.json
 
   policy_enabled = true
@@ -101,9 +100,9 @@ module "ec2" {
   source = "./../../"
 
   name        = "ec2-instance"
-  application = "clouddrove"
+  repository  = "https://registry.terraform.io/modules/clouddrove/ec2/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   instance_count              = 2
   ami                         = "ami-08d658f84a6d84a80"

diff --git a/versions.tf b/versions.tf
@@ -1,6 +1,6 @@
 # Terraform version
 terraform {
-  required_version = ">= 0.12.0, < 0.14.0"
+  required_version = ">= 0.12.0, < 0.15.0"
   required_providers {
     aws = {
       source = "hashicorp/aws"