catocli 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

catocli/parsers/custom/import_rules_to_tf/import_rules_to_tf.py

@@ -60,14 +60,13 @@ def extract_rules_and_sections(policy_data):
             })
     
     # Extract sections
-    section_ids = policy_data.get('section_ids', {})
     for section in policy_data.get('sections', []):
         if section.get('section_name'):
             sections.append({
                 'section_name': section['section_name'],
                 'section_index': section.get('section_index', 0),
-                'section_id': section_ids.get(section['section_name'], '')
-            })  
+                'section_id': section.get('section_id', '')
+            })
     return rules, sections
 
 
@@ -123,8 +122,8 @@ def find_rule_index(rules, rule_name):
     return None
 
 
-def import_sections(sections, module_name, verbose=False,
-                   resource_type="cato_if_section", resource_name="sections"):
+def import_sections(sections, module_name, resource_type,
+                    resource_name="sections", verbose=False):
     """Import all sections"""
     print("\nStarting section imports...")
     total_sections = len(sections)
@@ -135,7 +134,7 @@ def import_sections(sections, module_name, verbose=False,
         section_id = section['section_id']
         section_name = section['section_name']
         section_index = section['section_index']
-        resource_address = f'{module_name}.{resource_type}.{resource_name}["{str(section_index)}"]'
+        resource_address = f'{module_name}.{resource_type}.{resource_name}["{section_name}"]'
         print(f"\n[{i+1}/{total_sections}] Section: {section_name} (index: {section_index})")
 
         # For sections, we use the section name as the ID since that's how Cato identifies them
@@ -166,7 +165,7 @@ def import_rules(rules, module_name, verbose=False,
         terraform_key = sanitize_name_for_terraform(rule_name)
         
         # Use array index syntax instead of rule ID
-        resource_address = f'{module_name}.{resource_type}.{resource_name}["{str(rule_index)}"]'
+        resource_address = f'{module_name}.{resource_type}.{resource_name}["{str(rule_name)}"]'
         print(f"\n[{i+1}/{total_rules}] Rule: {rule_name} (index: {rule_index})")
         
         success, stdout, stderr = run_terraform_import(resource_address, rule_id, verbose=verbose)
@@ -376,7 +375,7 @@ def import_if_rules_to_tf(args, configuration):
         
         # Import sections first (if not skipped)
         if not args.rules_only and sections:
-            successful, failed = import_sections(sections, module_name=args.module_name, verbose=args.verbose)
+            successful, failed = import_sections(sections, module_name=args.module_name, resource_type="cato_if_section", verbose=args.verbose)
             total_successful += successful
             total_failed += failed
         
@@ -439,7 +438,10 @@ def import_wf_sections(sections, module_name, verbose=False,
         section_id = section['section_id']
         section_name = section['section_name']
         section_index = section['section_index']
-        resource_address = f'{module_name}.{resource_type}.{resource_name}["{str(section_index)}"]'
+        # Add module. prefix if not present
+        if not module_name.startswith('module.'):
+            module_name = f'module.{module_name}'
+        resource_address = f'{module_name}.{resource_type}.{resource_name}["{section_name}"]'
         print(f"\n[{i+1}/{total_sections}] Section: {section_name} (index: {section_index})")
 
         # For sections, we use the section name as the ID since that's how Cato identifies them
@@ -469,8 +471,12 @@ def import_wf_rules(rules, module_name, verbose=False,
         rule_index = find_rule_index(rules, rule_name)
         terraform_key = sanitize_name_for_terraform(rule_name)
         
+        # Add module. prefix if not present
+        if not module_name.startswith('module.'):
+            module_name = f'module.{module_name}'
+
         # Use array index syntax instead of rule ID
-        resource_address = f'{module_name}.{resource_type}.{resource_name}["{str(rule_index)}"]'
+        resource_address = f'{module_name}.{resource_type}.{resource_name}["{str(rule_name)}"]'
         print(f"\n[{i+1}/{total_rules}] Rule: {rule_name} (index: {rule_index})")
         
         success, stdout, stderr = run_terraform_import(resource_address, rule_id, verbose=verbose)
@@ -519,8 +525,12 @@ def import_wf_rules_to_tf(args, configuration):
             print(" No rules or sections found. Exiting.")
             return [{"success": False, "error": "No rules or sections found"}]
         
+        # Add module. prefix if not present
+        module_name = args.module_name
+        if not module_name.startswith('module.'):
+            module_name = f'module.{module_name}'
         # Validate Terraform environment before proceeding
-        validate_terraform_environment(args.module_name, verbose=args.verbose)
+        validate_terraform_environment(module_name, verbose=args.verbose)
         
         # Ask for confirmation (unless auto-approved)
         if not args.rules_only and not args.sections_only:

catocli/parsers/mutation_accountManagement/__init__.py

@@ -14,12 +14,11 @@ def mutation_accountManagement_parse(mutation_subparsers):
 
 	mutation_accountManagement_addAccount_parser.add_argument('json', help='Variables in JSON format.')
 	mutation_accountManagement_addAccount_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_accountManagement_addAccount_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_accountManagement_addAccount_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_accountManagement_addAccount_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_accountManagement_addAccount_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	mutation_accountManagement_addAccount_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_accountManagement_addAccount_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_accountManagement_addAccount_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_accountManagement_addAccount_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	mutation_accountManagement_addAccount_parser.set_defaults(func=createRequest,operation_name='mutation.accountManagement.addAccount')
 
 	mutation_accountManagement_removeAccount_parser = mutation_accountManagement_subparsers.add_parser('removeAccount', 
@@ -28,12 +27,11 @@ def mutation_accountManagement_parse(mutation_subparsers):
 
 	mutation_accountManagement_removeAccount_parser.add_argument('json', help='Variables in JSON format.')
 	mutation_accountManagement_removeAccount_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_accountManagement_removeAccount_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_accountManagement_removeAccount_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_accountManagement_removeAccount_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_accountManagement_removeAccount_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	mutation_accountManagement_removeAccount_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_accountManagement_removeAccount_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_accountManagement_removeAccount_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_accountManagement_removeAccount_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	mutation_accountManagement_removeAccount_parser.set_defaults(func=createRequest,operation_name='mutation.accountManagement.removeAccount')
 
 	mutation_accountManagement_updateAccount_parser = mutation_accountManagement_subparsers.add_parser('updateAccount', 
@@ -42,10 +40,9 @@ def mutation_accountManagement_parse(mutation_subparsers):
 
 	mutation_accountManagement_updateAccount_parser.add_argument('json', help='Variables in JSON format.')
 	mutation_accountManagement_updateAccount_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_accountManagement_updateAccount_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_accountManagement_updateAccount_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_accountManagement_updateAccount_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_accountManagement_updateAccount_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	mutation_accountManagement_updateAccount_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_accountManagement_updateAccount_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_accountManagement_updateAccount_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_accountManagement_updateAccount_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	mutation_accountManagement_updateAccount_parser.set_defaults(func=createRequest,operation_name='mutation.accountManagement.updateAccount')

catocli/parsers/mutation_admin/__init__.py

@@ -14,12 +14,11 @@ def mutation_admin_parse(mutation_subparsers):
 
 	mutation_admin_addAdmin_parser.add_argument('json', help='Variables in JSON format.')
 	mutation_admin_addAdmin_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_admin_addAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_admin_addAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_admin_addAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_admin_addAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	mutation_admin_addAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_admin_addAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_admin_addAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_admin_addAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	mutation_admin_addAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.addAdmin')
 
 	mutation_admin_removeAdmin_parser = mutation_admin_subparsers.add_parser('removeAdmin', 
@@ -28,12 +27,11 @@ def mutation_admin_parse(mutation_subparsers):
 
 	mutation_admin_removeAdmin_parser.add_argument('json', help='Variables in JSON format.')
 	mutation_admin_removeAdmin_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_admin_removeAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_admin_removeAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_admin_removeAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_admin_removeAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	mutation_admin_removeAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_admin_removeAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_admin_removeAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_admin_removeAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	mutation_admin_removeAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.removeAdmin')
 
 	mutation_admin_updateAdmin_parser = mutation_admin_subparsers.add_parser('updateAdmin', 
@@ -42,10 +40,9 @@ def mutation_admin_parse(mutation_subparsers):
 
 	mutation_admin_updateAdmin_parser.add_argument('json', help='Variables in JSON format.')
 	mutation_admin_updateAdmin_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_admin_updateAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_admin_updateAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_admin_updateAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_admin_updateAdmin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	mutation_admin_updateAdmin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_admin_updateAdmin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_admin_updateAdmin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_admin_updateAdmin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	mutation_admin_updateAdmin_parser.set_defaults(func=createRequest,operation_name='mutation.admin.updateAdmin')

catocli/parsers/mutation_container/__init__.py

@@ -14,10 +14,9 @@ def mutation_container_parse(mutation_subparsers):
 
 	mutation_container_delete_parser.add_argument('json', help='Variables in JSON format.')
 	mutation_container_delete_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_container_delete_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_container_delete_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_container_delete_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_container_delete_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	mutation_container_delete_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_container_delete_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_container_delete_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_container_delete_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	mutation_container_delete_parser.set_defaults(func=createRequest,operation_name='mutation.container.delete')

catocli/parsers/mutation_hardware/__init__.py

@@ -14,10 +14,9 @@ def mutation_hardware_parse(mutation_subparsers):
 
 	mutation_hardware_updateHardwareShipping_parser.add_argument('json', help='Variables in JSON format.')
 	mutation_hardware_updateHardwareShipping_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_hardware_updateHardwareShipping_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_hardware_updateHardwareShipping_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_hardware_updateHardwareShipping_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_hardware_updateHardwareShipping_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	mutation_hardware_updateHardwareShipping_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_hardware_updateHardwareShipping_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_hardware_updateHardwareShipping_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_hardware_updateHardwareShipping_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	mutation_hardware_updateHardwareShipping_parser.set_defaults(func=createRequest,operation_name='mutation.hardware.updateHardwareShipping')