expose vars from comet_elasticache into root

Author: burmek

comet-infrastructure/main.tf

@@ -106,40 +106,38 @@ module "comet_eks" {
 }
 
 module "comet_elasticache" {
-  source = "./modules/comet_elasticache"
-  count  = var.enable_elasticache ? 1 : 0
-
+  source      = "./modules/comet_elasticache"
+  count       = var.enable_elasticache ? 1 : 0
   environment = var.environment
 
   ec2_enabled = var.enable_ec2
   eks_enabled = var.enable_eks
 
-  vpc_id              = module.vpc.vpc_id
-  vpc_private_subnets = module.vpc.private_subnets
-
-  # index is used on the module refs becuase of the count usage in the toggle: "After the count apply the resource becomes a group, so later in the reference use 0-index of the group"
-  elasticache_allow_ec2_sg = var.enable_ec2 ? module.comet_ec2[0].comet_ec2_sg_id : null
-  elasticache_allow_eks_sg = var.enable_eks ? module.comet_eks[0].nodegroup_sg_id : null
+  vpc_id                       = module.vpc.vpc_id
+  elasticache_private_subnets  = module.vpc.private_subnets
+  elasticache_allow_ec2_sg     = var.enable_ec2 ? module.comet_ec2[0].comet_ec2_sg_id : null
+  elasticache_allow_eks_sg     = var.enable_eks ? module.comet_eks[0].nodegroup_sg_id : null
+  elasticache_engine           = var.elasticache_engine
+  elasticache_engine_version   = var.elasticache_engine_version
+  elasticache_instance_type    = var.elasticache_instance_type
+  elasticache_param_group_name = var.elasticache_param_group_name
+  elasticache_num_cache_nodes  = var.elasticache_num_cache_nodes
 }
 
 module "comet_rds" {
-  source = "./modules/comet_rds"
-  count  = var.enable_rds ? 1 : 0
-
+  source      = "./modules/comet_rds"
+  count       = var.enable_rds ? 1 : 0
   environment = var.environment
 
   ec2_enabled = var.enable_ec2
   eks_enabled = var.enable_eks
 
-  availability_zones = local.azs
+  availability_zones  = local.azs
   vpc_id              = module.vpc.vpc_id
   vpc_private_subnets = module.vpc.private_subnets
-
-  # index is used on the module refs becuase of the count usage in the toggle: "After the count apply the resource becomes a group, so later in the reference use 0-index of the group"
-  rds_allow_ec2_sg = var.enable_ec2 ? module.comet_ec2[0].comet_ec2_sg_id : null
-  rds_allow_eks_sg = var.enable_eks ? module.comet_eks[0].nodegroup_sg_id : null
-
-  rds_root_password = var.rds_root_password
+  rds_allow_ec2_sg    = var.enable_ec2 ? module.comet_ec2[0].comet_ec2_sg_id : null
+  rds_allow_eks_sg    = var.enable_eks ? module.comet_eks[0].nodegroup_sg_id : null
+  rds_root_password   = var.rds_root_password
 }
 
 module "comet_s3" {

comet-infrastructure/modules/comet_elasticache/main.tf

@@ -2,27 +2,26 @@ locals {
   redis_port = 6379
 
   tags = {
-    Terraform         = "true"
-    Environment       = var.environment
+    Terraform   = "true"
+    Environment = var.environment
   }
 }
 
 resource "aws_elasticache_cluster" "comet-ml-ec-redis" {
   cluster_id           = "cometml-ec-redis-${var.environment}"
   engine               = var.elasticache_engine
-  node_type            = var.elasticache_redis_instance_type
+  node_type            = var.elasticache_instance_type
   num_cache_nodes      = var.elasticache_num_cache_nodes
   parameter_group_name = var.elasticache_param_group_name
   engine_version       = var.elasticache_engine_version
   port                 = local.redis_port
   subnet_group_name    = aws_elasticache_subnet_group.comet-ml-ec-subnet-group.name
-  # SG resource ref
   security_group_ids = [aws_security_group.redis_inbound_sg.id]
 }
 
 resource "aws_elasticache_subnet_group" "comet-ml-ec-subnet-group" {
   name = "cometml-ec-sng-${var.environment}"
-  subnet_ids = var.vpc_private_subnets
+  subnet_ids = var.elasticache_private_subnets
 }
 
 resource "aws_security_group" "redis_inbound_sg" {

comet-infrastructure/modules/comet_elasticache/variables.tf

@@ -4,58 +4,49 @@ variable "environment" {
   default     = "dev"
 }
 
-variable "elasticache_redis_instance_type" {
-  description = "Elasticache Redis instance type"
+variable "vpc_id" {
+  description = "ID of the VPC that will contain the provisioned resources"
   type        = string
-  default     = "cache.r4.xlarge"
 }
 
-variable "elasticache_engine" {
-  description = "Engine type for Elasticache cluster"
-  type        = string
-  default     = "redis"
+variable "elasticache_private_subnets" {
+  description = "IDs of private subnets within the VPC"
+  type        = list(string)
 }
 
-variable "elasticache_engine_version" {
-  description = "Version number for Elasticache engine"
+variable "elasticache_allow_ec2_sg" {
+  description = "Security group associated with EC2 compute, if provisioned"
   type        = string
-  default     = "5.0.6"
 }
 
-variable "elasticache_param_group_name" {
-  description = "Name for the Elasticache cluster parameter group"
+variable "elasticache_allow_eks_sg" {
+  description = "Security group associated with EKS compute, if provisioned"
   type        = string
-  default     = "default.redis5.0"
 }
 
-variable "elasticache_num_cache_nodes" {
-  description = "Number of nodes in the Elasticache cluster"
-  type        = number
-  default     = 1
+variable "elasticache_engine" {
+  description = "Engine type for Elasticache cluster"
+  type        = string
 }
 
-variable "vpc_id" {
-  description = "ID of the VPC that will contain the provisioned resources"
+variable "elasticache_engine_version" {
+  description = "Version number for Elasticache engine"
   type        = string
-  default     = ""
 }
 
-variable "vpc_private_subnets" {
-  description = "IDs of private subnets within the VPC"
-  type        = list(string)
-  default     = []
+variable "elasticache_instance_type" {
+  description = "Elasticache instance type"
+  type        = string
 }
 
-variable "elasticache_allow_ec2_sg" {
-  description = "Security group associated with EC2 compute, if provisioned"
+variable "elasticache_param_group_name" {
+  description = "Name for the Elasticache cluster parameter group"
   type        = string
-  default     = ""
 }
 
-variable "elasticache_allow_eks_sg" {
-  description = "Security group associated with EKS compute, if provisioned"
-  type        = string
-  default     = ""
+variable "elasticache_num_cache_nodes" {
+  description = "Number of nodes in the Elasticache cluster"
+  type        = number
 }
 
 variable "ec2_enabled" {

comet-infrastructure/variables.tf

@@ -27,7 +27,7 @@ variable "enable_eks" {
 }
 
 variable "enable_elasticache" {
-  description = "Toggles the ElastiCache module for provisioning Comet Redis on ElastiCache"
+  description = "Toggles the elasticache module for provisioning Comet Redis on elasticache"
   type        = bool
 }
 
@@ -164,6 +164,43 @@ variable "eks_external_dns" {
   default     = true
 }
 
+#comet_elasticache
+variable "elasticache_private_subnets" {
+  description = "IDs of private subnets within the VPC"
+  type        = list(string)
+  default     = null
+}
+
+variable "elasticache_engine" {
+  description = "Engine type for ElastiCache cluster"
+  type        = string
+  default     = "redis"
+}
+
+variable "elasticache_engine_version" {
+  description = "Version number for ElastiCache engine"
+  type        = string
+  default     = "5.0.6"
+}
+
+variable "elasticache_instance_type" {
+  description = "ElastiCache instance type"
+  type        = string
+  default     = "cache.r4.xlarge"
+}
+
+variable "elasticache_param_group_name" {
+  description = "Name for the ElastiCache cluster parameter group"
+  type        = string
+  default     = "default.redis5.0"
+}
+
+variable "elasticache_num_cache_nodes" {
+  description = "Number of nodes in the ElastiCache cluster"
+  type        = number
+  default     = 1
+}
+
 #comet_rds
 variable "rds_root_password" {
   description = "Root password for RDS database"