catocli 2.1.0__tar.gz → 2.1.1__tar.gz

{catocli-2.1.0/catocli.egg-info → catocli-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: catocli
-Version: 2.1.0
+Version: 2.1.1
 Summary: Cato Networks cli wrapper for the GraphQL API.
 Home-page: https://github.com/Cato-Networks/cato-cli
 Author: Cato Networks

{catocli-2.1.0 → catocli-2.1.1}/catocli/Utils/clidriver.py

@@ -18,6 +18,7 @@ profile_manager = get_profile_manager()
 CATO_DEBUG = bool(os.getenv("CATO_DEBUG", False))
 from ..parsers.raw import raw_parse
 from ..parsers.custom import custom_parse
+from ..parsers.custom_private import private_parse
 from ..parsers.query_siteLocation import query_siteLocation_parse
 from ..parsers.mutation_accountManagement import mutation_accountManagement_parse
 from ..parsers.mutation_admin import mutation_admin_parse
@@ -82,6 +83,15 @@ def show_version_info(args, configuration=None):
 			print("Unable to check for updates (check your internet connection)")
 	return [{"success": True, "current_version": catocli.__version__, "latest_version": latest_version if not args.current_only else None}]
 
+def load_private_settings():
+	# Load private settings from ~/.cato/settings.json
+	settings_file = os.path.expanduser("~/.cato/settings.json")
+	try:
+		with open(settings_file, 'r') as f:
+			return json.load(f)
+	except (FileNotFoundError, json.JSONDecodeError):
+		return {}
+	
 def get_configuration(skip_api_key=False):
 	configuration = Configuration()
 	configuration.verify_ssl = False
@@ -104,10 +114,13 @@ def get_configuration(skip_api_key=False):
 		print(f"Run 'catocli configure set --profile {profile_name}' to update your credentials.")
 		exit(1)
 	
+	# Use standard endpoint from profile for regular API calls
+	configuration.host = credentials['endpoint']
+		
 	# Only set API key if not using custom headers file
+	# (Private settings are handled separately in createPrivateRequest)
 	if not skip_api_key:
 		configuration.api_key["x-api-key"] = credentials['cato_token']
-	configuration.host = credentials['endpoint']
 	configuration.accountID = credentials['account_id']
 	
 	return configuration
@@ -136,6 +149,7 @@ version_parser.add_argument('--current-only', action='store_true', help='Show on
 version_parser.set_defaults(func=show_version_info)
 
 custom_parsers = custom_parse(subparsers)
+private_parsers = private_parse(subparsers)
 raw_parsers = subparsers.add_parser('raw', help='Raw GraphQL', usage=get_help("raw"))
 raw_parser = raw_parse(raw_parsers)
 query_parser = subparsers.add_parser('query', help='Query', usage='catocli query <operationName> [options]')
@@ -239,6 +253,7 @@ def main(args=None):
 			response = args.func(args, None)
 		else:
 			# Check if using headers file to determine if we should skip API key
+			# Note: Private settings should NOT affect regular API calls - only private commands
 			using_headers_file = hasattr(args, 'headers_file') and args.headers_file
 			
 			# Get configuration from profiles
@@ -252,8 +267,8 @@ def main(args=None):
 				custom_headers.update(parse_headers_from_file(args.headers_file))
 			if custom_headers:
 				configuration.custom_headers.update(custom_headers)
-			# Handle account ID override
-			if args.func.__name__ != "createRawRequest":
+			# Handle account ID override (applies to all commands except raw)
+			if args.func.__name__ not in ["createRawRequest"]:
 				if hasattr(args, 'accountID') and args.accountID is not None:
 					# Command line override takes precedence
 					configuration.accountID = args.accountID
@@ -266,6 +281,9 @@ def main(args=None):
 		else:
 			if response!=None:
 				print(json.dumps(response[0], sort_keys=True, indent=4))
+	except KeyboardInterrupt:
+		print('Operation cancelled by user (Ctrl+C).')
+		exit(130)  # Standard exit code for SIGINT
 	except Exception as e:
 		if isinstance(e, AttributeError):
 			print('Missing arguments. Usage: catocli <operation> -h')
@@ -275,4 +293,4 @@ def main(args=None):
 		else:
 			print('ERROR: ',e)
 			traceback.print_exc()
-		exit(1)
+	exit(1)

{catocli-2.1.0 → catocli-2.1.1}/catocli/Utils/version_checker.py

@@ -14,7 +14,7 @@ from .. import __version__
 
 # Cache settings
 CACHE_FILE = os.path.expanduser("~/.catocli_version_cache")
-CACHE_DURATION = 3600 * 24  # 24 hours in seconds
+CACHE_DURATION = 3600 * 4  # 4 hours in seconds
 
 def get_cached_version_info():
     """Get cached version information if still valid"""

{catocli-2.1.0 → catocli-2.1.1}/catocli/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "2.1.0"
+__version__ = "2.1.1"
 __cato_host__ = "https://api.catonetworks.com/api/v1/graphql2"

{catocli-2.1.0 → catocli-2.1.1}/catocli/parsers/custom/import_rules_to_tf/import_rules_to_tf.py

@@ -107,6 +107,9 @@ def run_terraform_import(resource_address, resource_id, timeout=60, verbose=Fals
             print(f"Error: {result.stderr}")
             return False, result.stdout, result.stderr
             
+    except KeyboardInterrupt:
+        print(f"\nImport cancelled by user (Ctrl+C)")
+        raise  # Re-raise to allow higher-level handling
     except subprocess.TimeoutExpired:
         print(f"Timeout: {resource_address} (exceeded {timeout}s)")
         return False, "", f"Command timed out after {timeout} seconds"
@@ -267,7 +270,11 @@ def import_if_rules_to_tf(args, configuration):
             "total_failed": total_failed,
             "module_name": args.module_name
         }]
-        
+    
+    except KeyboardInterrupt:
+        print("\nImport process cancelled by user (Ctrl+C).")
+        print("Partial imports may have been completed.")
+        return [{"success": False, "error": "Import cancelled by user"}]
     except Exception as e:
         print(f"ERROR: {str(e)}")
         return [{"success": False, "error": str(e)}]
@@ -445,7 +452,11 @@ def import_wf_rules_to_tf(args, configuration):
             "total_failed": total_failed,
             "module_name": args.module_name
         }]
