diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml index 466fb56..af9a54c 100644 --- a/.github/workflows/readme.yml +++ b/.github/workflows/readme.yml @@ -10,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout' - uses: actions/checkout@v2.3.4 + uses: actions/checkout@master - - name: "Set up Python 3.7" + - name: 'Set up Python 3.7' uses: actions/setup-python@v2 with: python-version: '3.x' @@ -26,11 +26,11 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}} - - name: "pre-commit check errors" + - name: 'pre-commit check errors' uses: pre-commit/action@v2.0.0 continue-on-error: true - - name: "pre-commit fix errors" + - name: 'pre-commit fix erros' uses: pre-commit/action@v2.0.0 continue-on-error: true @@ -51,4 +51,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required - if: always() + if: always() \ No newline at end of file diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 08e6832..f54666b 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -32,8 +32,8 @@ jobs: - ${{ needs.versionExtract.outputs.maxVersion }} directory: - _example/memcached - - _example/redis - _example/redis-cluster + - _example/redis steps: - name: Checkout @@ -83,4 +83,4 @@ jobs: terraform_version: ${{ needs.versionExtract.outputs.maxVersion }} - name: Check Terraform format changes - run: terraform fmt --recursive + run: terraform fmt --recursive \ No newline at end of file diff --git a/.github/workflows/terratest.yml b/.github/workflows/terratest.yml index 96e8b5c..868c2d4 100644 --- a/.github/workflows/terratest.yml +++ b/.github/workflows/terratest.yml @@ -6,39 +6,27 @@ on: types: [labeled] jobs: - terraform: - name: 'Terraform' + Terratest: + name: 'terratest' runs-on: ubuntu-latest steps: - name: 'Checkout' - uses: actions/checkout@master + uses: actions/checkout@v2.3.4 - - name: Configure AWS Credentials + - name: 'Configure AWS Credentials' uses: clouddrove/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }} aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }} aws-region: us-east-2 - - - name: 'Terratest for redis' - if: ${{ github.event.label.name == 'terratest' }} + - name: 'terratest' uses: 'clouddrove/github-actions@v9.0.2' with: actions_subcommand: 'terratest' - tf_actions_working_dir: '_test/redis' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: 'Terratest for redis-cluster' - if: ${{ github.event.label.name == 'terratest' }} - uses: 'clouddrove/github-actions@v9.0.2' - with: - actions_subcommand: 'terratest' - tf_actions_working_dir: '_test/redis-cluster' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + if: ${{ github.event.label.name == 'terratest' }} + tf_actions_working_dir: '_test' - name: 'Slack Notification' uses: clouddrove/action-slack@v2 @@ -49,4 +37,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required - if: always() + if: always() \ No newline at end of file diff --git a/README.yaml b/README.yaml index 9448494..84b61a8 100644 --- a/README.yaml +++ b/README.yaml @@ -45,7 +45,7 @@ usage : |- ```hcl module "redis" { source = "clouddrove/elasticache/aws - version = "1.0.1" + version = "1.3.0" name = "redis" environment = "test" label_order = ["environment", "name"] @@ -66,7 +66,7 @@ usage : |- ```hcl module "redis-cluster" { source = "clouddrove/elasticache/aws - version = "1.0.1" + version = "1.3.0" name = "cluster" environment = "test" label_order = ["environment","name"] @@ -89,7 +89,7 @@ usage : |- ```hcl module "memcached" { source = "clouddrove/elasticache/aws - version = "1.0.1" + version = "1.3.0" name = "memcached" environment = "test" label_order = ["environment", "name"] diff --git a/_example/memcached/example.tf b/_example/memcached/example.tf index 694ff9e..7bc4ce7 100644 --- a/_example/memcached/example.tf +++ b/_example/memcached/example.tf @@ -65,4 +65,4 @@ module "memcached" { extra_tags = { Application = "CloudDrove" } -} +} \ No newline at end of file diff --git a/_example/memcached/versions.tf b/_example/memcached/versions.tf index 59b550f..cbc6f9c 100644 --- a/_example/memcached/versions.tf +++ b/_example/memcached/versions.tf @@ -1,11 +1,11 @@ # Terraform version terraform { - required_version = ">= 0.14.11" + required_version = ">= 1.3.6" required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.1.15" + version = ">= 4.48.0" } } -} +} \ No newline at end of file diff --git a/_example/redis-cluster/versions.tf b/_example/redis-cluster/versions.tf index 59b550f..cbc6f9c 100644 --- a/_example/redis-cluster/versions.tf +++ b/_example/redis-cluster/versions.tf @@ -1,11 +1,11 @@ # Terraform version terraform { - required_version = ">= 0.14.11" + required_version = ">= 1.3.6" required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.1.15" + version = ">= 4.48.0" } } -} +} \ No newline at end of file diff --git a/_example/redis/versions.tf b/_example/redis/versions.tf index 59b550f..cbc6f9c 100644 --- a/_example/redis/versions.tf +++ b/_example/redis/versions.tf @@ -1,11 +1,11 @@ # Terraform version terraform { - required_version = ">= 0.14.11" + required_version = ">= 1.3.6" required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.1.15" + version = ">= 4.48.0" } } -} +} \ No newline at end of file diff --git a/main.tf b/main.tf index cd06508..1966600 100644 --- a/main.tf +++ b/main.tf @@ -145,4 +145,3 @@ resource "aws_elasticache_cluster" "default" { tags = module.labels.tags } - diff --git a/variables.tf b/variables.tf index 3057dfb..9b508fd 100644 --- a/variables.tf +++ b/variables.tf @@ -252,4 +252,6 @@ variable "multi_az_enabled" { type = bool default = false description = "Specifies whether to enable Multi-AZ Support for the replication group. If true, automatic_failover_enabled must also be enabled. Defaults to false." + } +