catocli 2.0.1__py3-none-any.whl → 2.0.3__py3-none-any.whl

catocli/parsers/mutation_sites_addSocketAddOnCard/README.md

@@ -0,0 +1,17 @@
+
+## CATO-CLI - mutation.sites.addSocketAddOnCard:
+[Click here](https://api.catonetworks.com/documentation/#mutation-addSocketAddOnCard) for documentation on this operation.
+
+### Usage for mutation.sites.addSocketAddOnCard:
+
+`catocli mutation sites addSocketAddOnCard -h`
+
+`catocli mutation sites addSocketAddOnCard <json>`
+
+`catocli mutation sites addSocketAddOnCard "$(cat < addSocketAddOnCard.json)"`
+
+`catocli mutation sites addSocketAddOnCard '{"addSocketAddOnCardInput": {"siteRefInput": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "socketAddOnCardInput": {"expansionSlotNumber": {"expansionSlotNumber": "enum(SocketAddOnExpansionSlotNumber)"}, "type": {"type": "enum(SocketAddOnType)"}}}}'`
+
+#### Operation Arguments for mutation.sites.addSocketAddOnCard ####
+`accountId` [ID] - (required) N/A 
+`addSocketAddOnCardInput` [AddSocketAddOnCardInput] - (required) N/A 

catocli/parsers/mutation_sites_removeSocketAddOnCard/README.md

@@ -0,0 +1,17 @@
+
+## CATO-CLI - mutation.sites.removeSocketAddOnCard:
+[Click here](https://api.catonetworks.com/documentation/#mutation-removeSocketAddOnCard) for documentation on this operation.
+
+### Usage for mutation.sites.removeSocketAddOnCard:
+
+`catocli mutation sites removeSocketAddOnCard -h`
+
+`catocli mutation sites removeSocketAddOnCard <json>`
+
+`catocli mutation sites removeSocketAddOnCard "$(cat < removeSocketAddOnCard.json)"`
+
+`catocli mutation sites removeSocketAddOnCard '{"removeSocketAddOnCardInput": {"expansionSlotNumbers": {"expansionSlotNumbers": "enum(SocketAddOnExpansionSlotNumber)"}, "siteRefInput": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}}'`
+
+#### Operation Arguments for mutation.sites.removeSocketAddOnCard ####
+`accountId` [ID] - (required) N/A 
+`removeSocketAddOnCardInput` [RemoveSocketAddOnCardInput] - (required) N/A 

catocli/parsers/mutation_sites_startSiteUpgrade/README.md

@@ -0,0 +1,17 @@
+
+## CATO-CLI - mutation.sites.startSiteUpgrade:
+[Click here](https://api.catonetworks.com/documentation/#mutation-startSiteUpgrade) for documentation on this operation.
+
+### Usage for mutation.sites.startSiteUpgrade:
+
+`catocli mutation sites startSiteUpgrade -h`
+
+`catocli mutation sites startSiteUpgrade <json>`
+
+`catocli mutation sites startSiteUpgrade "$(cat < startSiteUpgrade.json)"`
+
+`catocli mutation sites startSiteUpgrade '{"startSiteUpgradeInput": {"siteUpgradeRequest": {"site": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "targetVersion": {"targetVersion": "String"}}}}'`
+
+#### Operation Arguments for mutation.sites.startSiteUpgrade ####
+`accountId` [ID] - (required) N/A 
+`startSiteUpgradeInput` [StartSiteUpgradeInput] - (required) N/A 

catocli/parsers/mutation_xdr/__init__.py

@@ -12,40 +12,37 @@ def mutation_xdr_parse(mutation_subparsers):
 			help='addStoryComment() xdr operation', 
 			usage=get_help("mutation_xdr_addStoryComment"))
 
-	mutation_xdr_addStoryComment_parser.add_argument('json', help='Variables in JSON format.')
+	mutation_xdr_addStoryComment_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	mutation_xdr_addStoryComment_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_xdr_addStoryComment_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_xdr_addStoryComment_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_xdr_addStoryComment_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_xdr_addStoryComment_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+	mutation_xdr_addStoryComment_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_xdr_addStoryComment_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_xdr_addStoryComment_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_xdr_addStoryComment_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_xdr_addStoryComment_parser.set_defaults(func=createRequest,operation_name='mutation.xdr.addStoryComment')
 
 	mutation_xdr_analystFeedback_parser = mutation_xdr_subparsers.add_parser('analystFeedback', 
 			help='analystFeedback() xdr operation', 
 			usage=get_help("mutation_xdr_analystFeedback"))
 
-	mutation_xdr_analystFeedback_parser.add_argument('json', help='Variables in JSON format.')
+	mutation_xdr_analystFeedback_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	mutation_xdr_analystFeedback_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_xdr_analystFeedback_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_xdr_analystFeedback_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_xdr_analystFeedback_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_xdr_analystFeedback_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+	mutation_xdr_analystFeedback_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_xdr_analystFeedback_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_xdr_analystFeedback_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_xdr_analystFeedback_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_xdr_analystFeedback_parser.set_defaults(func=createRequest,operation_name='mutation.xdr.analystFeedback')
 
 	mutation_xdr_deleteStoryComment_parser = mutation_xdr_subparsers.add_parser('deleteStoryComment', 
 			help='deleteStoryComment() xdr operation', 
 			usage=get_help("mutation_xdr_deleteStoryComment"))
 
-	mutation_xdr_deleteStoryComment_parser.add_argument('json', help='Variables in JSON format.')
+	mutation_xdr_deleteStoryComment_parser.add_argument('json', nargs='?', default='{}', help='Variables in JSON format (defaults to empty object if not provided).')
 	mutation_xdr_deleteStoryComment_parser.add_argument('-accountID', help='Override the CATO_ACCOUNT_ID environment variable with this value.')
-	mutation_xdr_deleteStoryComment_parser.add_argument('-t', const=True, default=False, nargs='?', 
-		help='Print test request preview without sending api call')
-	mutation_xdr_deleteStoryComment_parser.add_argument('-v', const=True, default=False, nargs='?', 
-		help='Verbose output')
-	mutation_xdr_deleteStoryComment_parser.add_argument('-p', const=True, default=False, nargs='?', 
-		help='Pretty print')
+	mutation_xdr_deleteStoryComment_parser.add_argument('-t', const=True, default=False, nargs='?', help='Print GraphQL query without sending API call')
+	mutation_xdr_deleteStoryComment_parser.add_argument('-v', const=True, default=False, nargs='?', help='Verbose output')
+	mutation_xdr_deleteStoryComment_parser.add_argument('-p', const=True, default=False, nargs='?', help='Pretty print')
+	mutation_xdr_deleteStoryComment_parser.add_argument('-H', '--header', action='append', dest='headers', help='Add custom headers in "Key: Value" format. Can be used multiple times.')
+	mutation_xdr_deleteStoryComment_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_xdr_deleteStoryComment_parser.set_defaults(func=createRequest,operation_name='mutation.xdr.deleteStoryComment')

catocli/parsers/parserApiClient.py

@@ -12,23 +12,38 @@ def createRequest(args, configuration):
 	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 +52,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 +131,9 @@ 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
 	instance = CallApi(ApiClient(configuration))
 	isOk = False
 	try:
@@ -189,6 +213,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:

catocli/parsers/query_accountBySubdomain/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_accountBySubdomain_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_accountBySubdomain_parser.set_defaults(func=createRequest,operation_name='query.accountBySubdomain')

catocli/parsers/query_accountManagement/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_accountManagement_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_accountManagement_parser.set_defaults(func=createRequest,operation_name='query.accountManagement')

catocli/parsers/query_accountMetrics/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_accountMetrics_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_accountMetrics_parser.set_defaults(func=createRequest,operation_name='query.accountMetrics')

catocli/parsers/query_accountRoles/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_accountRoles_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_accountRoles_parser.set_defaults(func=createRequest,operation_name='query.accountRoles')

catocli/parsers/query_accountSnapshot/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_accountSnapshot_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_accountSnapshot_parser.set_defaults(func=createRequest,operation_name='query.accountSnapshot')

catocli/parsers/query_admin/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_admin_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_admin_parser.set_defaults(func=createRequest,operation_name='query.admin')

catocli/parsers/query_admins/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_admins_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_admins_parser.set_defaults(func=createRequest,operation_name='query.admins')

catocli/parsers/query_appStats/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_appStats_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_appStats_parser.set_defaults(func=createRequest,operation_name='query.appStats')

catocli/parsers/query_appStatsTimeSeries/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_appStatsTimeSeries_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_appStatsTimeSeries_parser.set_defaults(func=createRequest,operation_name='query.appStatsTimeSeries')

catocli/parsers/query_auditFeed/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_auditFeed_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_auditFeed_parser.set_defaults(func=createRequest,operation_name='query.auditFeed')

catocli/parsers/query_catalogs/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_catalogs_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_catalogs_parser.set_defaults(func=createRequest,operation_name='query.catalogs')

catocli/parsers/query_container/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_container_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_container_parser.set_defaults(func=createRequest,operation_name='query.container')

catocli/parsers/query_devices/README.md

@@ -10,10 +10,11 @@
 
 `catocli query devices "$(cat < devices.json)"`
 
-`catocli query devices '{"deviceAttributeCatalogInput": {"pagingInput": {"from": {"from": "Int"}, "limit": {"limit": "Int"}}, "sortOrderInput": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "stringFilterInput": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "deviceV2Input": {"deviceSortInput": {"category": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "confidence": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "firstSeen": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "hw": {"manufacturer": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "model": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "type": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "id": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "ip": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "lastSeen": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "network": {"networkName": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "subnet": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "nic": {"macAddress": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "vendor": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "os": {"product": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "vendor": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "version": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "riskScore": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "site": {"id": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "user": {"id": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}}, "deviceV2FilterInput": {"category": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "confidence": {"eq": {"eq": "enum(DeviceConfidenceLevel)"}, "in": {"in": "enum(DeviceConfidenceLevel)"}, "neq": {"neq": "enum(DeviceConfidenceLevel)"}, "nin": {"nin": "enum(DeviceConfidenceLevel)"}}, "firstSeen": {"between": {"between": ["DateTime"]}, "eq": {"eq": "DateTime"}, "gt": {"gt": "DateTime"}, "gte": {"gte": "DateTime"}, "in": {"in": ["DateTime"]}, "lt": {"lt": "DateTime"}, "lte": {"lte": "DateTime"}, "neq": {"neq": "DateTime"}, "nin": {"nin": ["DateTime"]}}, "hw": {"manufacturer": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "model": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "type": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "id": {"eq": {"eq": "ID"}, "in": {"in": ["ID"]}, "neq": {"neq": "ID"}, "nin": {"nin": ["ID"]}}, "ip": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "lastSeen": {"between": {"between": ["DateTime"]}, "eq": {"eq": "DateTime"}, "gt": {"gt": "DateTime"}, "gte": {"gte": "DateTime"}, "in": {"in": ["DateTime"]}, "lt": {"lt": "DateTime"}, "lte": {"lte": "DateTime"}, "neq": {"neq": "DateTime"}, "nin": {"nin": ["DateTime"]}}, "name": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "network": {"networkName": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "subnet": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "nic": {"macAddress": {"eq": {"eq": "MacAddress"}, "in": {"in": ["MacAddress"]}, "neq": {"neq": "MacAddress"}, "nin": {"nin": ["MacAddress"]}}, "vendor": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "os": {"product": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "vendor": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "version": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "riskScore": {"between": {"between": ["Int"]}, "eq": {"eq": "Int"}, "gt": {"gt": "Int"}, "gte": {"gte": "Int"}, "in": {"in": ["Int"]}, "lt": {"lt": "Int"}, "lte": {"lte": "Int"}, "neq": {"neq": "Int"}, "nin": {"nin": ["Int"]}}, "site": {"eq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "in": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "neq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "nin": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}, "user": {"eq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "in": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "neq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "nin": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}}, "pagingInput": {"from": {"from": "Int"}, "limit": {"limit": "Int"}}}, "sortOrderInput": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}'`
+`catocli query devices '{"deviceAttributeCatalogInput": {"pagingInput": {"from": {"from": "Int"}, "limit": {"limit": "Int"}}, "sortOrderInput": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "stringFilterInput": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "deviceV2Input": {"deviceSortInput": {"category": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "confidence": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "firstSeen": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "hw": {"manufacturer": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "model": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "type": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "id": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "ip": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "lastSeen": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "network": {"networkName": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "subnet": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "nic": {"macAddress": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "vendor": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "os": {"product": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "vendor": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "version": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "riskScore": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "site": {"id": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}, "user": {"id": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}, "name": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}}, "deviceV2FilterInput": {"category": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "confidence": {"eq": {"eq": "enum(DeviceConfidenceLevel)"}, "in": {"in": "enum(DeviceConfidenceLevel)"}, "neq": {"neq": "enum(DeviceConfidenceLevel)"}, "nin": {"nin": "enum(DeviceConfidenceLevel)"}}, "firstSeen": {"between": {"between": ["DateTime"]}, "eq": {"eq": "DateTime"}, "gt": {"gt": "DateTime"}, "gte": {"gte": "DateTime"}, "in": {"in": ["DateTime"]}, "lt": {"lt": "DateTime"}, "lte": {"lte": "DateTime"}, "neq": {"neq": "DateTime"}, "nin": {"nin": ["DateTime"]}}, "hw": {"manufacturer": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "model": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "type": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "id": {"eq": {"eq": "ID"}, "in": {"in": ["ID"]}, "neq": {"neq": "ID"}, "nin": {"nin": ["ID"]}}, "ip": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "lastSeen": {"between": {"between": ["DateTime"]}, "eq": {"eq": "DateTime"}, "gt": {"gt": "DateTime"}, "gte": {"gte": "DateTime"}, "in": {"in": ["DateTime"]}, "lt": {"lt": "DateTime"}, "lte": {"lte": "DateTime"}, "neq": {"neq": "DateTime"}, "nin": {"nin": ["DateTime"]}}, "name": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "network": {"networkName": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "subnet": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "nic": {"macAddress": {"eq": {"eq": "MacAddress"}, "in": {"in": ["MacAddress"]}, "neq": {"neq": "MacAddress"}, "nin": {"nin": ["MacAddress"]}}, "vendor": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "os": {"product": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "vendor": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}, "version": {"eq": {"eq": "String"}, "in": {"in": ["String"]}, "neq": {"neq": "String"}, "nin": {"nin": ["String"]}}}, "riskScore": {"between": {"between": ["Int"]}, "eq": {"eq": "Int"}, "gt": {"gt": "Int"}, "gte": {"gte": "Int"}, "in": {"in": ["Int"]}, "lt": {"lt": "Int"}, "lte": {"lte": "Int"}, "neq": {"neq": "Int"}, "nin": {"nin": ["Int"]}}, "site": {"eq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "in": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "neq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "nin": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}, "user": {"eq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "in": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "neq": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}, "nin": {"by": {"by": "enum(ObjectRefBy)"}, "input": {"input": "String"}}}}, "pagingInput": {"from": {"from": "Int"}, "limit": {"limit": "Int"}}}, "jobId": "ID", "sortOrderInput": {"direction": {"direction": "enum(SortOrder)"}, "priority": {"priority": "Int"}}}'`
 
 #### Operation Arguments for query.devices ####
 `accountId` [ID] - (required) N/A 
 `deviceAttributeCatalogInput` [DeviceAttributeCatalogInput] - (optional) N/A 
 `deviceV2Input` [DeviceV2Input] - (optional) N/A 
+`jobId` [ID] - (required) N/A 
 `sortOrderInput` [SortOrderInput] - (optional) N/A 

catocli/parsers/query_devices/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_devices_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_devices_parser.set_defaults(func=createRequest,operation_name='query.devices')

catocli/parsers/query_entityLookup/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_entityLookup_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_entityLookup_parser.set_defaults(func=createRequest,operation_name='query.entityLookup')

catocli/parsers/query_events/__init__.py

@@ -6,12 +6,11 @@ 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('-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('-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.')
+	query_events_parser.add_argument('--headers-file', dest='headers_file', help='Load headers from a file. Each line should contain a header in "Key: Value" format.')
 	query_events_parser.set_defaults(func=createRequest,operation_name='query.events')