Skip to content

Commit cf2c353

Browse files
author
Sohan Yadav
authored
Merge pull request #18 from clouddrove/0.14
0.14
2 parents c8a8248 + 85acad0 commit cf2c353

File tree

15 files changed

+117
-112
lines changed

15 files changed

+117
-112
lines changed

‎.github/workflows/readme.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
python-version: '3.x'
1919

2020
- name: 'create readme'
21-
uses: 'clouddrove/github-actions@v4.0'
21+
uses: 'clouddrove/github-actions@v6.0'
2222
with:
2323
actions_subcommand: 'readme'
2424
github_token: '${{ secrets.GITHUB}}'
@@ -35,7 +35,7 @@ jobs:
3535
continue-on-error: true
3636

3737
- name: 'push readme'
38-
uses: 'clouddrove/github-actions@v4.0'
38+
uses: 'clouddrove/github-actions@v6.0'
3939
continue-on-error: true
4040
with:
4141
actions_subcommand: 'push'

‎.github/workflows/terraform.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,60 +20,60 @@ jobs:
2020
aws-region: us-east-2
2121

2222
- name: 'Terraform Format'
23-
uses: 'clouddrove/github-actions@v4.0'
23+
uses: 'clouddrove/github-actions@v6.0'
2424
with:
2525
actions_subcommand: 'fmt'
2626

2727
- name: 'Terraform init for memcached'
28-
uses: 'clouddrove/github-actions@v4.0'
28+
uses: 'clouddrove/github-actions@v6.0'
2929
with:
3030
actions_subcommand: 'init'
3131
tf_actions_working_dir: ./_example/memcached
3232

3333
- name: 'Terraform validate for memcached'
34-
uses: 'clouddrove/github-actions@v4.0'
34+
uses: 'clouddrove/github-actions@v6.0'
3535
with:
3636
actions_subcommand: 'validate'
3737
tf_actions_working_dir: ./_example/memcached
3838

3939
- name: 'Terraform plan for memcached'
40-
uses: 'clouddrove/github-actions@v4.0'
40+
uses: 'clouddrove/github-actions@v6.0'
4141
with:
4242
actions_subcommand: 'plan'
4343
tf_actions_working_dir: ./_example/memcached
4444

4545
- name: 'Terraform init for redis'
46-
uses: 'clouddrove/github-actions@v4.0'
46+
uses: 'clouddrove/github-actions@v6.0'
4747
with:
4848
actions_subcommand: 'init'
4949
tf_actions_working_dir: ./_example/redis
5050

5151
- name: 'Terraform validate for redis'
52-
uses: 'clouddrove/github-actions@v4.0'
52+
uses: 'clouddrove/github-actions@v6.0'
5353
with:
5454
actions_subcommand: 'validate'
5555
tf_actions_working_dir: ./_example/redis
5656

5757
- name: 'Terraform plan for redis'
58-
uses: 'clouddrove/github-actions@v4.0'
58+
uses: 'clouddrove/github-actions@v6.0'
5959
with:
6060
actions_subcommand: 'plan'
6161
tf_actions_working_dir: ./_example/redis
6262

6363
- name: 'Terraform init for redis-cluster'
64-
uses: 'clouddrove/github-actions@v4.0'
64+
uses: 'clouddrove/github-actions@v6.0'
6565
with:
6666
actions_subcommand: 'init'
6767
tf_actions_working_dir: ./_example/redis-cluster
6868

6969
- name: 'Terraform validate for redis-cluster'
70-
uses: 'clouddrove/github-actions@v4.0'
70+
uses: 'clouddrove/github-actions@v6.0'
7171
with:
7272
actions_subcommand: 'validate'
7373
tf_actions_working_dir: ./_example/redis-cluster
7474

7575
- name: 'Terraform plan for redis-cluster'
76-
uses: 'clouddrove/github-actions@v4.0'
76+
uses: 'clouddrove/github-actions@v6.0'
7777
with:
7878
actions_subcommand: 'plan'
7979
tf_actions_working_dir: ./_example/redis-cluster

‎.github/workflows/terratest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: 'Terratest for memcached'
2525
if: ${{ github.event.label.name == 'terratest' }}
26-
uses: 'clouddrove/github-actions@v4.0'
26+
uses: 'clouddrove/github-actions@v6.0'
2727
with:
2828
actions_subcommand: 'terratest'
2929
tf_actions_working_dir: '_test/memcached'
@@ -32,7 +32,7 @@ jobs:
3232

