Update appengine imports for external_testcase_reader. (drive by add additional component filter for extra safety)

Author: pgrace-google

src/clusterfuzz/_internal/cron/external_testcase_reader.py

@@ -21,7 +21,7 @@
 
 from appengine.libs import form
 from appengine.libs import gcs
-from appengine.libs import helpers
+from clusterfuzz._internal.metrics import logs
 from clusterfuzz._internal.config import local_config
 from clusterfuzz._internal.issue_management.google_issue_tracker import \
     issue_tracker
@@ -158,18 +158,18 @@ def handle_testcases(tracker, config):
   # Handle bugs that were already submitted and still open.
   older_issues = tracker.find_issues_with_filters(
       keywords=[],
-      query_filters=['componentid:1600865', 'status:accepted'],
+      query_filters=['componentid:1600865', 'componentid:1457062+', 'status:accepted'],
       only_open=True)
   for issue in older_issues:
     # Close out older bugs that may have failed to reproduce.
     if close_issue_if_not_reproducible(issue, config):
-      helpers.log('Closing issue {issue_id} as it failed to reproduce',
+      logs.info('Closing issue {issue_id} as it failed to reproduce',
                   issue.id)
 
   # Handle new bugs that may need to be submitted.
   issues = tracker.find_issues_with_filters(
       keywords=[],
-      query_filters=['componentid:1600865', 'status:new'],
+      query_filters=['componentid:1600865', 'componentid:1457062+', 'status:new'],
       only_open=True)
   if len(issues) == 0:
     return
@@ -189,7 +189,7 @@ def handle_testcases(tracker, config):
     reporters_map[issue.reporter] = reporters_map.get(issue.reporter, 1) + 1
     if close_issue_if_invalid(issue, attachment_metadata, commandline_flags,
                               vrp_uploaders):
-      helpers.log('Closing issue {issue_id} as it is invalid', issue.id)
+      logs.info('Closing issue {issue_id} as it is invalid', issue.id)
       continue
 
     # Submit valid testcases.
@@ -202,7 +202,7 @@ def handle_testcases(tracker, config):
     issue.status = ISSUETRACKER_ACCEPTED_STATE
     issue.assignee = '[email protected]'
     issue.save(new_comment=comment_message, notify=True)
-    helpers.log('Submitted testcase file for issue {issue_id}', issue.id)
+    logs.info('Submitted testcase file for issue {issue_id}', issue.id)
 
 
 def main():

src/python/bot/startup/run_cron.py

@@ -48,6 +48,11 @@ def main():
                                      'config', 'modules')
   if os.path.exists(config_modules_path):
     sys.path.append(config_modules_path)
+  
+  if (task == 'external_testcase_reader'):
+    appengine_path = os.path.join(root_directory, 'src', 'appengine')
+    if os.path.exists(appengine_path):
+      sys.path.append(appengine_path)
 
   try:
     # Run any module initialization code.