Enable master user and password option

.pre-commit-config.yaml

@@ -5,14 +5,14 @@ repos:
       - id: shellcheck
 
   - repo: https://github.com/tcort/markdown-link-check
-    rev: v3.12.1
+    rev: v3.12.2
     hooks:
       - id: markdown-link-check
         args:
           - "--config=mlc_config.json"
 
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.89.0
+    rev: v1.92.0
     hooks:
       - id: terraform_fmt
       - id: terraform_providers_lock

.tflint.hcl

@@ -1,6 +1,6 @@
 plugin "aws" {
   enabled = true
-  version = "0.23.1"
+  version = "0.32.0"
   source  = "github.com/terraform-linters/tflint-ruleset-aws"
 }
 

examples/ingestion/providers.tf

@@ -1,7 +1,3 @@
 provider "aws" {
   region = "ap-southeast-1"
 }
-
-provider "awscc" {
-  region = "ap-southeast-1"
-}

main.tf

@@ -2,6 +2,8 @@ resource "aws_opensearch_domain" "this" {
   #checkov:skip=CKV2_AWS_52
   #checkov:skip=CKV_AWS_248:Ensure that Elasticsearch is not using the default Security Group
   #checkov:skip=CKV_AWS_317:Ensure Elasticsearch Domain Audit Logging is enabled
+  #checkov:skip=CKV_AWS_318:Ensure Elasticsearch domains are configured with at least three dedicated master nodes for HA
+
   # service linked role must exist and default cloudwatch log_group created.
   depends_on = [
     aws_iam_service_linked_role.aos,
@@ -60,8 +62,8 @@ resource "aws_opensearch_domain" "this" {
 
     master_user_options {
       master_user_arn      = (!var.internal_user_database_enabled && var.master_user_arn != "") ? var.master_user_arn : null
-      master_user_name     = (var.internal_user_database_enabled && var.master_user_arn == "") ? var.master_user_name : null
-      master_user_password = (var.internal_user_database_enabled && var.master_user_arn == "") ? var.master_user_password : null
+      master_user_name     = (var.internal_user_database_enabled && var.master_user_name != "") ? var.master_user_name : null
+      master_user_password = (var.internal_user_database_enabled && var.master_user_password != "") ? var.master_user_password : null
     }
   }