From 7b51451b9fe82dcc7177152ab23708ca5628bdf3 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Mon, 24 Apr 2023 20:59:30 -0400
Subject: [PATCH] fix

---
 code/ddns-lambda.py | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/code/ddns-lambda.py b/code/ddns-lambda.py
index dbf6f9d..008ac1a 100755
--- a/code/ddns-lambda.py
+++ b/code/ddns-lambda.py
@@ -842,9 +842,9 @@ def lambda_handler(
             process_response = process_delete_records(
                 route53,
                 instance_id,
-                final_hosted_zone_id,
+                zone_data_forward.zone_id,
                 final_private_hostname,
-                final_hosted_zone_name,
+                zone_data_forward.name,
                 'A',
                 private_ip,
                 heritage_value
@@ -861,15 +861,11 @@ def lambda_handler(
             process_response = process_delete_records(
                 route53,
                 instance_id,
-                reverse_lookup_zone_id,
-                #            reversed_ip_address,
-                #            'in-addr.arpa.',
-                #                reversed_entry,
-                #                reversed_lookup_zone,
+                zone_data_reverse.zone_id,
                 tag_data['ptr_entry'].hostname,
                 tag_data['ptr_entry'].zonename,
                 'PTR',
-                final_private_dns_name,
+                create_fqdn(final_private_hostname, final_hosted_zone_name),
                 heritage_value
             )
             # only true if existing delete_records and the delete_success from the subroutine is true
@@ -906,7 +902,7 @@ def lambda_handler(
                     cname_host_name,
                     cname_domain_suffix,
                     'CNAME',
-                    final_private_dns_name
+                    create_fqdn(final_private_hostname, final_hosted_zone_name),
                 )
                 append_msg = f"CNAME record in zone id: {cname_domain_suffix_id} owner {phz_collection_by_vpc[cname_domain_suffix]['owner_account']} " + \
                     f"hostname {cname_host_name} in zone {cname_domain_suffix} with value {final_private_dns_name}"
@@ -964,7 +960,7 @@ def lambda_handler(
                 cname_host_name,
                 cname_domain_suffix,
                 'CNAME',
-                final_private_dns_name,
+                create_fqdn(final_private_hostname, final_hosted_zone_name),
                 heritage_value
             )