-        
+    
+    except KeyboardInterrupt:
+        print("\nImport process cancelled by user (Ctrl+C).")
+        print("Partial imports may have been completed.")
+        return [{"success": False, "error": "Import cancelled by user"}]
     except Exception as e:
         print(f"ERROR: {str(e)}")
         return [{"success": False, "error": str(e)}]

{catocli-2.1.0 → catocli-2.1.1}/catocli/parsers/custom/import_sites_to_tf/import_sites_to_tf.py

@@ -174,6 +174,9 @@ def run_terraform_import(resource_address, resource_id, timeout=60, verbose=Fals
             print(f"Error: {result.stderr}")
             return False, result.stdout, result.stderr
             
+    except KeyboardInterrupt:
+        print(f"\nImport cancelled by user (Ctrl+C)")
+        raise  # Re-raise to allow higher-level handling
     except subprocess.TimeoutExpired:
         print(f"Timeout: {resource_address} (exceeded {timeout}s)")
         return False, "", f"Command timed out after {timeout} seconds"
@@ -951,7 +954,11 @@ def import_socket_sites_to_tf(args, configuration):
             "total_failed": total_failed,
             "module_name": args.module_name
         }]
-        
+    
+    except KeyboardInterrupt:
+        print("\nImport process cancelled by user (Ctrl+C).")
+        print("Partial imports may have been completed.")
+        return [{"success": False, "error": "Import cancelled by user"}]
     except Exception as e:
         print(f"ERROR: {str(e)}")
         return [{"success": False, "error": str(e)}]

