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

catocli/parsers/parserApiClient.py

@@ -6,29 +6,46 @@ from graphql_client import ApiClient, CallApi
 from graphql_client.api_client import ApiException
 import logging
 import pprint
+import uuid
+from urllib3.filepost import encode_multipart_formdata
 
 def createRequest(args, configuration):
 	params = vars(args)
 	instance = CallApi(ApiClient(configuration))
 	operationName = params["operation_name"]
 	operation = loadJSON("models/"+operationName+".json")
-	try:
-		variablesObj = json.loads(params["json"])	
-	except ValueError as e:
-		print("ERROR: Query argument must be valid json in quotes. ",e,'\n\nExample: \'{"yourKey":"yourValue"}\'')
-		exit()
+	variablesObj = {}
+	if params["json"] and not params["t"]:
+		try:
+			variablesObj = json.loads(params["json"])
+		except ValueError as e:
+			print("ERROR: Query argument must be valid json in quotes. ",e,'\n\nExample: \'{"yourKey":"yourValue"}\'')
+			exit()
+	elif not params["t"] and params["json"] is None:
+		# Default to empty object if no json provided and not using -t flag
+		variablesObj = {}
 	if "accountId" in operation["args"]:
 		variablesObj["accountId"] = configuration.accountID
 	else:
 		variablesObj["accountID"] = configuration.accountID
-	isOk, invalidVars, message = validateArgs(variablesObj,operation)
+	if params["t"]==True:
+		# Skip validation when using -t flag
+		isOk = True
+	else:
+		isOk, invalidVars, message = validateArgs(variablesObj,operation)
 	if isOk==True:
 		body = generateGraphqlPayload(variablesObj,operation,operationName)
 		if params["t"]==True:
-			if params["p"]==True:
-				print(json.dumps(body,indent=2,sort_keys=True).replace("\\n", "\n").replace("\\t", "  "))
-			else:
-				print(json.dumps(body).replace("\\n", " ").replace("\\t", " ").replace("    "," ").replace("  "," "))
+			# Load query from queryPayloads file
+			try:
+				queryPayloadFile = "queryPayloads/" + operationName + ".json"
+				queryPayload = loadJSON(queryPayloadFile)
+				if queryPayload and "query" in queryPayload:
+					print(queryPayload["query"])
+				else:
+					print("ERROR: Query not found in " + queryPayloadFile)
+			except Exception as e:
+				print("ERROR: Could not load query from " + queryPayloadFile + ": " + str(e))
 			return None
 		else:
 			try:
@@ -37,7 +54,13 @@ def createRequest(args, configuration):
 				return e
 	else:
 		print("ERROR: "+message,", ".join(invalidVars))
-
+		try:
+			queryPayloadFile = "queryPayloads/" + operationName + ".json"
+			queryPayload = loadJSON(queryPayloadFile)
+			print("\nExample: catocli "+operationName.replace(".", " "), json.dumps(queryPayload['variables']))
+		except Exception as e:
+			print("ERROR: Could not load query from " + queryPayloadFile + ": " + str(e))
+		
 def querySiteLocation(args, configuration):
 	params = vars(args)
 	operationName = params["operation_name"]
@@ -110,6 +133,14 @@ def querySiteLocation(args, configuration):
 		
 def createRawRequest(args, configuration):
 	params = vars(args)
+	# Handle endpoint override
+	if hasattr(args, 'endpoint') and args.endpoint:
+		configuration.host = args.endpoint
+	
+	# Check if binary/multipart mode is enabled
+	if hasattr(args, 'binary') and args.binary:
+		return createRawBinaryRequest(args, configuration)
+		
 	instance = CallApi(ApiClient(configuration))
 	isOk = False
 	try:
@@ -189,6 +220,7 @@ def validateArgs(variablesObj,operation):
 			isOk = False
 			invalidVars.append('"'+varName+'"')
 			message = "Invalid argument names. Looking for: "+", ".join(list(operation["operationArgs"].keys()))
+
 	if isOk==True:
 		for varName in operation["operationArgs"]:
 			if operation["operationArgs"][varName]["required"] and varName not in variablesObj:
