From cbb003bbffb709ea0b6298458627a308c5063404 Mon Sep 17 00:00:00 2001
From: Olamide <65307752+OlamideOl1@users.noreply.github.com>
Date: Thu, 12 Dec 2024 05:02:45 +0100
Subject: [PATCH] Use vpc subnet count to set availability zone count for
 opensearch (#14)

---
 modules/opensearch/main.tf | 27 ++++++++++-----------------
 opensearch.tf              |  4 ++--
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/modules/opensearch/main.tf b/modules/opensearch/main.tf
index 3d870d9..b73f2a9 100644
--- a/modules/opensearch/main.tf
+++ b/modules/opensearch/main.tf
@@ -15,15 +15,21 @@ data "aws_iam_session_context" "current" {
 }
 
 locals {
-  account_id = try(data.aws_caller_identity.current[0].account_id, "")
-  partition  = try(data.aws_partition.current[0].partition, "")
-  region     = try(data.aws_region.current[0].name, "")
+  account_id                   = try(data.aws_caller_identity.current[0].account_id, "")
+  create_access_policy         = var.create && var.create_access_policy && (length(var.access_policy_statements) > 0 || length(var.access_policy_source_policy_documents) > 0 || length(var.access_policy_override_policy_documents) > 0)
+  create_cloudwatch_log_groups = var.create && var.create_cloudwatch_log_groups
+  create_security_group        = var.create && var.create_security_group && length(var.vpc_options) > 0
+
+  partition = try(data.aws_partition.current[0].partition, "")
+  region    = try(data.aws_region.current[0].name, "")
+
+  security_group_name = try(coalesce(var.security_group_name, var.domain_name), "")
 
   static_domain_arn = "arn:${local.partition}:es:${local.region}:${local.account_id}:domain/${var.domain_name}"
 
   tags = merge(var.tags, { terraform-aws-modules = "opensearch" })
 
-  name   = "es-${var.application_name}"
+  name = "es-${var.application_name}"
 }
 
 ################################################################################
@@ -206,10 +212,6 @@ resource "aws_opensearch_domain" "this" {
 # Access Policy
 ################################################################################
 
-locals {
-  create_access_policy = var.create && var.create_access_policy && (length(var.access_policy_statements) > 0 || length(var.access_policy_source_policy_documents) > 0 || length(var.access_policy_override_policy_documents) > 0)
-}
-
 resource "aws_opensearch_domain_policy" "this" {
   count = var.create && var.enable_access_policy && (local.create_access_policy || var.access_policies != null) ? 1 : 0
 
@@ -326,10 +328,6 @@ resource "aws_opensearch_outbound_connection" "this" {
 # Cloudwatch Log Group
 ################################################################################
 
-locals {
-  create_cloudwatch_log_groups = var.create && var.create_cloudwatch_log_groups
-}
-
 resource "aws_cloudwatch_log_group" "this" {
   for_each = { for opt in var.log_publishing_options : opt.log_type => opt if try(opt.enabled, true) && local.create_cloudwatch_log_groups }
 
@@ -385,11 +383,6 @@ resource "aws_cloudwatch_log_resource_policy" "this" {
 # Security Group
 ################################################################################
 
-locals {
-  create_security_group = var.create && var.create_security_group && length(var.vpc_options) > 0
-  security_group_name   = try(coalesce(var.security_group_name, var.domain_name), "")
-}
-
 data "aws_subnet" "this" {
   count = local.create_security_group ? 1 : 0
 
diff --git a/opensearch.tf b/opensearch.tf
index 2a16763..e94f2a4 100644
--- a/opensearch.tf
+++ b/opensearch.tf
@@ -58,7 +58,7 @@ module "opensearch" {
     instance_type            = coalesce(var.es_instance_type, var.es_dedicated_master_type)
 
     zone_awareness_config = {
-      availability_zone_count = 2
+      availability_zone_count = length(module.network.private_subnet_ids) > 3 ? 3 : length(module.network.private_subnet_ids)
     }
 
     zone_awareness_enabled = true
@@ -101,7 +101,7 @@ module "opensearch" {
   }
 
   vpc_options = {
-    subnet_ids = module.network.private_subnet_ids
+    subnet_ids = length(module.network.private_subnet_ids) > 3 ? slice(module.network.private_subnet_ids, 0, 3) : module.network.private_subnet_ids
   }
 
   # Security Group rule example