catocli-2.1.1/catocli/parsers/custom_private/__init__.py

@@ -0,0 +1,134 @@
+#!/usr/bin/env python3
+"""
+Private commands parser for custom GraphQL payloads
+Dynamically loads commands from ~/.cato/settings.json
+"""
+
+import os
+import json
+import argparse
+from ..parserApiClient import createPrivateRequest, get_private_help
+
+
+def load_private_settings():
+    """Load private settings from ~/.cato/settings.json"""
+    settings_file = os.path.expanduser("~/.cato/settings.json")
+    try:
+        with open(settings_file, 'r') as f:
+            settings = json.load(f)
+            return settings.get('privateCommands', {})
+    except (FileNotFoundError, json.JSONDecodeError, KeyError):
+        return {}
+
+
+def private_parse(subparsers):
+    """Check for private settings and create private parser if found"""
+    private_commands = load_private_settings()
+    
+    if not private_commands:
+        return None
+    
+    # Create the private subparser
+    private_parser = subparsers.add_parser(
+        'private', 
+        help='Private custom commands (configured in ~/.cato/settings.json)',
+        usage='catocli private <command> [options]'
+    )
+    
+    private_subparsers = private_parser.add_subparsers(
+        description='Available private commands',
+        help='Private command help'
+    )
+    
+    # Dynamically create subparsers for each private command
+    for command_name, command_config in private_commands.items():
+        create_private_command_parser(
+            private_subparsers, 
+            command_name, 
+            command_config
+        )
+    
+    return private_parser
+
+
+def create_private_command_parser(subparsers, command_name, command_config):
+    """Create a parser for a specific private command"""
+    
+    # Create the command parser
+    cmd_parser = subparsers.add_parser(
+        command_name,
+        help=f'Execute private command: {command_name}',
+        usage=get_private_help(command_name, command_config)
+    )
+    
+    # Add standard arguments
+    cmd_parser.add_argument(
+        'json', 
+        nargs='?', 
+        default='{}', 
+        help='Variables in JSON format (defaults to empty object if not provided).'
+    )
+    cmd_parser.add_argument(
+        '-t', 
+        const=True, 
+        default=False, 
+        nargs='?', 
+        help='Print GraphQL query without sending API call'
+    )
+    cmd_parser.add_argument(
+        '-v', 
+        const=True, 
+        default=False, 
+        nargs='?', 
+        help='Verbose output'
+    )
+    cmd_parser.add_argument(
+        '-p', 
+        const=True, 
+        default=False, 
+        nargs='?', 
+        help='Pretty print'
+    )
+    cmd_parser.add_argument(
+        '-H', '--header', 
+        action='append', 
+        dest='headers', 
+        help='Add custom headers in "Key: Value" format. Can be used multiple times.'
+    )
+    cmd_parser.add_argument(
+        '--headers-file', 
+        dest='headers_file', 
+        help='Load headers from a file. Each line should contain a header in "Key: Value" format.'
+    )
+    
+    # Add standard accountID argument (like other commands)
+    cmd_parser.add_argument(
+        '-accountID', 
+        help='Override the account ID from profile with this value.'
+    )
+    
+    # Add dynamic arguments based on command configuration (excluding accountId since it's handled above)
+    if 'arguments' in command_config:
+        for arg in command_config['arguments']:
+            arg_name = arg.get('name')
+            # Skip accountId since it's handled by the standard -accountID argument
+            if arg_name and arg_name.lower() != 'accountid':
+                arg_type = arg.get('type', 'string')
+                arg_default = arg.get('default')
+                arg_help = f"Argument: {arg_name}"
+                
+                if arg_default:
+                    arg_help += f" (default: {arg_default})"
+                
+                cmd_parser.add_argument(
+                    f'--{arg_name}',
+                    help=arg_help,
+                    default=arg_default
+                )
+    
+    # Set the function to handle this command
+    cmd_parser.set_defaults(
+        func=createPrivateRequest, 
+        private_command=command_name,
+        private_config=command_config
+    )