@@ -309,4 +341,159 @@ def renderArgsAndFields(responseArgStr, variablesObj, curOperation, definition,
 					responseArgStr += indent + "	}\n"
 			responseArgStr += indent + "}\n"
 		responseArgStr += "\n"
-	return responseArgStr
+		return responseArgStr
+
+def createRawBinaryRequest(args, configuration):
+	"""Handle multipart/form-data requests for file uploads and binary content"""
+	params = vars(args)
+	
+	
+	# Parse the JSON body
+	try:
+		body = json.loads(params["json"])
+	except ValueError as e:
+		print("ERROR: JSON argument must be valid json. ", e)
+		return
+	except Exception as e:
+		print("ERROR: ", e)
+		return
+	
+	# Build form data
+	form_fields = {}
+	files = []
+	
+	# Add the operations field containing the GraphQL payload
+	form_fields['operations'] = json.dumps(body)
+	
+	# Handle file mappings if files are specified
+	if hasattr(args, 'files') and args.files:
+		# Build the map object for file uploads
+		file_map = {}
+		for i, (field_name, file_path) in enumerate(args.files):
+			file_index = str(i + 1)
+			file_map[file_index] = [field_name]
+			
+			# Read file content
+			try:
+				with open(file_path, 'rb') as f:
+					file_content = f.read()
+				files.append((file_index, (os.path.basename(file_path), file_content, 'application/octet-stream')))
+			except IOError as e:
+				print(f"ERROR: Could not read file {file_path}: {e}")
+				return
+				
+		# Add the map field
+		form_fields['map'] = json.dumps(file_map)
+	
+	# Test mode - just print the request structure
+	if params.get("t") == True:
+		print("Multipart form data request:")
+		if params.get("p") == True:
+			print(f"Operations: {json.dumps(json.loads(form_fields.get('operations')), indent=2)}")
+		else:
+			print(f"Operations: {form_fields.get('operations')}")
+		if 'map' in form_fields:
+			print(f"Map: {form_fields.get('map')}")
+		if files:
+			print(f"Files: {[f[0] + ': ' + f[1][0] for f in files]}")
+		return None
+	
+	# Perform the multipart request
+	try:
+		return sendMultipartRequest(configuration, form_fields, files, params)
+	except Exception as e:
+		# Safely handle exception string conversion
+		try:
+			error_str = str(e)
+		except Exception:
+			error_str = f"Exception of type {type(e).__name__}"
+		
+		if params.get("v") == True:
+			import traceback
+			print(f"ERROR: Failed to send multipart request: {error_str}")
+			traceback.print_exc()
+		else:
+			print(f"ERROR: Failed to send multipart request: {error_str}")
+		return None
+
+def sendMultipartRequest(configuration, form_fields, files, params):
+	"""Send a multipart/form-data request directly using urllib3"""
+	import urllib3
+	
+	# Create pool manager
+	pool_manager = urllib3.PoolManager(
+		cert_reqs='CERT_NONE' if not getattr(configuration, 'verify_ssl', False) else 'CERT_REQUIRED'
+	)
+	
+	# Prepare form data
+	fields = []
+	for key, value in form_fields.items():
+		fields.append((key, value))
+	
+	for file_key, (filename, content, content_type) in files:
+		fields.append((file_key, (filename, content, content_type)))
+	
+	# Encode multipart data
+	body_data, content_type = encode_multipart_formdata(fields)
+	
+	# Prepare headers
+	headers = {
+		'Content-Type': content_type,
+		'User-Agent': f"Cato-CLI-v{getattr(configuration, 'version', 'unknown')}"
+	}
+	
+	# Add API key if not using headers file
+	if hasattr(configuration, 'api_key') and hasattr(configuration, 'api_key') and configuration.api_key and 'x-api-key' in configuration.api_key:
+		headers['x-api-key'] = configuration.api_key['x-api-key']
+	
+	# Add custom headers
+	if hasattr(configuration, 'custom_headers') and configuration.custom_headers:
+		headers.update(configuration.custom_headers)
+	
+	# Verbose output
+	if params.get("v") == True:
+		print(f"Host: {getattr(configuration, 'host', 'unknown')}")
+		masked_headers = headers.copy()
+		if 'x-api-key' in masked_headers:
+			masked_headers['x-api-key'] = '***MASKED***'
+		print(f"Request Headers: {json.dumps(masked_headers, indent=4, sort_keys=True)}")
+		print(f"Content-Type: {content_type}")
+		print(f"Form fields: {list(form_fields.keys())}")
+		print(f"Files: {[f[0] for f in files]}\n")
+	
+	try:
+		# Make the request
+		resp = pool_manager.request(
+			'POST',
+			getattr(configuration, 'host', 'https://api.catonetworks.com/api/v1/graphql'),
+			body=body_data,
+			headers=headers
+		)
+		
+		# Parse response
+		if resp.status < 200 or resp.status >= 300:
+			reason = resp.reason if resp.reason is not None else "Unknown Error"
+			error_msg = f"HTTP {resp.status}: {reason}"
+			if resp.data:
+				try:
+					error_msg += f"\n{resp.data.decode('utf-8')}"
+				except Exception:
+					error_msg += f"\n{resp.data}"
+			print(f"ERROR: {error_msg}")
+			return None
+		
+		try:
+			response_data = json.loads(resp.data.decode('utf-8'))
+		except json.JSONDecodeError:
+			response_data = resp.data.decode('utf-8')
+		
+		return [response_data]
+		
+	except Exception as e:
+		# Safely handle exception string conversion
+		try:
+			error_str = str(e)
+		except Exception:
+			error_str = f"Exception of type {type(e).__name__}"
+		print(f"ERROR: Network/request error: {error_str}")
+		return None

catocli/parsers/query_accountBySubdomain/__init__.py

@@ -6,9 +6,9 @@ def query_accountBySubdomain_parse(query_subparsers):
 			help='accountBySubdomain() query operation', 
 			usage=get_help("query_accountBySubdomain"))
 
