From 52c71698fe5a711105449d4b65acc22cf67455bb Mon Sep 17 00:00:00 2001
From: Alexandre Gaillet <alexandre.gaillet@fr.clara.net>
Date: Tue, 22 May 2018 10:58:36 +0200
Subject: [PATCH] MON-32 - static variable updated to locals

---
 .../memcached/{memory.tf => locals.tf}        |  8 ++---
 .../memcached/monitors-memcached.tf           |  2 +-
 cloud/aws/elasticache/redis/core.tf           | 31 ------------------
 .../redis/{memory.tf => locals.tf}            | 32 ++++++++++++++++---
 cloud/aws/elasticache/redis/monitors-redis.tf |  4 +--
 5 files changed, 32 insertions(+), 45 deletions(-)
 rename cloud/aws/elasticache/memcached/{memory.tf => locals.tf} (88%)
 delete mode 100644 cloud/aws/elasticache/redis/core.tf
 rename cloud/aws/elasticache/redis/{memory.tf => locals.tf} (56%)

diff --git a/cloud/aws/elasticache/memcached/memory.tf b/cloud/aws/elasticache/memcached/locals.tf
similarity index 88%
rename from cloud/aws/elasticache/memcached/memory.tf
rename to cloud/aws/elasticache/memcached/locals.tf
index 0d41eeb..310de51 100644
--- a/cloud/aws/elasticache/memcached/memory.tf
+++ b/cloud/aws/elasticache/memcached/locals.tf
@@ -1,9 +1,5 @@
-variable "memory" {
-  type = "map"
-
-  description = "Mapping between Elasticache size and Memory."
-
-  default = {
+locals {
+  memory = {
     cache.t2.micro    = "595926712"
     cache.t2.small    = "1664299827"
     cache.t2.medium   = "3457448673"
diff --git a/cloud/aws/elasticache/memcached/monitors-memcached.tf b/cloud/aws/elasticache/memcached/monitors-memcached.tf
index 71b83e3..ea2ebec 100644
--- a/cloud/aws/elasticache/memcached/monitors-memcached.tf
+++ b/cloud/aws/elasticache/memcached/monitors-memcached.tf
@@ -122,7 +122,7 @@ resource "datadog_monitor" "memcached_free_memory" {
   query = <<EOF
     ${var.free_memory_aggregator}(${var.free_memory_timeframe}): (
       ${var.free_memory_aggregator}:aws.elasticache.freeable_memory{${data.template_file.filter.rendered}} by {region,cluster,node} /
-      ${var.memory[var.elasticache_size]} * 100
+      ${local.memory[var.elasticache_size]} * 100
     ) < ${var.free_memory_threshold_critical}
   EOF
 
diff --git a/cloud/aws/elasticache/redis/core.tf b/cloud/aws/elasticache/redis/core.tf
deleted file mode 100644
index 0970ea6..0000000
--- a/cloud/aws/elasticache/redis/core.tf
+++ /dev/null
@@ -1,31 +0,0 @@
-variable "core" {
-  type = "map"
-
-  description = "Mapping between Elasticache size and vCPU."
-
-  default = {
-    cache.t2.micro    = "1"
-    cache.t2.small    = "1"
-    cache.t2.medium   = "2"
-    cache.m3.medium   = "1"
-    cache.m3.large    = "2"
-    cache.m3.xlarge   = "4"
-    cache.m3.2xlarge  = "8"
-    cache.m4.large    = "2"
-    cache.m4.xlarge   = "4"
-    cache.m4.2xlarge  = "8"
-    cache.m4.4xlarge  = "16"
-    cache.m4.10xlarge = "40"
-    cache.r3.large    = "2"
-    cache.r3.xlarge   = "4"
-    cache.r3.2xlarge  = "8"
-    cache.r3.4xlarge  = "16"
-    cache.r3.8xlarge  = "32"
-    cache.r4.large    = "2"
-    cache.r4.xlarge   = "4"
-    cache.r4.2xlarge  = "8"
-    cache.r4.4xlarge  = "16"
-    cache.r4.8xlarge  = "32"
-    cache.r4.16xlarge = "64"
-  }
-}
diff --git a/cloud/aws/elasticache/redis/memory.tf b/cloud/aws/elasticache/redis/locals.tf
similarity index 56%
rename from cloud/aws/elasticache/redis/memory.tf
rename to cloud/aws/elasticache/redis/locals.tf
index 0d41eeb..89858cc 100644
--- a/cloud/aws/elasticache/redis/memory.tf
+++ b/cloud/aws/elasticache/redis/locals.tf
@@ -1,9 +1,31 @@
-variable "memory" {
-  type = "map"
+locals {
+  core = {
+    cache.t2.micro    = "1"
+    cache.t2.small    = "1"
+    cache.t2.medium   = "2"
+    cache.m3.medium   = "1"
+    cache.m3.large    = "2"
+    cache.m3.xlarge   = "4"
+    cache.m3.2xlarge  = "8"
+    cache.m4.large    = "2"
+    cache.m4.xlarge   = "4"
+    cache.m4.2xlarge  = "8"
+    cache.m4.4xlarge  = "16"
+    cache.m4.10xlarge = "40"
+    cache.r3.large    = "2"
+    cache.r3.xlarge   = "4"
+    cache.r3.2xlarge  = "8"
+    cache.r3.4xlarge  = "16"
+    cache.r3.8xlarge  = "32"
+    cache.r4.large    = "2"
+    cache.r4.xlarge   = "4"
+    cache.r4.2xlarge  = "8"
+    cache.r4.4xlarge  = "16"
+    cache.r4.8xlarge  = "32"
+    cache.r4.16xlarge = "64"
+  }
 
-  description = "Mapping between Elasticache size and Memory."
-
-  default = {
+  memory = {
     cache.t2.micro    = "595926712"
     cache.t2.small    = "1664299827"
     cache.t2.medium   = "3457448673"
diff --git a/cloud/aws/elasticache/redis/monitors-redis.tf b/cloud/aws/elasticache/redis/monitors-redis.tf
index dd98874..c8fe00c 100644
--- a/cloud/aws/elasticache/redis/monitors-redis.tf
+++ b/cloud/aws/elasticache/redis/monitors-redis.tf
@@ -58,7 +58,7 @@ resource "datadog_monitor" "redis_cpu_high" {
   query = <<EOF
     ${var.cpu_high_aggregator}(${var.cpu_high_timeframe}): (
       ${var.cpu_high_aggregator}:aws.elasticache.cpuutilization{${data.template_file.filter.rendered}} by {region,cluster,node}
-    ) > ( ${var.cpu_high_threshold_critical} / ${var.core[var.elasticache_size]} )
+    ) > ( ${var.cpu_high_threshold_critical} / ${local.core[var.elasticache_size]} )
   EOF
 
   thresholds {
@@ -177,7 +177,7 @@ resource "datadog_monitor" "redis_free_memory" {
   query = <<EOF
     ${var.free_memory_aggregator}(${var.free_memory_timeframe}): (
       ${var.free_memory_aggregator}:aws.elasticache.freeable_memory{${data.template_file.filter.rendered}} by {region,cluster,node} /
-      ( ${var.memory[var.elasticache_size]} / ${var.nodes} )
+      ( ${local.memory[var.elasticache_size]} / ${var.nodes} )
     ) * 100 < ${var.free_memory_threshold_critical}
   EOF