Skip to content

Commit 183f7a8

Browse files
authored
Add tags support to all resources (#17)
1 parent ded7e75 commit 183f7a8

File tree

5 files changed

+30
-18
lines changed

5 files changed

+30
-18
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v3.4.0
3+
rev: v4.0.1
44
hooks:
55
- id: check-added-large-files
66
args: ['--maxkb=500']
@@ -18,7 +18,7 @@ repos:
1818
args: ['--allow-missing-credentials']
1919
- id: trailing-whitespace
2020
- repo: git://github.com/antonbabenko/pre-commit-terraform
21-
rev: v1.48.0
21+
rev: v1.50.0
2222
hooks:
2323
- id: terraform_fmt
2424
- id: terraform_docs

CHANGELOG.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,22 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
<a name="unreleased"></a>
6+
## [Unreleased]
7+
8+
9+
510
<a name="2.0.0"></a>
611
## [2.0.0] - 2021-04-19
712

8-
- Add support for Terraform 0.15 by setting sensitive outputs to have the sensitive = true flag. (https://www.terraform.io/upgrade-guides/0-15.html#sensitive-output-values)
9-
- Terraform version requirement bumped to 0.14.5 in order to support sensitive values
13+
- Terraform 0.15 support by marking outputs as sensitive ([#15](https://github.com/umotif-public/terraform-aws-elasticache-redis/issues/15))
14+
15+
16+
<a name="1.5.0"></a>
17+
## [1.5.0] - 2021-02-02
18+
19+
- Add support for multi-az and final snapshot ([#12](https://github.com/umotif-public/terraform-aws-elasticache-redis/issues/12))
20+
- Update README.md
1021

1122

1223
<a name="1.4.0"></a>
@@ -73,7 +84,9 @@ All notable changes to this project will be documented in this file.
7384
- Initial commit of docs
7485

7586

76-
[2.0.0]: https://github.com/umotif-public/terraform-aws-elasticache-redis/compare/1.4.0...2.0.0
87+
[Unreleased]: https://github.com/umotif-public/terraform-aws-elasticache-redis/compare/2.0.0...HEAD
88+
[2.0.0]: https://github.com/umotif-public/terraform-aws-elasticache-redis/compare/1.5.0...2.0.0
89+
[1.5.0]: https://github.com/umotif-public/terraform-aws-elasticache-redis/compare/1.4.0...1.5.0
7790
[1.4.0]: https://github.com/umotif-public/terraform-aws-elasticache-redis/compare/1.3.1...1.4.0
7891
[1.3.1]: https://github.com/umotif-public/terraform-aws-elasticache-redis/compare/1.3.0...1.3.1
7992
[1.3.0]: https://github.com/umotif-public/terraform-aws-elasticache-redis/compare/1.2.0...1.3.0

README.md

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ A Terraform module to create an AWS Redis ElastiCache cluster
66

77
## Terraform versions
88

9-
Terraform 0.14.5. Pin module version to `~> v2.0`.
10-
Terraform 0.12 - 0.14.4. Pin module version to `~> v1.0`.
9+
Terraform 0.14.5 and higher, pin module version to `~> v2.0`.
10+
For Terraform 0.12 to 0.14.4, pin module version to `~> v1.0`.
1111
Submit pull-requests to `master` branch.
1212

1313
## Usage
1414

1515
```hcl
1616
module "redis" {
1717
source = "umotif-public/elasticache-redis/aws"
18-
version = "~> 1.5.0"
18+
version = "~> 2.1.0"
1919
2020
name_prefix = "core-example"
2121
number_cache_clusters = 2
2222
node_type = "cache.t3.small"
2323
24-
engine_version = "5.0.6"
24+
engine_version = "6.x"
2525
port = 6379
2626
maintenance_window = "mon:03:00-mon:04:00"
2727
snapshot_window = "04:00-06:00"
@@ -34,7 +34,7 @@ module "redis" {
3434
auth_token = "1234567890asdfghjkl"
3535
3636
apply_immediately = true
37-
family = "redis5.0"
37+
family = "redis6.x"
3838
description = "Test elasticache redis."
3939
4040
subnet_ids = module.vpc.private_subnets
@@ -55,11 +55,6 @@ module "redis" {
5555
}
5656
```
5757

58-
## Assumptions
59-
60-
Module v1.0 is to be used with Terraform > 0.12
61-
Module v2.0+ is to be used with Terraform > 0.14.5
62-
6358
## Examples
6459

6560
* [Redis Basic](https://github.com/umotif-public/terraform-aws-elasticache-redis/tree/master/examples/redis-basic)
@@ -75,14 +70,14 @@ Module managed by [Marcin Cuber](https://github.com/marcincuber) [linkedin](http
7570
| Name | Version |
7671
|------|---------|
7772
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.5 |
78-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.26 |
73+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.43 |
7974
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.1.0 |
8075

8176
## Providers
8277

8378
| Name | Version |
8479
|------|---------|
85-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.26 |
80+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.43 |
8681
| <a name="provider_random"></a> [random](#provider\_random) | >= 3.1.0 |
8782

8883
## Modules

main.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,16 @@ resource "aws_elasticache_parameter_group" "redis" {
7272
lifecycle {
7373
create_before_destroy = true
7474
}
75+
76+
tags = var.tags
7577
}
7678

7779
resource "aws_elasticache_subnet_group" "redis" {
7880
name = "${var.name_prefix}-redis-sg"
7981
subnet_ids = var.subnet_ids
8082
description = var.description
83+
84+
tags = var.tags
8185
}
8286

8387
resource "aws_security_group" "redis" {

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_version = ">= 0.14.5"
33

44
required_providers {
5-
aws = ">= 3.26"
5+
aws = ">= 3.43"
66
random = ">= 3.1.0"
77
}
88
}

0 commit comments

Comments
 (0)