Skip to content

Commit

Permalink
Change encryption logic
Browse files Browse the repository at this point in the history
  • Loading branch information
Umur Coskuncan | Magicorn committed Jun 3, 2023
1 parent e2dbd7e commit 2c89b02
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 91 deletions.
13 changes: 9 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,30 @@ Magicorn made Terraform Module for AWS Provider
```
module "elasticache" {
source = "magicorntech/elasticache/aws"
version = "0.0.2"
version = "0.0.3"
tenant = var.tenant
name = var.name
environment = var.environment
vpc_id = var.vpc_id
cidr_block = var.cidr_block
subnet_ids = var.subnet_ids
encryption = true # 1
kms_key_id = var.elasticache_key_id
# ElastiCache Configuration
cache_name = "master"
multi_az = false
replica_count = 1
instance_type = "cache.t4g.small"
instance_type = "cache.t4g.micro"
port = 6379
encryption = true
auto_minor_version_upgrade = false
engine_version = "7.0"
parameter_group = "default.redis7"
maintenance_window = "mon:03:00-mon:04:00"
snapshot_window = "04:00-05:00"
snapshot_retention_limit = 3
}
```
```

## Notes
1) Works better with magicorn-aws-kms module.
70 changes: 0 additions & 70 deletions kms.tf
View file

This file was deleted.

8 changes: 4 additions & 4 deletions redis.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ resource "aws_elasticache_replication_group" "main" {
transit_encryption_enabled = (var.encryption == true) ? true : false
auth_token = (var.encryption == true) ? random_password.auth[0].result : null
at_rest_encryption_enabled = (var.encryption == true) ? true : false
kms_key_id = (var.encryption == true) ? aws_kms_key.main[0].arn : null
kms_key_id = (var.encryption == true) ? var.kms_key_id : null
engine = "redis"
engine_version = var.engine_version
port = var.port
replication_group_id = "${var.tenant}-${var.name}-redis-${var.environment}"
replication_group_id = "${var.tenant}-${var.name}-${var.cache_name}-${var.environment}"
description = "Managed by Magicorn"
node_type = var.instance_type
parameter_group_name = var.parameter_group
maintenance_window = var.maintenance_window
snapshot_window = var.snapshot_window
snapshot_retention_limit = var.snapshot_retention_limit
final_snapshot_identifier = "${var.tenant}-${var.name}-redis-final-${random_id.backup.hex}-${var.environment}"
final_snapshot_identifier = "${var.tenant}-${var.name}-${var.cache_name}-final-${random_id.backup.hex}-${var.environment}"
subnet_group_name = aws_elasticache_subnet_group.main.name
security_group_ids = [aws_security_group.main.id]

tags = {
Name = "${var.tenant}-${var.name}-redis-${var.environment}"
Name = "${var.tenant}-${var.name}-${var.cache_name}-${var.environment}"
Tenant = var.tenant
Project = var.name
Environment = var.environment
Expand Down
4 changes: 2 additions & 2 deletions sg.tf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "aws_security_group" "main" {
name = "${var.tenant}-${var.name}-elasticache-sg-${var.environment}"
name = "${var.tenant}-${var.name}-elasticache-${var.cache_name}-sg-${var.environment}"
description = "Managed by Magicorn"
vpc_id = var.vpc_id

Expand All @@ -22,7 +22,7 @@ resource "aws_security_group" "main" {
}

tags = {
Name = "${var.tenant}-${var.name}-elasticache-sg-${var.environment}"
Name = "${var.tenant}-${var.name}-elasticache-${var.cache_name}-sg-${var.environment}"
Tenant = var.tenant
Project = var.name
Environment = var.environment
Expand Down
4 changes: 2 additions & 2 deletions snetg.tf
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
resource "aws_elasticache_subnet_group" "main" {
name = "${var.tenant}-${var.name}-redis-snetg-${var.environment}"
name = "${var.tenant}-${var.name}-${var.cache_name}-snetg-${var.environment}"
description = "Managed by Magicorn"
subnet_ids = var.subnet_ids

tags = {
Name = "${var.tenant}-${var.name}-redis-snetg-${var.environment}"
Name = "${var.tenant}-${var.name}-${var.cache_name}-snetg-${var.environment}"
Tenant = var.tenant
Project = var.name
Environment = var.environment
Expand Down
16 changes: 8 additions & 8 deletions ssm.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ resource "random_password" "auth" {

resource "aws_ssm_parameter" "main_redis_pass" {
count = (var.encryption == true) ? 1 : 0
name = "/${var.tenant}/${var.name}/${var.environment}/redis/pass"
name = "/${var.tenant}/${var.name}/${var.environment}/elasticache/${var.cache_name}/pass"
description = "Managed by Magicorn"
type = "SecureString"
value = random_password.auth[0].result

tags = {
Name = "${var.tenant}-${var.name}-${var.environment}-redis-pass"
Name = "${var.tenant}-${var.name}-${var.environment}-elasticache-${var.cache_name}-pass"
Tenant = var.tenant
Project = var.name
Environment = var.environment
Expand All @@ -26,13 +26,13 @@ resource "aws_ssm_parameter" "main_redis_pass" {

resource "aws_ssm_parameter" "main_redis_primary" {
count = (var.encryption == true) ? 1 : 0
name = "/${var.tenant}/${var.name}/${var.environment}/redis/primary"
name = "/${var.tenant}/${var.name}/${var.environment}/elasticache/${var.cache_name}/primary"
description = "Managed by Magicorn"
type = "SecureString"
value = aws_elasticache_replication_group.main.primary_endpoint_address

tags = {
Name = "${var.tenant}-${var.name}-${var.environment}-redis-primary"
Name = "${var.tenant}-${var.name}-${var.environment}-elasticache-${var.cache_name}-primary"
Tenant = var.tenant
Project = var.name
Environment = var.environment
Expand All @@ -43,13 +43,13 @@ resource "aws_ssm_parameter" "main_redis_primary" {

resource "aws_ssm_parameter" "main_redis_reader" {
count = (var.encryption == true) ? 1 : 0
name = "/${var.tenant}/${var.name}/${var.environment}/redis/reader"
name = "/${var.tenant}/${var.name}/${var.environment}/elasticache/${var.cache_name}/reader"
description = "Managed by Magicorn"
type = "SecureString"
value = aws_elasticache_replication_group.main.reader_endpoint_address

tags = {
Name = "${var.tenant}-${var.name}-${var.environment}-redis-reader"
Name = "${var.tenant}-${var.name}-${var.environment}-elasticache-${var.cache_name}-reader"
Tenant = var.tenant
Project = var.name
Environment = var.environment
Expand All @@ -60,13 +60,13 @@ resource "aws_ssm_parameter" "main_redis_reader" {

resource "aws_ssm_parameter" "main_redis_port" {
count = (var.encryption == true) ? 1 : 0
name = "/${var.tenant}/${var.name}/${var.environment}/redis/port"
name = "/${var.tenant}/${var.name}/${var.environment}/elasticache/${var.cache_name}/port"
description = "Managed by Magicorn"
type = "SecureString"
value = var.port

tags = {
Name = "${var.tenant}-${var.name}-${var.environment}-redis-port"
Name = "${var.tenant}-${var.name}-${var.environment}-elasticache-${var.cache_name}-port"
Tenant = var.tenant
Project = var.name
Environment = var.environment
Expand Down
4 changes: 3 additions & 1 deletion variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ variable "environment" {}
variable "vpc_id" {}
variable "cidr_block" {}
variable "subnet_ids" {}
variable "encryption" {}
variable "kms_key_id" {}
variable "cache_name" {}
variable "multi_az" {}
variable "replica_count" {}
variable "engine_version" {}
variable "instance_type" {}
variable "port" {}
variable "encryption" {}
variable "auto_minor_version_upgrade" {}
variable "parameter_group" {}
variable "maintenance_window" {}
Expand Down

0 comments on commit 2c89b02

Please sign in to comment.