From b344fc266c0119848c0337396cbd2b1dd06f80e2 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Wed, 31 May 2023 08:39:32 -0400
Subject: [PATCH] - vpn-transit-gateway   - add ok_action, update template, add
 version to description

---
 CHANGELOG.md                                                | 4 ++++
 common/version.tf                                           | 2 +-
 vpn-transit-gateway/cloudwatch_alarms.tf                    | 3 ++-
 .../{cloudwatch_alarm.tpl => vpn_tunnel_status.alarm.tpl}   | 6 ++++--
 4 files changed, 11 insertions(+), 4 deletions(-)
 rename vpn-transit-gateway/templates/{cloudwatch_alarm.tpl => vpn_tunnel_status.alarm.tpl} (84%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95db0a5..6c55c54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -316,3 +316,7 @@
     - new variables for creating cloudwatch alarms
       - enable_cloudwatch_alarms
       - cloudwatch_alarm_topic_arn
+
+* 2.9.1 -- 2023-05-31
+  - vpn-transit-gateway
+    - add ok_action, update template, add version to description
diff --git a/common/version.tf b/common/version.tf
index 6c29bd1..344acf7 100644
--- a/common/version.tf
+++ b/common/version.tf
@@ -1,5 +1,5 @@
 locals {
-  _module_version = "2.9.0"
+  _module_version = "2.9.1"
   _module_names = {
     "_main_" = "aws-vpc-setup"
 
diff --git a/vpn-transit-gateway/cloudwatch_alarms.tf b/vpn-transit-gateway/cloudwatch_alarms.tf
index 2140e00..5de634f 100644
--- a/vpn-transit-gateway/cloudwatch_alarms.tf
+++ b/vpn-transit-gateway/cloudwatch_alarms.tf
@@ -54,7 +54,8 @@ resource "aws_cloudwatch_metric_alarm" "tgw_vpn" {
   for_each            = var.enable_cloudwatch_alarms && var.cloudwatch_alarm_topic_arn != null ? local.vpn_details : {}
   actions_enabled     = true
   alarm_actions       = [var.cloudwatch_alarm_topic_arn]
-  alarm_description   = templatefile("${path.module}/templates/cloudwatch_alarm.tpl", tomap(each.value))
+  ok_actions          = [var.cloudwatch_alarm_topic_arn]
+  alarm_description   = templatefile("${path.module}/templates/vpn_tunnel_status.alarm.tpl", merge(tomap(each.value), { "module_name" = local.base_tags["boc:tf_module_name"], "module_version" = local._module_version }))
   alarm_name          = each.value.name
   comparison_operator = "LessThanThreshold"
   datapoints_to_alarm = 5
diff --git a/vpn-transit-gateway/templates/cloudwatch_alarm.tpl b/vpn-transit-gateway/templates/vpn_tunnel_status.alarm.tpl
similarity index 84%
rename from vpn-transit-gateway/templates/cloudwatch_alarm.tpl
rename to vpn-transit-gateway/templates/vpn_tunnel_status.alarm.tpl
index 7e14955..8931eeb 100644
--- a/vpn-transit-gateway/templates/cloudwatch_alarm.tpl
+++ b/vpn-transit-gateway/templates/vpn_tunnel_status.alarm.tpl
@@ -1,5 +1,5 @@
 
-# VPN Tunnel Down
+# VPN Tunnel Status Change
 
 ## ${account_alias} ${region} ${label} tunnel ${tunnel_number}
 
@@ -21,5 +21,7 @@
   * tunnel_label     = ${tunnel_label}
   * interface_number = ${interface_number}
   * loopback         = ${loopback}
-  * asr-endpiont     = ${customer_address}
+  * endpoint         = ${customer_address}
+
+_version = ${module_name} ${module_version}_