-	query_accountBySubdomain_parser.add_argument('json', help='Variables in JSON format.')
+	query_accountBySubdomain_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_accountBySubdomain_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_accountBySubdomain_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_accountBySubdomain_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_accountBySubdomain_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_accountBySubdomain_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_accountBySubdomain_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_accountManagement/__init__.py

@@ -6,9 +6,9 @@ def query_accountManagement_parse(query_subparsers):
 			help='accountManagement() query operation', 
 			usage=get_help("query_accountManagement"))
 
-	query_accountManagement_parser.add_argument('json', help='Variables in JSON format.')
+	query_accountManagement_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_accountManagement_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_accountManagement_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_accountManagement_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_accountManagement_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_accountManagement_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_accountManagement_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_accountMetrics/__init__.py

@@ -6,9 +6,9 @@ def query_accountMetrics_parse(query_subparsers):
 			help='accountMetrics() query operation', 
 			usage=get_help("query_accountMetrics"))
 
-	query_accountMetrics_parser.add_argument('json', help='Variables in JSON format.')
+	query_accountMetrics_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_accountMetrics_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_accountMetrics_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_accountMetrics_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_accountMetrics_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_accountMetrics_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_accountMetrics_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_accountRoles/__init__.py

@@ -6,9 +6,9 @@ def query_accountRoles_parse(query_subparsers):
 			help='accountRoles() query operation', 
 			usage=get_help("query_accountRoles"))
 
-	query_accountRoles_parser.add_argument('json', help='Variables in JSON format.')
+	query_accountRoles_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_accountRoles_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_accountRoles_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_accountRoles_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_accountRoles_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_accountRoles_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_accountRoles_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_accountSnapshot/__init__.py

@@ -6,9 +6,9 @@ def query_accountSnapshot_parse(query_subparsers):
 			help='accountSnapshot() query operation', 
 			usage=get_help("query_accountSnapshot"))
 
-	query_accountSnapshot_parser.add_argument('json', help='Variables in JSON format.')
+	query_accountSnapshot_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_accountSnapshot_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_accountSnapshot_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_accountSnapshot_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_accountSnapshot_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_accountSnapshot_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_accountSnapshot_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_admin/__init__.py

@@ -6,9 +6,9 @@ def query_admin_parse(query_subparsers):
 			help='admin() query operation', 
 			usage=get_help("query_admin"))
 