3333
- name: 'Terratest for redis'
3434
if: ${{ github.event.label.name == 'terratest' }}
35-
uses: 'clouddrove/github-actions@v4.0'
35+
uses: 'clouddrove/github-actions@v6.0'
3636
with:
3737
actions_subcommand: 'terratest'
3838
tf_actions_working_dir: '_test/redis'
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: 'Terratest for redis-cluster'
4343
if: ${{ github.event.label.name == 'terratest' }}
44-
uses: 'clouddrove/github-actions@v4.0'
44+
uses: 'clouddrove/github-actions@v6.0'
4545
with:
4646
actions_subcommand: 'terratest'
4747
tf_actions_working_dir: '_test/redis-cluster'

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
*.tfstate.backup
44
.terraform
55
.idea
6-
*.iml
6+
*.iml
7+
*.terraform.lock.hcl

‎.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
repos:
22
- repo: git://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.43.0
3+
rev: v1.45.0
44
hooks:
5-
- id: terraform_fmt
5+
- id: terraform_fmt
66

77
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v3.2.0
8+
rev: v3.4.0
99
hooks:
1010
- id: check-merge-conflict
11+
- id: trailing-whitespace
1112
- id: check-yaml
12-
- id: check-added-large-files
13-
- id: trailing-whitespace
13+
- id: check-added-large-files

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 Cloud Drove
3+
Copyright (c) 2021 Cloud Drove
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ github_repo: clouddrove/terraform-aws-elasticache
1616
# Badges to display
1717
badges:
1818
- name: "Terraform"
19-
image: "https://img.shields.io/badge/terraform-v0.13-green"
19+
image: "https://img.shields.io/badge/terraform-v0.14-green"
2020
url: "https://www.terraform.io"
2121
- name: "Licence"
2222
image: "https://img.shields.io/badge/License-MIT-blue.svg"
@@ -38,10 +38,10 @@ usage : |-
3838
### Redis
3939
```hcl
4040
module "redis" {
41-
source = "clouddrove/elasticache/aws"
42-
version = "0.13.0"
41+
source = "clouddrove/elasticache/aws
42+
version = "0.14.0"
4343
name = "redis"
44-
application = "clouddrove"
44+
repository = "https://registry.terraform.io/modules/clouddrove/elasticache/aws/0.14.0"
4545
environment = "test"
4646
label_order = ["environment", "application", "name"]
4747
engine = "redis"
@@ -60,10 +60,10 @@ usage : |-
6060
### Redis Cluster
6161
```hcl
6262
module "redis-cluster" {
63-
source = "clouddrove/elasticache/aws"
64-
version = "0.13.0"
63+
source = "clouddrove/elasticache/aws
64+
version = "0.14.0"
6565
name = "cluster"
66-
application = "clouddrove"
66+
repository = "https://registry.terraform.io/modules/clouddrove/elasticache/aws/0.14.0"
6767
environment = "test"
6868
label_order = ["environment", "application", "name"]
6969
cluster_replication_enabled = true
@@ -74,7 +74,7 @@ usage : |-
7474
node_type = "cache.t2.micro"
7575
subnet_ids = module.subnets.public_subnet_id
7676
security_group_ids = [module.redis-sg.security_group_ids]
77-
availability_zones = ["eu-west-1a","eu-west-1b" ]
77+
availability_zones = ["eu-west-1a","eu-west-1b" ]
7878
auto_minor_version_upgrade = true
7979
replicas_per_node_group = 2
8080
num_node_groups = 1
@@ -84,10 +84,10 @@ usage : |-
8484
### Memcache
8585
```hcl
8686
module "memcached" {
87-
source = "clouddrove/elasticache/aws"
88-
version = "0.13.0"
87+
source = "clouddrove/elasticache/aws
88+
version = "0.14.0"
8989
name = "memcached"
90-
application = "clouddrove"
90+
repository = "https://registry.terraform.io/modules/clouddrove/elasticache/aws/0.14.0"
9191
environment = "test"
9292
label_order = ["environment", "application", "name"]
9393
cluster_enabled = true

‎_example/.gitignore

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎_example/memcached/example.tf

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,26 @@ provider "aws" {
33
}
44

55
module "vpc" {
6-
source = "clouddrove/vpc/aws"
7-
version = "0.13.0"
6+
source = "clouddrove/vpc/aws"
7+
version = "0.14.0"
8+
89
name = "vpc"
9-
application = "clouddrove"
10+
repository = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
1011
environment = "test"
11-
label_order = ["environment", "application", "name"]
12+
label_order = [
13+
"name", "environment"]
1214

1315
cidr_block = "172.16.0.0/16"
1416
}
1517

1618
module "subnets" {
17-
source = "clouddrove/subnet/aws"
18-
version = "0.13.0"
19+
source = "clouddrove/subnet/aws"
20+
version = "0.14.0"
21+
1922
name = "subnets"
20-
application = "clouddrove"
23+
repository = "https://registry.terraform.io/modules/clouddrove/subnet/aws/0.14.0"
2124
environment = "test"
22-
label_order = ["environment", "application", "name"]
25+
label_order = ["name", "environment"]
2326

2427
availability_zones = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
2528
vpc_id = module.vpc.vpc_id
@@ -30,12 +33,13 @@ module "subnets" {
3033
}
3134

3235
module "memcached-sg" {
33-
source = "clouddrove/security-group/aws"
34-
version = "0.13.0"
35-
name = "ssh"
36-
application = "clouddrove"
36+
source = "clouddrove/security-group/aws"
37+
version = "0.14.0"
38+
39+
name = "memcached-sg"
40+
repository = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
3741
environment = "test"
38-
label_order = ["environment", "application", "name"]
42+
label_order = ["name", "environment"]
3943

4044
vpc_id = module.vpc.vpc_id
4145
allowed_ip = [module.vpc.vpc_cidr_block]
@@ -46,9 +50,8 @@ module "memcached" {
4650
source = "./../../"
4751

4852
name = "memcached"
49-
application = "clouddrove"
5053
environment = "test"
51-
label_order = ["environment", "application", "name"]
54+
label_order = ["name", "environment"]
5255

5356
cluster_enabled = true
5457
engine = "memcached"

‎_example/redis-cluster/example.tf

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,25 @@ provider "aws" {
33
}
44

55
module "vpc" {
6-
source = "clouddrove/vpc/aws"
7-
version = "0.13.0"
6+
source = "clouddrove/vpc/aws"
7+
version = "0.14.0"
8+
89
name = "vpc"
9-
application = "clouddrove"
10+
repository = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
1011
environment = "test"
11-
label_order = ["environment", "application", "name"]
12+
label_order = ["name", "environment"]
1213

1314
cidr_block = "172.16.0.0/16"
1415
}
1516

1617
module "subnets" {
17-
source = "clouddrove/subnet/aws"
18-
version = "0.13.0"
19-
name = "subnets"
20-
application = "clouddrove"
21-
environment = "test"
22-
label_order = ["environment", "application", "name"]
18+
source = "clouddrove/subnet/aws"
19+
version = "0.14.0"
2320

21+
name = "subnets"
22+
repository = "https://registry.terraform.io/modules/clouddrove/subnet/aws/0.14.0"
23+
environment = "test"
24+
label_order = ["name", "environment"]
2425
availability_zones = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
2526
vpc_id = module.vpc.vpc_id
2627
type = "public"
@@ -30,12 +31,12 @@ module "subnets" {
3031
}
3132

3233
module "redis-sg" {
33-
source = "clouddrove/security-group/aws"
34-
version = "0.13.0"
35-
name = "ssh"
36-
application = "clouddrove"
34+
source = "git::https://github.com/clouddrove/terraform-aws-security-group.git"
35+
36+
name = "redis-sg"
37+
repository = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
3738
environment = "test"
38-
label_order = ["environment", "application", "name"]
39+
label_order = ["name", "environment"]
3940

4041
vpc_id = module.vpc.vpc_id
4142
allowed_ip = [module.vpc.vpc_cidr_block]
@@ -46,9 +47,9 @@ module "redis-cluster" {
4647
source = "./../../"
4748

4849
name = "cluster"
49-
application = "clouddrove"
50+
repository = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
5051
environment = "test"
51-
label_order = ["environment", "application", "name"]
52+
label_order = ["name", "environment"]
5253

5354
cluster_replication_enabled = true
5455
engine = "redis"
@@ -63,6 +64,4 @@ module "redis-cluster" {
6364
replicas_per_node_group = 2
6465
num_node_groups = 1
6566
automatic_failover_enabled = true
66-
}
67-
68-
67+
}

0 commit comments

Comments
 (0)