illumio-pylo 0.3.6__tar.gz → 0.3.8__tar.gz

{illumio_pylo-0.3.6/illumio_pylo.egg-info → illumio_pylo-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: illumio_pylo
-Version: 0.3.6
+Version: 0.3.8
 Summary: A set of tools and library for working with Illumio PCE
 Home-page: https://github.com/cpainchaud/pylo
 Author: Christophe Painchaud
@@ -187,11 +187,11 @@ Requires-Python: >=3.11
 License-File: LICENSE
 Requires-Dist: click==8.1.7
 Requires-Dist: colorama~=0.4.4
-Requires-Dist: cryptography~=42.0.5
-Requires-Dist: openpyxl~=3.1.2
+Requires-Dist: cryptography==42.0.7
+Requires-Dist: openpyxl~=3.1.3
 Requires-Dist: paramiko~=3.4.0
 Requires-Dist: prettytable~=3.10.0
-Requires-Dist: requests~=2.31.0
+Requires-Dist: requests~=2.32.0
 Requires-Dist: xlsxwriter~=3.2.0
 
 README.md

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/API/CredentialsManager.py

@@ -46,7 +46,6 @@ class CredentialProfile:
 
         self.raw_json: Optional[CredentialFileEntry] = None
 
-
     @staticmethod
     def from_credentials_file_entry(credential_file_entry: CredentialFileEntry, originating_file: Optional[str] = None):
         return CredentialProfile(credential_file_entry['name'],
@@ -303,3 +302,25 @@ def find_ssh_key_from_fingerprint(fingerprint: bytes) -> Optional[paramiko.Agent
         if key.get_fingerprint() == fingerprint:
             return key
     return None
+
+
+def get_supported_keys_from_ssh_agent() -> list[paramiko.AgentKey]:
+    keys = paramiko.Agent().get_keys()
+    # filter out ECDSA NISTPXXX and sk-ssh-ed25519
+    # RSA and ED25519 keys are reported to be working
+    return [key for key in keys if not (key.get_name().startswith("ecdsa-sha2-nistp") or
+                                        key.get_name().startswith("sk-ssh-ed25519"))]
+
+
+def is_encryption_available() -> bool:
+    if paramiko is None:
+        return False
+
+    # does paramiko have an agent module and does it have any supported key?
+    if hasattr(paramiko, 'Agent'):
+        keys = get_supported_keys_from_ssh_agent()
+        return len(keys) > 0
+
+    return False
+
+

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/Helpers/exports.py

@@ -436,7 +436,7 @@ class CsvExcelToObject:
                     for col_index in range(1, source_worksheet.max_column+1):
                         item = source_worksheet.cell(row_count, col_index).value
                         if item is None or len(item) < 1:
-                            raise pylo.PyloEx('Excel headers has blank fields, this is not supported')
+                            raise pylo.PyloEx('Excel headers has blank field at column #{}'.format(col_index))
                         self._detected_headers.append(item.lower())
                         if strict_headers and item.lower() not in mandatory_headers_dict:
                             raise pylo.PyloEx("CSV/Excel headers have an unexpected header named '{}'".format(item))

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.6"
+__version__ = "0.3.8"
 
 from typing import Callable
 

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/cli/__init__.py

@@ -151,7 +151,7 @@ def run(forced_command_name: Optional[str] = None):
     print("**** END OF {} UTILITY ****".format(selected_command.name.upper()))
     print("Command Specific Execution time: {:.2f} seconds".format(time.perf_counter() - command_execution_time_start))
     print("CLI started at {} and finished at {}".format(cli_start_time, cli_end_time))
-    print("CLI Total Execution time: {}".format(cli_end_time - cli_start_time))
+    print("CLI Total Execution time: {}".format((cli_end_time - cli_start_time)))
     print()
 
 

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/cli/commands/credential_manager.py

@@ -9,9 +9,9 @@ import paramiko
 import illumio_pylo as pylo
 import click
 from illumio_pylo.API.CredentialsManager import get_all_credentials, create_credential_in_file, CredentialFileEntry, \
-    create_credential_in_default_file,  \
+    create_credential_in_default_file, \
     get_credentials_from_file, encrypt_api_key_with_paramiko_ssh_key_chacha20poly1305, \
-    decrypt_api_key_with_paramiko_ssh_key_chacha20poly1305, decrypt_api_key_with_paramiko_ssh_key_fernet
+    decrypt_api_key_with_paramiko_ssh_key_chacha20poly1305, get_supported_keys_from_ssh_agent, is_encryption_available
 
 from illumio_pylo import log
 from . import Command
@@ -117,32 +117,33 @@ def __main(args, **kwargs):
             "api_key": api_key
         }
 
-        encrypt_api_key = click.prompt('> Encrypt API (requires an SSH agent running and an RSA or Ed25519 key) ? Y/N', type=bool)
-        if encrypt_api_key:
-            print("Available keys (ECDSA NISTPXXX keys and a few others are not supported and will be filtered out):")
-            ssh_keys = paramiko.Agent().get_keys()
-            # filter out ECDSA NISTPXXX and sk-ssh-ed25519@openssh.com
-            ssh_keys = get_supported_keys_from_ssh_agent()
-
-            # display a table of keys
-            print_keys(keys=ssh_keys, display_index=True)
-            print()
-
-            index_of_selected_key = click.prompt('> Select key by ID#', type=click.IntRange(0, len(ssh_keys)-1))
-            selected_ssh_key = ssh_keys[index_of_selected_key]
-            print("Selected key: {} | {} | {}".format(selected_ssh_key.get_name(),
-                                                      selected_ssh_key.get_fingerprint().hex(),
-                                                      selected_ssh_key.comment))
-            print(" * encrypting API key with selected key (you may be prompted by your SSH agent for confirmation or PIN code) ...", flush=True, end="")
-            # encrypted_api_key = encrypt_api_key_with_paramiko_ssh_key_fernet(ssh_key=selected_ssh_key, api_key=api_key)
-            encrypted_api_key = encrypt_api_key_with_paramiko_ssh_key_chacha20poly1305(ssh_key=selected_ssh_key, api_key=api_key)
-            print("OK!")
-            print(" * trying to decrypt the encrypted API key...", flush=True, end="")
-            decrypted_api_key = decrypt_api_key_with_paramiko_ssh_key_chacha20poly1305(encrypted_api_key_payload=encrypted_api_key)
-            if decrypted_api_key != api_key:
-                raise pylo.PyloEx("Decrypted API key does not match original API key")
-            print("OK!")
-            credentials_data["api_key"] = encrypted_api_key
+        if is_encryption_available():
+            encrypt_api_key = click.prompt('> Encrypt API (requires an SSH agent running and an RSA or Ed25519 key added to them) ? Y/N', type=bool)
+            if encrypt_api_key:
+                print("Available keys (ECDSA NISTPXXX keys and a few others are not supported and will be filtered out):")
+                ssh_keys = get_supported_keys_from_ssh_agent()
+
+                # display a table of keys
+                print_keys(keys=ssh_keys, display_index=True)
+                print()
+
+                index_of_selected_key = click.prompt('> Select key by ID#', type=click.IntRange(0, len(ssh_keys)-1))
+                selected_ssh_key = ssh_keys[index_of_selected_key]
+                print("Selected key: {} | {} | {}".format(selected_ssh_key.get_name(),
+                                                          selected_ssh_key.get_fingerprint().hex(),
+                                                          selected_ssh_key.comment))
+                print(" * encrypting API key with selected key (you may be prompted by your SSH agent for confirmation or PIN code) ...", flush=True, end="")
+                # encrypted_api_key = encrypt_api_key_with_paramiko_ssh_key_fernet(ssh_key=selected_ssh_key, api_key=api_key)
+                encrypted_api_key = encrypt_api_key_with_paramiko_ssh_key_chacha20poly1305(ssh_key=selected_ssh_key, api_key=api_key)
+                print("OK!")
+                print(" * trying to decrypt the encrypted API key...", flush=True, end="")
+                decrypted_api_key = decrypt_api_key_with_paramiko_ssh_key_chacha20poly1305(encrypted_api_key_payload=encrypted_api_key)
+                if decrypted_api_key != api_key:
+                    raise pylo.PyloEx("Decrypted API key does not match original API key")
+                print("OK!")
+                credentials_data["api_key"] = encrypted_api_key
+        else:
+            print(" * encryption is not available (no SSH agent or compatible key found), storing API key in plain text...")
 
 
         cwd = os.getcwd()
@@ -187,15 +188,9 @@ def __main(args, **kwargs):
     else:
         raise pylo.PyloEx("Unknown sub-command '{}'".format(args['sub_command']))
 
-command_object = Command(command_name, __main, fill_parser, credentials_manager_mode=True)
 
+command_object = Command(command_name, __main, fill_parser, credentials_manager_mode=True)
 
-def get_supported_keys_from_ssh_agent() -> list[paramiko.AgentKey]:
-    keys = paramiko.Agent().get_keys()
-    # filter out ECDSA NISTPXXX and sk-ssh-ed25519
-    # RSA and ED25519 keys are reported to be working
-    return [key for key in keys if not (key.get_name().startswith("ecdsa-sha2-nistp") or
-                                        key.get_name().startswith("sk-ssh-ed25519"))]
 
 def print_keys(keys: list[paramiko.AgentKey], display_index = True) -> None:
 

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/cli/commands/iplist_import_from_file.py

@@ -1,8 +1,12 @@
+from typing import List
+
 import illumio_pylo as pylo
 import argparse
 import sys
+import click
 from .utils.misc import make_filename_with_timestamp
 from . import Command
+from ...API.JsonPayloadTypes import IPListObjectCreationJsonStructure
 
 command_name = 'iplist-import'
 objects_load_filter = ['iplists']
@@ -14,20 +18,32 @@ def fill_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--input-file-delimiter', type=str, required=False, default=',',
                         help='CSV field delimiter')
 
+    parser.add_argument('--output-dir', '-o', type=str, required=False, default='output',
+                        help='Directory where the output files will be saved')
+
     parser.add_argument('--ignore-if-iplist-exists', action='store_true',
                         help='If an IPList with same same exists, ignore CSV entry')
 
     parser.add_argument('--network-delimiter', type=str, required=False, default=',', nargs='?', const=True,
                         help='If an IPList with same same exists, ignore CSV entry')
 
+    parser.add_argument('--proceed', '-p', action='store_true',
+                       help='If set, the script will proceed with the creation of iplists')
 
-def __main(args, org: pylo.Organization, **kwargs):
-    input_file = args['input_file']
-    input_file_delimiter = args['input_file_delimiter']
-    ignore_if_iplist_exists = args['ignore_if_iplist_exists']
-    network_delimiter = args['network_delimiter']
+    parser.add_argument('--no-confirmation-required', '-n', action='store_true',
+                        help='If set, the script will proceed with the creation of iplists without asking for confirmation')
 
-    output_file_prefix = make_filename_with_timestamp('import-iplists-results_')
+
+def __main(args, org: pylo.Organization, **kwargs):
+    setting_input_file = args['input_file']
+    settings_input_file_delimiter = args['input_file_delimiter']
+    settings_ignore_if_iplist_exists = args['ignore_if_iplist_exists']
+    settings_network_delimiter = args['network_delimiter']
+    settings_proceed = args['proceed']
+    settings_no_confirmation_required = args['no_confirmation_required']
+    settings_output_dir: str = args['output_dir']
+
+    output_file_prefix = make_filename_with_timestamp('import-iplists-results_', settings_output_dir)
     output_file_csv = output_file_prefix + '.csv'
     output_file_excel = output_file_prefix + '.xlsx'
 
@@ -44,8 +60,8 @@ def __main(args, org: pylo.Organization, **kwargs):
     pylo.file_clean(output_file_csv)
     pylo.file_clean(output_file_excel)
 
-    print(" * Loading CSV input file '{}'...".format(input_file), flush=True, end='')
-    csv_data = pylo.CsvExcelToObject(input_file, expected_headers=csv_expected_fields, csv_delimiter=input_file_delimiter)
+    print(" * Loading CSV input file '{}'...".format(setting_input_file), flush=True, end='')
+    csv_data = pylo.CsvExcelToObject(setting_input_file, expected_headers=csv_expected_fields, csv_delimiter=settings_input_file_delimiter)
     print('OK')
     print("   - CSV has {} columns and {} lines (headers don't count)".format(csv_data.count_columns(), csv_data.count_lines()))
     # print(pylo.nice_json(csv_data._objects))
@@ -71,7 +87,7 @@ def __main(args, org: pylo.Organization, **kwargs):
                     sys.exit(1)
                 else:
                     csv_object['**not_created_reason**'] = 'Found duplicated name in PCE'
-                    if not ignore_if_iplist_exists:
+                    if not settings_ignore_if_iplist_exists:
                         pylo.log.error("PCE contains iplists with duplicates name from CSV: '{}' at line #{}. Please fix CSV or look for --options to ignore it".format(lower_name, csv_object['*line*']))
                         sys.exit(1)
                     print("  - WARNING: CSV has an entry for iplist name '{}' at line #{} but it exists already in the PCE. It will be ignored.".format(lower_name, csv_object['*line*']))
@@ -89,28 +105,28 @@ def __main(args, org: pylo.Organization, **kwargs):
             ignored_objects_count += 1
 
     print(' * Preparing Iplist JSON data...')
-    iplists_json_data = []
+    iplists_json_data: List[IPListObjectCreationJsonStructure] = []
     for data in csv_objects_to_create:
-        new_iplist = {}
+        new_iplist: IPListObjectCreationJsonStructure = {}
         iplists_json_data.append(new_iplist)
 
         if len(data['name']) < 1:
             raise pylo.PyloEx('Iplist at line #{} is missing a name in CSV'.format(data['*line*']))
-        else:
-            new_iplist['name'] = data['name']
+
+        new_iplist['name'] = str(data['name'])
 
         if len(data['description']) > 0:
-            new_iplist['description'] = data['description']
+            new_iplist['description'] = str(data['description'])
 
         if len(data['networks']) < 1:
             print('Iplist at line #{} has empty networks list'.format(data['*line*']))
             sys.exit(1)
 
-        network_delimiter = network_delimiter.replace("\\n", "\n")
+        settings_network_delimiter = settings_network_delimiter.replace("\\n", "\n")
         ip_ranges = []
         new_iplist['ip_ranges'] = ip_ranges
 
-        for network_string in data['networks'].rsplit(network_delimiter):
+        for network_string in data['networks'].rsplit(settings_network_delimiter):
             network_string = network_string.strip(" \r\n")  # cleanup trailing characters
 
             exclusion = False
@@ -155,30 +171,38 @@ def __main(args, org: pylo.Organization, **kwargs):
 
     print("  * DONE")
 
-    print(" * Creating {} IPLists".format(len(iplists_json_data)))
-    total_created_count = 0
-    total_failed_count = 0
+    if settings_proceed is False:
+        print(" * Dry-run mode, no changes will be made to the PCE. Use --proceed to actually create the iplists")
+
+    else:
+        if not settings_no_confirmation_required:
+            print(" * WARNING: You are about to create {} IPLists in the PCE. Are you sure you want to proceed?".format(len(iplists_json_data)))
+            click.confirm("Do you want to proceed with the creation of these labels?", abort=True)
+
+        print(" * Creating {} IPLists".format(len(iplists_json_data)))
+        total_created_count = 0
+        total_failed_count = 0
 
-    for index in range(0, len(iplists_json_data)):
-        json_blob = iplists_json_data[index]
-        print("  - Pushing new iplist '{}' to PCE (#{} of {})... ".format(json_blob['name'], index+1, len(iplists_json_data)), end='', flush=True)
-        result = org.connector.objects_iplist_create(json_blob)
-        print("OK")
+        for index in range(0, len(iplists_json_data)):
+            json_blob: IPListObjectCreationJsonStructure = iplists_json_data[index]
+            print("  - Pushing new iplist '{}' to PCE (#{} of {})... ".format(json_blob['name'], index+1, len(iplists_json_data)), end='', flush=True)
+            result = org.connector.objects_iplist_create(json_blob)
+            print("OK")
 
-        href = result.get('href')
-        if href is None:
-            raise pylo.PyloEx('API returned unexpected response which is missing a HREF:', result)
+            href = result.get('href')
+            if href is None:
+                raise pylo.PyloEx('API returned unexpected response which is missing a HREF:', result)
 
-        total_created_count += 1
-        csv_objects_to_create[index]['href'] = href
+            total_created_count += 1
+            csv_objects_to_create[index]['href'] = href
+
+            csv_data.save_to_csv(output_file_csv, csv_created_fields)
+            csv_data.save_to_excel(output_file_excel, csv_created_fields)
 
         csv_data.save_to_csv(output_file_csv, csv_created_fields)
         csv_data.save_to_excel(output_file_excel, csv_created_fields)
 
-    csv_data.save_to_csv(output_file_csv, csv_created_fields)
-    csv_data.save_to_excel(output_file_excel, csv_created_fields)
-
-    print("  * DONE - {} created with success, {} failures and {} ignored. A report was created in {} and {}".format(total_created_count, total_failed_count, ignored_objects_count, output_file_csv, output_file_excel))
+        print("  * DONE - {} created with success, {} failures and {} ignored. A report was created in {} and {}".format(total_created_count, total_failed_count, ignored_objects_count, output_file_csv, output_file_excel))
 
 
 command_object = Command(command_name, __main, fill_parser, load_specific_objects_only=objects_load_filter)

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/cli/commands/ruleset_export.py

@@ -25,7 +25,6 @@ def fill_parser(parser: argparse.ArgumentParser):
                         "Public_NATed")
 
 
