From c140a1eebf8242e16cc0aba11b61c36d39bfb838 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Fri, 15 Nov 2024 14:54:42 -0500
Subject: [PATCH] * 2.10.7 -- 2024-11-14   - vpc-interface-endpoint     - fix
 shortname for ssm and descriptions

---
 CHANGELOG.md                      |  4 ++++
 common/version.tf                 |  2 +-
 vpc-interface-endpoint/route53.tf | 26 ++++++++++++++++----------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92a5efa..b2345ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -422,3 +422,7 @@
 * 2.10.6 -- 2024-11-13
   - vpc-interface-endpoint
     - fix route53 creation to base it off private_dns_name
+
+* 2.10.7 -- 2024-11-14
+  - vpc-interface-endpoint
+    - fix shortname for ssm and descriptions
diff --git a/common/version.tf b/common/version.tf
index 2003c74..55d232f 100644
--- a/common/version.tf
+++ b/common/version.tf
@@ -1,5 +1,5 @@
 locals {
-  _module_version = "2.10.6"
+  _module_version = "2.10.7"
   _module_names = {
     "_main_" = "aws-vpc-setup"
 
diff --git a/vpc-interface-endpoint/route53.tf b/vpc-interface-endpoint/route53.tf
index be6e869..7b97861 100644
--- a/vpc-interface-endpoint/route53.tf
+++ b/vpc-interface-endpoint/route53.tf
@@ -9,8 +9,9 @@
 # 
 
 locals {
-  endpoint_exists      = fileexists(format("%v/setup/.vpce.%v", path.root, data.aws_vpc_endpoint_service.interface_endpoint.service))
   service_domain_parts = split(".", data.aws_vpc_endpoint_service.interface_endpoint.private_dns_name)
+  endpoint_shortname   = data.aws_vpc_endpoint_service.interface_endpoint.service != null ? data.aws_vpc_endpoint_service.interface_endpoint.service : local.service_domain_parts[0]
+  endpoint_exists      = fileexists(format("%v/setup/.vpce.%v", path.root, local.endpoint_shortname))
   is_wildcard          = local.service_domain_parts[0] == "*"
   has_service          = data.aws_vpc_endpoint_service.interface_endpoint.service != null
   has_domain_name      = data.aws_vpc_endpoint_service.interface_endpoint.private_dns_name != null
@@ -20,9 +21,10 @@ locals {
 }
 
 resource "aws_route53_zone" "vpce" {
-  count         = local.r53_create ? 1 : 0
-  name          = length(local.domain_name) > 0 ? local.domain_name : null
-  comment       = format("VPCE %v %v", data.aws_vpc_endpoint_service.interface_endpoint.service, local.region)
+  count = local.r53_create ? 1 : 0
+  name  = length(local.domain_name) > 0 ? local.domain_name : null
+  #  comment       = format("VPCE %v %v", data.aws_vpc_endpoint_service.interface_endpoint.service, local.region)
+  comment       = format("VPCE %v %v", local.endpoint_shortname, local.region)
   force_destroy = false
 
   vpc {
@@ -46,7 +48,7 @@ resource "null_resource" "vpce" {
   triggers = {
     vpce_id            = aws_vpc_endpoint.interface_endpoint.id
     vpce_interface_ids = join(",", aws_vpc_endpoint.interface_endpoint.network_interface_ids)
-    service            = data.aws_vpc_endpoint_service.interface_endpoint.service
+    service            = local.endpoint_shortname
   }
 
   provisioner "local-exec" {
@@ -167,12 +169,15 @@ resource "aws_route53_record" "vpce_ptr_info" {
 
 resource "aws_ssm_parameter" "vpce" {
   #  count       = local.r53_create ? 1 : 0
-  count       = var.create_central_vpc_endpoint && local.has_service ? 1 : 0
-  name        = format("/enterprise/%v/vpc-endpoints/%v/%v", data.aws_arn.current.partition, local.region, data.aws_vpc_endpoint_service.interface_endpoint.service)
-  description = format("VPC Endpoint details for %v", data.aws_vpc_endpoint_service.interface_endpoint.service)
+  count = var.create_central_vpc_endpoint && local.has_service ? 1 : 0
+  #  name        = format("/enterprise/%v/vpc-endpoints/%v/%v", data.aws_arn.current.partition, local.region, data.aws_vpc_endpoint_service.interface_endpoint.service)
+  name = format("/enterprise/%v/vpc-endpoints/%v/%v", data.aws_arn.current.partition, local.region, local.endpoint_shortname)
+  #  description = format("VPC Endpoint details for %v", data.aws_vpc_endpoint_service.interface_endpoint.service)
+  description = format("VPC Endpoint details for %v", local.endpoint_shortname)
   type        = "String"
   value = jsonencode({
-    name                 = data.aws_vpc_endpoint_service.interface_endpoint.service
+    #    name                 = data.aws_vpc_endpoint_service.interface_endpoint.service != null ? data.aws_vpc_endpoint_service.interface_endpoint.service : local.service_domain_parts[0]
+    name                 = local.endpoint_shortname
     region               = local.region
     dns_name             = local.domain_name
     id                   = aws_vpc_endpoint.interface_endpoint.id
@@ -188,6 +193,7 @@ resource "aws_ssm_parameter" "vpce" {
   tags = merge(
     local.base_tags,
     var.tags,
-    { "boc:vpc_endpoint" = data.aws_vpc_endpoint_service.interface_endpoint.service },
+    #    { "boc:vpc_endpoint" = data.aws_vpc_endpoint_service.interface_endpoint.service != null ? data.aws_vpc_endpoint_service.interface_endpoint.service : local.service_domain_parts[0] },
+    { "boc:vpc_endpoint" = local.endpoint_shortname },
   )
 }