-	query_admin_parser.add_argument('json', help='Variables in JSON format.')
+	query_admin_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_admin_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_admin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_admin_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_admin_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_admin_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_admin_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_admins/__init__.py

@@ -6,9 +6,9 @@ def query_admins_parse(query_subparsers):
 			help='admins() query operation', 
 			usage=get_help("query_admins"))
 
-	query_admins_parser.add_argument('json', help='Variables in JSON format.')
+	query_admins_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_admins_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_admins_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_admins_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_admins_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_admins_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_admins_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_appStats/__init__.py

@@ -6,9 +6,9 @@ def query_appStats_parse(query_subparsers):
 			help='appStats() query operation', 
 			usage=get_help("query_appStats"))
 
-	query_appStats_parser.add_argument('json', help='Variables in JSON format.')
+	query_appStats_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_appStats_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_appStats_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_appStats_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_appStats_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_appStats_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_appStats_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_appStatsTimeSeries/__init__.py

@@ -6,9 +6,9 @@ def query_appStatsTimeSeries_parse(query_subparsers):
 			help='appStatsTimeSeries() query operation', 
 			usage=get_help("query_appStatsTimeSeries"))
 
-	query_appStatsTimeSeries_parser.add_argument('json', help='Variables in JSON format.')
+	query_appStatsTimeSeries_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_appStatsTimeSeries_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_appStatsTimeSeries_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_appStatsTimeSeries_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_appStatsTimeSeries_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_appStatsTimeSeries_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_appStatsTimeSeries_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_auditFeed/__init__.py

@@ -6,9 +6,9 @@ def query_auditFeed_parse(query_subparsers):
 			help='auditFeed() query operation', 
 			usage=get_help("query_auditFeed"))
 
-	query_auditFeed_parser.add_argument('json', help='Variables in JSON format.')
+	query_auditFeed_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_auditFeed_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_auditFeed_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_auditFeed_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_auditFeed_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_auditFeed_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_auditFeed_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_catalogs/__init__.py

@@ -6,9 +6,9 @@ def query_catalogs_parse(query_subparsers):
 			help='catalogs() query operation', 
 			usage=get_help("query_catalogs"))
 
-	query_catalogs_parser.add_argument('json', help='Variables in JSON format.')
+	query_catalogs_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_catalogs_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_catalogs_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_catalogs_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_catalogs_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_catalogs_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_catalogs_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_container/__init__.py

@@ -6,9 +6,9 @@ def query_container_parse(query_subparsers):
 			help='container() query operation', 
 			usage=get_help("query_container"))
 
-	query_container_parser.add_argument('json', help='Variables in JSON format.')
+	query_container_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_container_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_container_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_container_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_container_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_container_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_container_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_devices/__init__.py

@@ -6,9 +6,9 @@ def query_devices_parse(query_subparsers):
 			help='devices() query operation', 
 			usage=get_help("query_devices"))
 
-	query_devices_parser.add_argument('json', help='Variables in JSON format.')
+	query_devices_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_devices_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_devices_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_devices_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_devices_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_devices_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_devices_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_entityLookup/__init__.py

@@ -6,9 +6,9 @@ def query_entityLookup_parse(query_subparsers):
 			help='entityLookup() query operation', 
 			usage=get_help("query_entityLookup"))
 
-	query_entityLookup_parser.add_argument('json', help='Variables in JSON format.')
+	query_entityLookup_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_entityLookup_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_entityLookup_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_entityLookup_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_entityLookup_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_entityLookup_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_entityLookup_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_events/__init__.py

@@ -6,9 +6,9 @@ def query_events_parse(query_subparsers):
 			help='events() query operation', 
 			usage=get_help("query_events"))
 
-	query_events_parser.add_argument('json', help='Variables in JSON format.')
+	query_events_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_events_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_events_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_events_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_events_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_events_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_events_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_eventsFeed/__init__.py

@@ -6,9 +6,9 @@ def query_eventsFeed_parse(query_subparsers):
 			help='eventsFeed() query operation', 
 			usage=get_help("query_eventsFeed"))
 
-	query_eventsFeed_parser.add_argument('json', help='Variables in JSON format.')
+	query_eventsFeed_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_eventsFeed_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_eventsFeed_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_eventsFeed_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_eventsFeed_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_eventsFeed_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_eventsFeed_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_eventsTimeSeries/__init__.py