-
 def __main(args: Dict, org: pylo.Organization, **kwargs):
 
     setting_prefix_objects_with_type: bool|str = args['prefix_objects_with_type']
@@ -33,13 +32,11 @@ def __main(args: Dict, org: pylo.Organization, **kwargs):
     settings_output_file_format = args['format']
     settings_output_dir = args['output_dir']
 
-
     if setting_prefix_objects_with_type is False:
         print(" * Prefix for object types are disabled")
     else:
         print(" * Prefix for object types are enabled")
 
-
     if setting_object_types_as_section is False:
         print(" * Object types as section are disabled")
     else:

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/cli/commands/utils/misc.py

@@ -2,6 +2,8 @@ import os
 from datetime import datetime
 import illumio_pylo as pylo
 
+default_label_columns_prefix = 'label:'
+
 
 def make_filename_with_timestamp(prefix: str, output_directory: str = './') -> str:
     # if output directory starts with a dot, we assume it's a relative path. Same if not it's not starting with a slash

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/cli/commands/ven_duplicate_remover.py

@@ -288,6 +288,7 @@ def __main(args, org: pylo.Organization, pce_cache_was_used: bool, **kwargs):
 # make this command available to the CLI system
 command_object = Command(command_name, __main, fill_parser, objects_load_filter)
 
