Improve caching and do some other minor improvements

Author: kkochanski

cli/cli_msg_printer.py

@@ -1,7 +1,7 @@
 import datetime
 import traceback
 from colors import Color
-from cli.cli_limits_formatter import CliLimitsFormatter
+from cli.formatter.cli_limits_formatter import CliLimitsFormatter
 
 
 class CliMsgPrinter:

cli/formatter/cli_json_formatter.py

@@ -0,0 +1,8 @@
+import json
+
+
+class CliJsonFormatter:
+
+ @staticmethod
+ def format_to_pretty_string(given_json):
+ return json.dumps(given_json, indent=4, sort_keys=True, ensure_ascii=False)

cli/cli_limits_formatter.py renamed to cli/formatter/cli_limits_formatter.py

@@ -2,10 +2,10 @@
 from exceptions import ResponseTextContentTypeError
 from colors import Color
 import os
-import json
 from cli.arguments_builders.default_cli_arguments import DefaultCliArguments
 import datetime
 from cli.cli_file_writer import CliFileWriter
+from cli.formatter.cli_json_formatter import CliJsonFormatter
 
 
 class CliCaller:
@@ -77,7 +77,7 @@ def get_result_msg(self):
  raise ResponseTextContentTypeError('Can\'t print result, since it\'s \'text/html\' instead of expected content type with \'{}\' on board.'.format(self.api_object.api_expected_data_type))
 
  if self.api_object.api_expected_data_type == ApiCaller.CONST_EXPECTED_DATA_TYPE_JSON:
- return self.result_msg_for_json.format(json.dumps(self.api_object.get_response_json(), indent=4, sort_keys=True, ensure_ascii=False))
+ return self.result_msg_for_json.format(CliJsonFormatter.format_to_pretty_string(self.api_object.get_response_json()))
  elif self.api_object.api_expected_data_type == ApiCaller.CONST_EXPECTED_DATA_TYPE_FILE:
  if self.api_object.if_request_success() is True:
  return self.get_result_msg_for_files()

cli/wrappers/cli_caller.py

@@ -1,6 +1,21 @@
 from cli.wrappers.cli_caller import CliCaller
+from cli.formatter.cli_json_formatter import CliJsonFormatter
 
 
 class CliScanState(CliCaller):
 
  help_description = 'Return list of available scanners by \'{}\''
+
+ def get_result_msg(self):
+ parent_result_msg = super(CliScanState, self).get_result_msg()
+
+ if self.api_object.if_request_success() is True and self.given_args['verbose'] is False:
+ current_json = self.api_object.get_response_json()
+ filtered_json = []
+ for scan in current_json:
+ if scan['available']:
+ filtered_json.append(scan)
+
+ return CliJsonFormatter.format_to_pretty_string(filtered_json)
+
+ return parent_result_msg

cli/wrappers/scan/cli_scan_state.py

@@ -16,7 +16,7 @@
  "url": "/quick-scan/state",
  "method": "get",
  "status_code": 200,
- "json": {"there": "is"},
+ "json": [{"available": False, 'name': 'cat'}, {"available": True, 'name': 'parrot'}, {"available": False, 'name': 'qwerty'}],
  "headers": {
  "content-type": "application/json",
  "webservice-version": "8.10",

tests/_requests_scenarios/scan/scan_state.py

@@ -1,8 +1,9 @@
 import os
 import json
 
-os.environ['APP_ENV'] = 'test'
-os.environ['TEST_CONFIG'] = json.dumps({
+os.environ['VX_APP_ENV'] = 'test'
+os.environ['VX_DISABLE_CACHING'] = '1'
+os.environ['VX_TEST_CONFIG'] = json.dumps({
  'api_key': '6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b',
  'server': 'mock://my-webservice-instance'
 })

tests/conftest.py

@@ -16,7 +16,7 @@ def get_action_name(self):
  return 'feed_get'
 
  def init_request_scenario(self):
- os.environ['TEST_SCENARIO'] = 'feed.feed'
+ os.environ['VX_TEST_SCENARIO'] = 'feed.feed'
 
  def test_base_query(self, run_command):
  self.init_request_scenario()

tests/feed/test_feed.py

@@ -16,7 +16,7 @@ def get_action_name(self):
  return 'feed_get_latest'
 
  def init_request_scenario(self):
- os.environ['TEST_SCENARIO'] = 'feed.feed_latest'
+ os.environ['VX_TEST_SCENARIO'] = 'feed.feed_latest'
 
  def test_base_query(self, run_command):
  self.init_request_scenario()

tests/feed/test_feed_latest.py

@@ -13,7 +13,7 @@ def get_action_name(self):
  return 'key_create'
 
  def init_request_scenario(self):
- os.environ['TEST_SCENARIO'] = 'key.key_create'
+ os.environ['VX_TEST_SCENARIO'] = 'key.key_create'
 
  def test_base_query(self, run_command):
  self.init_request_scenario()