Merge pull request #3 from lgallard/feature/add-timeouts

Add support for customizable update timeout

Author: lgallard

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.2.0 (May 2, 2020)
+
+ENHANCEMENTS:
+
+* Add support for customizable update timeout
+
+UPDATES:
+
+* Update public and vpc examples
+
+
 ## 0.1.2 (April 1, 2020)
 
 UPDATES:

README.md

@@ -23,7 +23,6 @@ module "aws_es" {
     kms_key_id = "alias/aws/es"
   }
 
-
   log_publishing_options = {
     enabled = "true"
   }
@@ -32,7 +31,7 @@ module "aws_es" {
     "rest.action.multi.allow_explicit_index" = "true"
   }
 
-  access_policies = templatefile("${path.module}/whitelist.tpl", {
+  access_policies = templatefile("${path.module}/whitelits.tpl", {
     region      = data.aws_region.current.name,
     account     = data.aws_caller_identity.current.account_id,
     domain_name = var.es_domain_name,
@@ -42,6 +41,8 @@ module "aws_es" {
   node_to_node_encryption_enabled                = "true"
   snapshot_options_automated_snapshot_start_hour = "23"
 
+  timeouts_update = "60m"
+
   tags = {
     Owner = "sysops"
     env   = "dev"

examples/public/main.tf

@@ -1,5 +1,5 @@
 region         = "us-east-1"
-profile        = "my-profile"
-es_domain_name = "elasticsearch_public"
+profile        = "default"
+es_domain_name = "elasticsearch-public"
 es_version     = "7.1"
 whitelist      = ["1.1.1.1", "2.2.2.2"]

examples/public/terraform.tfvars

@@ -37,6 +37,8 @@ module "aws_es" {
     domain_name = var.es_domain_name
   })
 
+  timeouts_update = "60m"
+
   tags = {
     Owner = "sysops"
     env   = "dev"

examples/vpc/main.tf

@@ -1,4 +1,4 @@
-profile        = "my-profile"
+profile        = "default"
 region         = "us-east-1"
-es_domain_name = "elasticsearch_vpc"
+es_domain_name = "elasticsearch-vpc"
 es_version     = "7.1"

examples/vpc/terraform.tfvars

@@ -98,6 +98,14 @@ resource "aws_elasticsearch_domain" "es_domain" {
     }
   }
 
+  # Timeouts
+  dynamic "timeouts" {
+    for_each = local.timeouts
+    content {
+      update = lookup(timeouts.value, "update")
+    }
+  }
+
   # Tags
   tags = var.tags
 
@@ -191,4 +199,13 @@ locals {
 
   cognito_options = var.cognito_options_enabled == false || lookup(local.cognito_options_default, "enabled", "false") == "false" ? [] : [local.cognito_options_default]
 
+  # Timeouts
+  # If timeouts block is provided, build one using the default values
+  timeouts = var.timeouts_update == null && length(var.timeouts) == 0 ? [] : [
+    {
+      update = lookup(var.timeouts, "update", null) == null ? var.timeouts_update : lookup(var.timeouts, "update")
+    }
+  ]
+
+
 }

main.tf

@@ -230,3 +230,17 @@ variable "tags" {
   type        = map
   default     = {}
 }
+
+
+# Timeouts
+variable "timeouts" {
+  description = "Timeouts map."
+  type        = map
+  default     = {}
+}
+
+variable "timeouts_update" {
+  description = "How long to wait for updates."
+  type        = string
+  default     = null
+}

variables.tf

@@ -0,0 +1,7 @@
+terraform {
+  required_version = ">= 0.12.9"
+
+  required_providers {
+    aws = ">= 2.60.0"
+  }
+}