+
 class DuplicateRecordManager:
     class DuplicatedRecord:
         def __init__(self, pce_offline_timer_override: Optional[int] = None):

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/cli/commands/workload_import.py

@@ -8,7 +8,7 @@ import click
 import illumio_pylo as pylo
 from illumio_pylo import ArraysToExcel, ExcelHeaderSet, ExcelHeader
 from .utils.LabelCreation import generate_list_of_labels_to_create, create_labels
-from .utils.misc import make_filename_with_timestamp
+from .utils.misc import make_filename_with_timestamp, default_label_columns_prefix
 from . import Command
 
 command_name = 'workload-import'
@@ -27,7 +27,7 @@ def fill_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--ignore-missing-headers', action='store_true',
                         help='Ignore missing headers in the CSV/Excel file for label types')
 
-    parser.add_argument('--label-type-header-prefix', type=str, required=False, default='label_',
+    parser.add_argument('--label-type-header-prefix', type=str, required=False, default=default_label_columns_prefix,
                         help='Prefix for the label type headers in the CSV/Excel file')
 
     parser.add_argument('--ignore-hostname-collision', action='store_true',
@@ -89,7 +89,7 @@ def __main(args, org: pylo.Organization, **kwargs):
 
     csv_report_headers = ExcelHeaderSet(['name', 'hostname', 'ip', 'description'])
     for label_type in org.LabelStore.label_types:
-        csv_report_headers.append(f'label_{label_type}')
+        csv_report_headers.append(f'{settings_header_label_prefix}{label_type}')
 
     csv_report_headers.append(ExcelHeader(name='**not_created_reason**'))
     csv_report_headers.append(ExcelHeader(name='href', max_width=15))
@@ -124,7 +124,7 @@ def __main(args, org: pylo.Organization, **kwargs):
     if len(labels_to_be_created) > 0:
         print(" * {} Labels need to created before Workloads can be imported, listing:".format(len(labels_to_be_created)))
         for label in labels_to_be_created:
-            print("   - Label: {} (type={})".format(label.name, label.type))
+            print("   - Label: {} (type={})".format(label['name'], label['type']))
         if not settings_no_confirmation_required:
             click.confirm("Do you want to proceed with the creation of these labels?", abort=True)
 
@@ -283,8 +283,8 @@ def detect_workloads_name_collisions(csv_data, org: pylo.Organization, ignore_al
         if csv_object['hostname'] is not None and len(csv_object['hostname']) > 0:
             lower_hostname = csv_object['hostname'].lower()
             if lower_name != lower_hostname:
-                if csv_object['hostname'] not in name_cache:
-                    name_cache[csv_object['hostname']] = WorkloadCollisionItem(from_pce=False, csv_object=csv_object,
+                if lower_hostname not in name_cache:
+                    name_cache[lower_hostname] = WorkloadCollisionItem(from_pce=False, csv_object=csv_object,
                                                                                managed=False)
                 else:
                     if not name_cache[lower_hostname].from_pce:

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo/cli/commands/workload_update.py

@@ -6,7 +6,7 @@ import sys
 import illumio_pylo as pylo
 from illumio_pylo import ArraysToExcel, ExcelHeader, ExcelHeaderSet
 from .utils.LabelCreation import generate_list_of_labels_to_create, create_labels
-from .utils.misc import make_filename_with_timestamp
+from .utils.misc import make_filename_with_timestamp, default_label_columns_prefix
 from . import Command
 
 
@@ -25,7 +25,7 @@ def fill_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--input-file-delimiter', type=str, required=False, default=',',
                         help='CSV field delimiter')
 
-    parser.add_argument('--label-type-header-prefix', type=str, required=False, default='label_',
+    parser.add_argument('--label-type-header-prefix', type=str, required=False, default=default_label_columns_prefix,
                         help='Prefix for the label type headers in the CSV/Excel file')
 
     parser.add_argument('--output-dir', '-o', type=str, required=False, default='output',
@@ -49,6 +49,7 @@ def fill_parser(parser: argparse.ArgumentParser):
     parser.add_argument('--batch-size', type=int, required=False, default=500,
                         help='Number of Workloads to update per API call')
 
+
 class ContextSingleton:
 
     def __init__(self, org: pylo.Organization):
@@ -128,6 +129,7 @@ def __main(args, org: pylo.Organization, **kwargs):
 
     print('OK')
     print("   - CSV has {} columns and {} lines (headers don't count)".format(csv_input_object.count_columns(), csv_input_object.count_lines()))
+    context.csv_data = csv_input_object.objects()
     # </editor-fold desc="CSV input file data extraction">
 
 
@@ -307,7 +309,7 @@ def check_and_sanitize_csv_input_data(context, input_match_on_hostname, input_ma
     if input_match_on_hostname:
         for csv_data in context.csv_data:
             name = csv_data['hostname']
-            name = pylo.Workload.static_name_stripped_fqdn(name)
+            name = pylo.Workload.static_name_stripped_fqdn(name).lower()
             if name is None or len(name) < 1:
                 print("   - ERROR: CSV line #{} has invalid hostname defined: '{}'".format(csv_data['*line*'],
                                                                                            csv_data['hostname']),
@@ -332,7 +334,7 @@ def check_and_sanitize_csv_input_data(context, input_match_on_hostname, input_ma
                 continue
 
             if href not in context.csv_href_index:
-                context.csv_name_index[href] = csv_data
+                context.csv_href_index[href] = csv_data
                 continue
 
             print("   - ERROR: CSV line #{} has duplicate href defined from a previous line: '{}'".format(
@@ -343,6 +345,7 @@ def check_and_sanitize_csv_input_data(context, input_match_on_hostname, input_ma
             "ERROR! Several ({}) inconsistencies were found in the CSV, please fix them before you continue!".format(
                 csv_check_failed_count))
         sys.exit(1)
+
     print("   * Done")
 
 

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8/illumio_pylo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: illumio_pylo
-Version: 0.3.6
+Version: 0.3.8
 Summary: A set of tools and library for working with Illumio PCE
 Home-page: https://github.com/cpainchaud/pylo
 Author: Christophe Painchaud
@@ -187,11 +187,11 @@ Requires-Python: >=3.11
 License-File: LICENSE
 Requires-Dist: click==8.1.7
 Requires-Dist: colorama~=0.4.4
-Requires-Dist: cryptography~=42.0.5
-Requires-Dist: openpyxl~=3.1.2
+Requires-Dist: cryptography==42.0.7
+Requires-Dist: openpyxl~=3.1.3
 Requires-Dist: paramiko~=3.4.0
 Requires-Dist: prettytable~=3.10.0
-Requires-Dist: requests~=2.31.0
+Requires-Dist: requests~=2.32.0
 Requires-Dist: xlsxwriter~=3.2.0
 
 README.md

{illumio_pylo-0.3.6 → illumio_pylo-0.3.8}/illumio_pylo.egg-info/requires.txt

@@ -1,8 +1,8 @@
 click==8.1.7
 colorama~=0.4.4
-cryptography~=42.0.5
-openpyxl~=3.1.2
+cryptography==42.0.7
+openpyxl~=3.1.3
 paramiko~=3.4.0
 prettytable~=3.10.0
-requests~=2.31.0
+requests~=2.32.0
 xlsxwriter~=3.2.0

illumio_pylo-0.3.8/requirements.txt

@@ -0,0 +1,8 @@
+click==8.1.7
+colorama~=0.4.4
+cryptography==42.0.7
+openpyxl~=3.1.3
+paramiko~=3.4.0
+prettytable~=3.10.0
+requests~=2.32.0
+xlsxwriter~=3.2.0

illumio_pylo-0.3.6/requirements.txt

@@ -1,8 +0,0 @@
-click==8.1.7
-colorama~=0.4.4
-cryptography~=42.0.5
-openpyxl~=3.1.2
-paramiko~=3.4.0
-prettytable~=3.10.0
-requests~=2.31.0
-xlsxwriter~=3.2.0