fix

terraform-modules · Apr 26, 2023 · d8a6a6c · d8a6a6c
1 parent 2c28b77
commit d8a6a6c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 26 deletions.
diff --git a/code/ddns-lambda.py b/code/ddns-lambda.py
@@ -742,7 +742,8 @@ def lambda_handler(
                     f"zone {final_hosted_zone_name} to value {private_ip}"
                 count[create_response] += 1
                 if create_response == 'success':
-                    dns_data.append(dns_data_tuple(zone_data_forward.zone_id, final_private_hostname, zone_data_forward.name, 'A', private_ip)
+                    dns_data.append(dns_data_tuple(
+                        zone_data_forward.zone_id, final_private_hostname, zone_data_forward.name, 'A', private_ip))
                     LOGGER.info("instance: %s, Created %s",
                                 instance_id, append_msg + lineno())
                     caller_response.append('Created ' + append_msg)
@@ -759,7 +760,7 @@ def lambda_handler(
                     if len(heritage) > 0:
                         LOGGER.debug(
                             f"Creating heritage TXT resource records {final_private_hostname} with value {heritage_value}: {lineno()}")
-                        create_response=create_resource_record(
+                        create_response = create_resource_record(
                             route53,
                             instance_id,
                             zone_data_forward.zone_id,
@@ -768,12 +769,13 @@ def lambda_handler(
                             'TXT',
                             heritage_value
                         )
-                        append_msg=f"TXT record in zone id: {zone_data_forward.zone_id} owner {zone_data_forward.owner_account} for hostname {final_private_hostname} " +
+                        append_msg = f"TXT record in zone id: {zone_data_forward.zone_id} owner {zone_data_forward.owner_account} for hostname {final_private_hostname} " +
                             f"zone {zone_data_forward.name} to value {heritage_value}"
 
                         count[create_response] += 1
                         if create_response == 'success':
-                            dns_data.append(dns_data_tuple(zone_data_forward.zone_id, final_private_hostname, zone_data_forward.name, 'TXT', heritage_value)
+                            dns_data.append(dns_data_tuple(
+                                zone_data_forward.zone_id, final_private_hostname, zone_data_forward.name, 'TXT', heritage_value))
                             LOGGER.info("instance: %s, Created %s",
                                         instance_id, append_msg + lineno())
                             caller_response.append('Created ' + append_msg)
@@ -797,7 +799,7 @@ def lambda_handler(
             #            fqdn = create_fqdn(final_private_hostname, final_hosted_zone_name)
             try:
                 if reverse_zone_associated:
-                    create_response=create_resource_record(
+                    create_response = create_resource_record(
                         route53,
                         instance_id,
                         zone_data_reverse.zone_id,
@@ -806,11 +808,12 @@ def lambda_handler(
                         'PTR',
                         final_private_dns_name,
                     )
-                    append_msg=f"PTR record in zone id: {zone_data_reverse.zone_id} owner {zone_data_reverse.owner_account} for hostname {tag_data['ptr_entry'].hostname} " + \
+                    append_msg = f"PTR record in zone id: {zone_data_reverse.zone_id} owner {zone_data_reverse.owner_account} for hostname {tag_data['ptr_entry'].hostname} " + \
                         f"zone {tag_data['ptr_entry'].zonename} to value {final_private_dns_name}"
                     count[create_response] += 1
                     if create_response == 'success':
-                        dns_data.append(dns_data_tuple(zone_data_reverse.zone_id, tag_data['ptr_entry'].hostname, tag_data['ptr_entry'].zonename, 'PTR', final_private_dns_name)
+                        dns_data.append(dns_data_tuple(
+                            zone_data_reverse.zone_id, tag_data['ptr_entry'].hostname, tag_data['ptr_entry'].zonename, 'PTR', final_private_dns_name))
                         LOGGER.info("instance: %s, Created %s",
                                     instance_id, append_msg + lineno())
                         caller_response.append('Created ' + append_msg)
@@ -828,7 +831,7 @@ def lambda_handler(
                     if reverse_zone_associated and len(heritage) > 0:
                         LOGGER.debug(
                             f"Creating heritage TXT resource records {tag_data['ptr_entry'].hostname} with value {heritage_value}: {lineno()}")
-                        create_response=create_resource_record(
+                        create_response = create_resource_record(
                             route53,
                             instance_id,
                             zone_data_reverse.zone_id,
@@ -837,12 +840,13 @@ def lambda_handler(
                             'TXT',
                             heritage_value
                         )
-                        append_msg=f"TXT record in zone id: {zone_data_reverse.zone_id} owner {zone_data_reverse.owner_account} for hostname {tag_data['ptr_entry'].hostname} " + \
+                        append_msg = f"TXT record in zone id: {zone_data_reverse.zone_id} owner {zone_data_reverse.owner_account} for hostname {tag_data['ptr_entry'].hostname} " + \
                             f"zone {tag_data['ptr_entry'].zonename} to value {heritage_value}"
 
                         count[create_response] += 1
                         if create_response == 'success':
-                            dns_data.append(dns_data_tuple(zone_data_reverse.zone_id, tag_data['ptr_entry'].hostname, tag_data['ptr_entry'].zonename, 'TXT', heritage_value)
+                            dns_data.append(dns_data_tuple(
+                                zone_data_reverse.zone_id, tag_data['ptr_entry'].hostname, tag_data['ptr_entry'].zonename, 'TXT', heritage_value))
                             LOGGER.info("instance: %s, Created %s",
                                         instance_id, append_msg + lineno())
                             caller_response.append('Created ' + append_msg)
@@ -865,7 +869,7 @@ def lambda_handler(
     else:  # not running so delete the records.  Note this may leave orphans around if the flags are set and then the host is shut down.  We may want to remove no matter what.
         if not flags['noforward']:
             # Process and delete A record and associated TXT record
-            process_response=process_delete_records(
+            process_response = process_delete_records(
                 route53,
                 instance_id,
                 zone_data_forward.zone_id,
@@ -877,14 +881,14 @@ def lambda_handler(
             )
 
             # only true if existing delete_records and the delete_success from the subroutine is true
-            delete_records=delete_records and process_response['delete_success']
+            delete_records = delete_records and process_response['delete_success']
             # append to the lsit
-            caller_response=caller_response + process_response['msg']
+            caller_response = caller_response + process_response['msg']
             count[f"delete_success.{process_response.get('delete_success')}"] += 1
 
         if not flags['noreverse']:
             # Process and delete PTR record and associated TXT record
-            process_response=process_delete_records(
+            process_response = process_delete_records(
                 route53,
                 instance_id,
                 zone_data_reverse.zone_id,
@@ -895,20 +899,20 @@ def lambda_handler(
                 heritage_value
             )
             # only true if existing delete_records and the delete_success from the subroutine is true
-            delete_records=delete_records and process_response['delete_success']
+            delete_records = delete_records and process_response['delete_success']
             # append to the lsit
-            caller_response=caller_response + process_response['msg']
+            caller_response = caller_response + process_response['msg']
             count[f"delete_success.{process_response.get('delete_success')}"] += 1
 
     # Process the CNAME record only if it has passed the check
     if tag_data['option_cname'].valid:
-        cname_host_name=tag_data['option_cname'].hostname
-        cname_domain_suffix=tag_data['option_cname'].zonename
+        cname_host_name = tag_data['option_cname'].hostname
+        cname_domain_suffix = tag_data['option_cname'].zonename
         LOGGER.debug("cname record is valid - creating CNAME record:"
                      " %s", str(cname_host_name) + "." + str(cname_domain_suffix) + lineno())
 
-        cname_domain_suffix_item=phz_collection_by_vpc[cname_domain_suffix]
-        cname_domain_suffix_id=cname_domain_suffix_item['zone_id']
+        cname_domain_suffix_item = phz_collection_by_vpc[cname_domain_suffix]
+        cname_domain_suffix_id = cname_domain_suffix_item['zone_id']
         LOGGER.debug("cname_domain_suffix_id: %s", str(cname_domain_suffix_id))
 
         # create CNAME record in private zone
@@ -921,7 +925,7 @@ def lambda_handler(
                 LOGGER.debug("cname_domain_suffix_id:"
                              " %s", str(cname_domain_suffix_id) + lineno())
 
-                create_response=create_resource_record(
+                create_response = create_resource_record(
                     route53,
                     instance_id,
                     cname_domain_suffix_id,
@@ -930,11 +934,12 @@ def lambda_handler(
                     'CNAME',
                     final_private_dns_name
                 )
-                append_msg=f"CNAME record in zone id: {cname_domain_suffix_id} owner {phz_collection_by_vpc[cname_domain_suffix]['owner_account']} " + \
+                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}"
 
                 if create_response == 'success':
-                    dns_data.append(dns_data_tuple(cname_domain_suffix_id, cname_host_name, cname_domain_suffix, 'CNAME', final_private_dns_name)
+                    dns_data.append(dns_data_tuple(
+                        cname_domain_suffix_id, cname_host_name, cname_domain_suffix, 'CNAME', final_private_dns_name))
                     LOGGER.info("instance: %s, Created %s",
                                 instance_id, append_msg + lineno())
                     caller_response.append('Created ' + append_msg)
@@ -951,8 +956,8 @@ def lambda_handler(
                     if len(heritage) > 0:
                         LOGGER.debug("Creating heritage TXT resource records %s, with value of %s",
                                      TXT_RR_PREFIX + '.' + cname_host_name, str(heritage_value) + lineno())
-                        cname_host_name_txt=TXT_RR_PREFIX + '.' + cname_host_name
-                        create_response=create_resource_record(
+                        cname_host_name_txt = TXT_RR_PREFIX + '.' + cname_host_name
+                        create_response = create_resource_record(
                             route53,
                             instance_id,
                             cname_domain_suffix_id,
@@ -961,7 +966,7 @@ def lambda_handler(
                             'TXT',
                             heritage_value
                         )
-                        append_msg=f"TXT for CNAME record in zone id: {cname_domain_suffix_id} owner {phz_collection_by_vpc[cname_domain_suffix]['owner_account']} " + \
+                        append_msg = f"TXT for 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 {heritage_value}"
 
                         if create_response == 'success':

diff --git a/code/ddns-lambda.zip b/code/ddns-lambda.zip