feat: updated github-action, terraform, aws version and fixed tflint …

…issue (#59)
clouddrove · Oct 29, 2023 · e22fb36 · e22fb36
1 parent b66f555
commit e22fb36
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 65 deletions.
diff --git a/.github/workflows/auto_assignee.yml b/.github/workflows/auto_assignee.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 jobs:
   assignee:
-    uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@1.0.6
     secrets:
       GITHUB: ${{ secrets.GITHUB }}
     with:

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 jobs:
   changelog:
-    uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.0.6
     secrets: inherit
     with:
       branch: 'master'
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@v9.0.2'
+        uses: 'clouddrove/github-actions@9.0.3'
         with:
           actions_subcommand: 'readme'
           github_token: '${{ secrets.GITHUB }}'
@@ -35,7 +35,7 @@ jobs:
         continue-on-error: true
 
       - name: 'push readme'
-        uses: 'clouddrove/github-actions@v9.0.2'
+        uses: 'clouddrove/github-actions@9.0.3'
         continue-on-error: true
         with:
           actions_subcommand: 'push'

diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml
@@ -6,14 +6,14 @@ on:
   workflow_dispatch:
 jobs:
   memcached:
-    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.6
     with:
       working_directory: './_example/memcached/'
   redis:
-    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.6
     with:
       working_directory: './_example/redis/'
   redis-cluster:
-    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.6
     with:
       working_directory: './_example/redis-cluster/'
diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml
@@ -6,6 +6,6 @@ on:
   workflow_dispatch:
 jobs:
   tflint:
-    uses: clouddrove/test-tfsec/.github/workflows/tflint.yaml@master
+    uses: clouddrove/test-tfsec/.github/workflows/tflint.yaml@1.0.6
     secrets:
       GITHUB: ${{ secrets.GITHUB }}
diff --git a/.github/workflows/tfsec.yml b/.github/workflows/tfsec.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 jobs:
   tfsec:
-    uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@master
+    uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@1.0.6
     secrets: inherit
     with:
       working_directory: '.'
diff --git a/_example/memcached/example.tf b/_example/memcached/example.tf
@@ -2,21 +2,23 @@
 ## Provider block added, Use the Amazon Web Services (AWS) provider to interact with the many resources supported by AWS.
 ####----------------------------------------------------------------------------------
 provider "aws" {
-  region = "eu-west-1"
+  region = local.region
+}
+locals {
+  name        = "memcached"
+  environment = "test"
+  region      = "eu-west-1"
 }
-
 ####----------------------------------------------------------------------------------
 ## A VPC is a virtual network that closely resembles a traditional network that you'd operate in your own data center.
 ####----------------------------------------------------------------------------------
 module "vpc" {
   source  = "clouddrove/vpc/aws"
   version = "2.0.0"
 
-  name        = "vpc"
-  environment = "test"
-  label_order = ["environment", "name"]
-
-  cidr_block = "10.0.0.0/16"
+  name        = "${local.name}-vpc"
+  environment = local.environment
+  cidr_block  = "10.0.0.0/16"
 }
 
 ####----------------------------------------------------------------------------------
@@ -26,9 +28,8 @@ module "subnets" {
   source  = "clouddrove/subnet/aws"
   version = "2.0.0"
 
-  name               = "subnets"
-  environment        = "test"
-  label_order        = ["environment", "name"]
+  name               = "${local.name}-subnets"
+  environment        = local.environment
   availability_zones = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
   vpc_id             = module.vpc.vpc_id
   type               = "public"
@@ -43,10 +44,8 @@ module "subnets" {
 module "memcached" {
   source = "./../../"
 
-  name        = "memcached"
-  environment = "test"
-  label_order = ["name", "environment"]
-
+  name        = local.name
+  environment = local.environment
   ####----------------------------------------------------------------------------------
   ## Below A security group controls the traffic that is allowed to reach and leave the resources that it is associated with.
   ####----------------------------------------------------------------------------------
@@ -79,5 +78,4 @@ module "memcached" {
   route53_ttl                    = "300"
   route53_type                   = "CNAME"
   route53_zone_id                = "SERFxxxx6XCsY9Lxxxxx"
-
 }
diff --git a/_example/memcached/versions.tf b/_example/memcached/versions.tf
@@ -1,11 +1,11 @@
 # Terraform version
 terraform {
-  required_version = ">= 1.5.0"
+  required_version = ">= 1.6.2"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.9.0"
+      version = ">= 5.22.0"
     }
   }
-}
+}
diff --git a/_example/redis-cluster/example.tf b/_example/redis-cluster/example.tf
@@ -2,21 +2,23 @@
 ## Provider block added, Use the Amazon Web Services (AWS) provider to interact with the many resources supported by AWS.
 ####----------------------------------------------------------------------------------
 provider "aws" {
-  region = "eu-west-1"
+  region = local.region
+}
+locals {
+  name        = "redis-cluster"
+  environment = "test"
+  region      = "eu-west-1"
 }
-
 ####----------------------------------------------------------------------------------
 ## A VPC is a virtual network that closely resembles a traditional network that you'd operate in your own data center.
 ####----------------------------------------------------------------------------------
 module "vpc" {
   source  = "clouddrove/vpc/aws"
   version = "2.0.0"
 
-  name        = "vpc"
-  environment = "test"
-  label_order = ["environment", "name"]
-
-  cidr_block = "10.0.0.0/16"
+  name        = "${local.name}-vpc"
+  environment = local.environment
+  cidr_block  = "10.0.0.0/16"
 }
 
 ####----------------------------------------------------------------------------------
@@ -26,9 +28,8 @@ module "subnets" {
   source  = "clouddrove/subnet/aws"
   version = "2.0.0"
 
-  name               = "subnets"
-  environment        = "test"
-  label_order        = ["environment", "name"]
+  name               = "${local.name}-subnets"
+  environment        = local.environment
   availability_zones = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
   vpc_id             = module.vpc.vpc_id
   type               = "public"
@@ -45,9 +46,8 @@ module "subnets" {
 module "redis-cluster" {
   source = "./../../"
 
-  name        = "redis-cluster"
-  environment = "test"
-  label_order = ["environment", "name"]
+  name        = local.name
+  environment = local.environment
 
   ###----------------------------------------------------------------------------------
   # Below A security group controls the traffic that is allowed to reach and leave the resources that it is associated with.
@@ -71,7 +71,6 @@ module "redis-cluster" {
     Application = "CloudDrove"
   }
 
-
   ###----------------------------------------------------------------------------------
   # will create ROUTE-53 for redis which will add the dns of the cluster.
   ###----------------------------------------------------------------------------------

diff --git a/_example/redis-cluster/versions.tf b/_example/redis-cluster/versions.tf
@@ -1,11 +1,11 @@
 # Terraform version
 terraform {
-  required_version = ">= 1.5.0"
+  required_version = ">= 1.6.2"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.9.0"
+      version = ">= 5.22.0"
     }
   }
-}
+}
diff --git a/_example/redis/example.tf b/_example/redis/example.tf
@@ -2,21 +2,23 @@
 ## Provider block added, Use the Amazon Web Services (AWS) provider to interact with the many resources supported by AWS.
 ####----------------------------------------------------------------------------------
 provider "aws" {
-  region = "eu-west-1"
+  region = local.region
+}
+locals {
+  name        = "redis"
+  environment = "test"
+  region      = "eu-west-1"
 }
-
 ####----------------------------------------------------------------------------------
 ## A VPC is a virtual network that closely resembles a traditional network that you'd operate in your own data center.
 ####----------------------------------------------------------------------------------
 module "vpc" {
   source  = "clouddrove/vpc/aws"
   version = "2.0.0"
 
-  name        = "vpc"
-  environment = "test"
-  label_order = ["environment", "name"]
-
-  cidr_block = "10.0.0.0/16"
+  name        = "${local.name}-vpc"
+  environment = local.environment
+  cidr_block  = "10.0.0.0/16"
 }
 
 ####----------------------------------------------------------------------------------
@@ -26,9 +28,8 @@ module "subnets" {
   source  = "clouddrove/subnet/aws"
   version = "2.0.0"
 
-  name               = "subnets"
-  environment        = "test"
-  label_order        = ["environment", "name"]
+  name               = "${local.name}-subnets"
+  environment        = local.environment
   availability_zones = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
   vpc_id             = module.vpc.vpc_id
   type               = "public"
@@ -46,10 +47,9 @@ module "subnets" {
 module "redis" {
   source = "./../../"
 
-  name        = "redis"
-  environment = "test"
-  label_order = ["name", "environment"]
 
+  name        = local.name
+  environment = local.environment
   ####----------------------------------------------------------------------------------
   ## Below A security group controls the traffic that is allowed to reach and leave the resources that it is associated with.
   ####----------------------------------------------------------------------------------

diff --git a/_example/redis/versions.tf b/_example/redis/versions.tf
@@ -1,11 +1,11 @@
 # Terraform version
 terraform {
-  required_version = ">= 1.5.0"
+  required_version = ">= 1.6.2"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.9.0"
+      version = ">= 5.22.0"
     }
   }
-}
+}
diff --git a/variables.tf b/variables.tf
@@ -25,7 +25,7 @@ variable "environment" {
 
 variable "label_order" {
   type        = list(any)
-  default     = []
+  default     = ["environment", "name"]
   description = "Label order, e.g. `name`,`application`."
 }
 
@@ -444,4 +444,4 @@ variable "special" {
   type    = bool
   default = false
 
-}
+}
diff --git a/versions.tf b/versions.tf
@@ -1,11 +1,15 @@
 # Terraform version
 terraform {
-  required_version = ">= 1.5.0"
+  required_version = ">= 1.6.2"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.9.0"
+      version = ">= 5.22.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.5.1"
     }
   }
-}
+}