@@ -6,9 +6,9 @@ def query_eventsTimeSeries_parse(query_subparsers):
 			help='eventsTimeSeries() query operation', 
 			usage=get_help("query_eventsTimeSeries"))
 
-	query_eventsTimeSeries_parser.add_argument('json', help='Variables in JSON format.')
+	query_eventsTimeSeries_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_eventsTimeSeries_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_eventsTimeSeries_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_eventsTimeSeries_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_eventsTimeSeries_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_eventsTimeSeries_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_eventsTimeSeries_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_hardware/__init__.py

@@ -6,9 +6,9 @@ def query_hardware_parse(query_subparsers):
 			help='hardware() query operation', 
 			usage=get_help("query_hardware"))
 
-	query_hardware_parser.add_argument('json', help='Variables in JSON format.')
+	query_hardware_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_hardware_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_hardware_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_hardware_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_hardware_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_hardware_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_hardware_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_hardwareManagement/__init__.py

@@ -6,9 +6,9 @@ def query_hardwareManagement_parse(query_subparsers):
 			help='hardwareManagement() query operation', 
 			usage=get_help("query_hardwareManagement"))
 
-	query_hardwareManagement_parser.add_argument('json', help='Variables in JSON format.')
+	query_hardwareManagement_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_hardwareManagement_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_hardwareManagement_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_hardwareManagement_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_hardwareManagement_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_hardwareManagement_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_hardwareManagement_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_licensing/__init__.py

@@ -6,9 +6,9 @@ def query_licensing_parse(query_subparsers):
 			help='licensing() query operation', 
 			usage=get_help("query_licensing"))
 
-	query_licensing_parser.add_argument('json', help='Variables in JSON format.')
+	query_licensing_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_licensing_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_licensing_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_licensing_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_licensing_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_licensing_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_licensing_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_policy/__init__.py

@@ -6,9 +6,9 @@ def query_policy_parse(query_subparsers):
 			help='policy() query operation', 
 			usage=get_help("query_policy"))
 
-	query_policy_parser.add_argument('json', help='Variables in JSON format.')
+	query_policy_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_policy_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_policy_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_policy_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_policy_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_policy_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_policy_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_sandbox/__init__.py

@@ -6,9 +6,9 @@ def query_sandbox_parse(query_subparsers):
 			help='sandbox() query operation', 
 			usage=get_help("query_sandbox"))
 
-	query_sandbox_parser.add_argument('json', help='Variables in JSON format.')
+	query_sandbox_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_sandbox_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_sandbox_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_sandbox_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_sandbox_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_sandbox_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_sandbox_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_site/__init__.py

@@ -6,9 +6,9 @@ def query_site_parse(query_subparsers):
 			help='site() query operation', 
 			usage=get_help("query_site"))
 
-	query_site_parser.add_argument('json', help='Variables in JSON format.')
+	query_site_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_site_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_site_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_site_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_site_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_site_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_site_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')

catocli/parsers/query_siteLocation/__init__.py

@@ -5,9 +5,9 @@ def query_siteLocation_parse(query_subparsers):
 	query_siteLocation_parser = query_subparsers.add_parser('siteLocation', 
 			help='siteLocation local cli query', 
 			usage=get_help("query_siteLocation"))
-	query_siteLocation_parser.add_argument('json', help='Variables in JSON format.')
+	query_siteLocation_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_siteLocation_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_siteLocation_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_siteLocation_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_siteLocation_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_siteLocation_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_siteLocation_parser.set_defaults(func=querySiteLocation,operation_name='query.siteLocation')

catocli/parsers/query_subDomains/__init__.py

@@ -6,9 +6,9 @@ def query_subDomains_parse(query_subparsers):
 			help='subDomains() query operation', 
 			usage=get_help("query_subDomains"))
 
-	query_subDomains_parser.add_argument('json', help='Variables in JSON format.')
+	query_subDomains_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	query_subDomains_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	query_subDomains_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print test request preview without sending api call')
+	query_subDomains_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
 	query_subDomains_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
 	query_subDomains_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
 	query_subDomains_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')