Merge pull request #18 from clouddrove/0.14

0.14
clouddrove · May 10, 2021 · cf2c353 · cf2c353
2 parents c8a8248 + 85acad0
commit cf2c353
Show file tree

Hide file tree

Showing 15 changed files with 117 additions and 112 deletions.
diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml
@@ -18,7 +18,7 @@ jobs:
           python-version: '3.x'
 
       - name: 'create readme'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'readme'
           github_token: '${{ secrets.GITHUB}}'
@@ -35,7 +35,7 @@ jobs:
         continue-on-error: true
 
       - name: 'push readme'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         continue-on-error: true
         with:
           actions_subcommand: 'push'

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -20,60 +20,60 @@ jobs:
           aws-region: us-east-2
 
       - name: 'Terraform Format'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'fmt'
 
       - name: 'Terraform init for memcached'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/memcached
 
       - name: 'Terraform validate for memcached'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/memcached
 
       - name: 'Terraform plan for memcached'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/memcached
 
       - name: 'Terraform init for redis'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/redis
 
       - name: 'Terraform validate for redis'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/redis
 
       - name: 'Terraform plan for redis'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/redis
 
       - name: 'Terraform init for redis-cluster'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/redis-cluster
 
       - name: 'Terraform validate for redis-cluster'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/redis-cluster
 
       - name: 'Terraform plan for redis-cluster'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/redis-cluster

diff --git a/.github/workflows/terratest.yml b/.github/workflows/terratest.yml
@@ -23,7 +23,7 @@ jobs:
 
       - name: 'Terratest for memcached'
         if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'terratest'
           tf_actions_working_dir: '_test/memcached'
@@ -32,7 +32,7 @@ jobs:
 
       - name: 'Terratest for redis'
         if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'terratest'
           tf_actions_working_dir: '_test/redis'
@@ -41,7 +41,7 @@ jobs:
 
       - name: 'Terratest for redis-cluster'
         if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'terratest'
           tf_actions_working_dir: '_test/redis-cluster'

diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 *.tfstate.backup
 .terraform
 .idea
-*.iml
+*.iml
+*.terraform.lock.hcl
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,13 +1,13 @@
 repos:
   - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.43.0
+    rev: v1.45.0
     hooks:
-    - id: terraform_fmt
+      - 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: trailing-whitespace
       - id: check-yaml
-      - id: check-added-large-files
-      - id: trailing-whitespace
+      - id: check-added-large-files
diff --git a/LICENSE b/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

diff --git a/README.yaml b/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"
@@ -38,10 +38,10 @@ usage : |-
   ### Redis
   ```hcl
       module "redis" {
-      source                       = "clouddrove/elasticache/aws"
-      version                      = "0.13.0"
+      source                       = "clouddrove/elasticache/aws
+      version                      = "0.14.0"
       name                         = "redis"
-      application                  = "clouddrove"
+      repository                   = "https://registry.terraform.io/modules/clouddrove/elasticache/aws/0.14.0"
       environment                  = "test"
       label_order                  = ["environment", "application", "name"]
       engine                       = "redis"
@@ -60,10 +60,10 @@ usage : |-
   ### Redis Cluster
   ```hcl
       module "redis-cluster" {
-      source                      = "clouddrove/elasticache/aws"
-      version                     = "0.13.0"
+      source                      = "clouddrove/elasticache/aws
+      version                     = "0.14.0"
       name                        = "cluster"
-      application                 = "clouddrove"
+      repository                  = "https://registry.terraform.io/modules/clouddrove/elasticache/aws/0.14.0"
       environment                 = "test"
       label_order                 = ["environment", "application", "name"]
       cluster_replication_enabled = true
@@ -74,7 +74,7 @@ usage : |-
       node_type                   = "cache.t2.micro"
       subnet_ids                  = module.subnets.public_subnet_id
       security_group_ids          = [module.redis-sg.security_group_ids]
-      availability_zones           = ["eu-west-1a","eu-west-1b" ]
+      availability_zones          = ["eu-west-1a","eu-west-1b" ]
       auto_minor_version_upgrade  = true
       replicas_per_node_group     = 2
       num_node_groups             = 1
@@ -84,10 +84,10 @@ usage : |-
   ### Memcache
   ```hcl
       module "memcached" {
-      source                       = "clouddrove/elasticache/aws"
-      version                      = "0.13.0"
+      source                       = "clouddrove/elasticache/aws
+      version                      = "0.14.0"
       name                         = "memcached"
-      application                  = "clouddrove"
+      repository                   = "https://registry.terraform.io/modules/clouddrove/elasticache/aws/0.14.0"
       environment                  = "test"
       label_order                  = ["environment", "application", "name"]
       cluster_enabled              = true

diff --git a/_example/.gitignore b/_example/.gitignore
diff --git a/_example/memcached/example.tf b/_example/memcached/example.tf
@@ -3,23 +3,26 @@ provider "aws" {
 }
 
 module "vpc" {
-  source      = "clouddrove/vpc/aws"
-  version     = "0.13.0"
+  source  = "clouddrove/vpc/aws"
+  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 "subnets" {
-  source      = "clouddrove/subnet/aws"
-  version     = "0.13.0"
+  source  = "clouddrove/subnet/aws"
+  version = "0.14.0"
+
   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 +33,13 @@ module "subnets" {
 }
 
 module "memcached-sg" {
-  source      = "clouddrove/security-group/aws"
-  version     = "0.13.0"
-  name        = "ssh"
-  application = "clouddrove"
+  source  = "clouddrove/security-group/aws"
+  version = "0.14.0"
+
+  name        = "memcached-sg"
+  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 +50,8 @@ module "memcached" {
   source = "./../../"
 
   name        = "memcached"
-  application = "clouddrove"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
 
   cluster_enabled    = true
   engine             = "memcached"

diff --git a/_example/redis-cluster/example.tf b/_example/redis-cluster/example.tf
@@ -3,24 +3,25 @@ provider "aws" {
 }
 
 module "vpc" {
-  source      = "clouddrove/vpc/aws"
-  version     = "0.13.0"
+  source  = "clouddrove/vpc/aws"
+  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 "subnets" {
-  source      = "clouddrove/subnet/aws"
-  version     = "0.13.0"
-  name        = "subnets"
-  application = "clouddrove"
-  environment = "test"
-  label_order = ["environment", "application", "name"]
+  source  = "clouddrove/subnet/aws"
+  version = "0.14.0"
 
+  name               = "subnets"
+  repository         = "https://registry.terraform.io/modules/clouddrove/subnet/aws/0.14.0"
+  environment        = "test"
+  label_order        = ["name", "environment"]
   availability_zones = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
   vpc_id             = module.vpc.vpc_id
   type               = "public"
@@ -30,12 +31,12 @@ module "subnets" {
 }
 
 module "redis-sg" {
-  source      = "clouddrove/security-group/aws"
-  version     = "0.13.0"
-  name        = "ssh"
-  application = "clouddrove"
+  source = "git::https://github.com/clouddrove/terraform-aws-security-group.git"
+
+  name        = "redis-sg"
+  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 +47,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"
@@ -63,6 +64,4 @@ module "redis-cluster" {
   replicas_per_node_group     = 2
   num_node_groups             = 1
   automatic_failover_enabled  = true
-}
-
-
+}