Fix the change in codeql messages and other bugfixes

Author: jacobmsft

Dockerfile

@@ -31,6 +31,7 @@ RUN apt-get update && \
         dos2unix \
     	gettext && \
         apt-get clean && \
+        rm -f /usr/bin/python /usr/bin/pip && \
         ln -s /usr/bin/python3.8 /usr/bin/python && \
         ln -s /usr/bin/pip3 /usr/bin/pip 
 

container/libs/codeql.py

@@ -40,7 +40,7 @@ def download_and_install_latest_codeql(self, github_version):
             download_url = f'https://github.com/github/codeql-cli-binaries/releases/download/{github_version.title}/codeql-win64.zip'
             download_path = f'{self.TEMP_DIR}/codeql_windows.zip'
         else:
-            exit(ERROR_UNKNOWN_OS)
+            exit(self.ERROR_UNKNOWN_OS)
 
         logger.info(f'Downloading codeql-cli version {github_version.title}...')
         check_output_wrapper(f"wget -q {download_url} -O {download_path}", shell=True).decode("utf-8")
@@ -61,17 +61,17 @@ def download_and_install_latest_codeql_queries(self):
         ret2 = check_output_wrapper(f'git clone {self.CODEQL_GO_QUERIES_URL} {codeql_go_repo_dir}', shell=True)
         if ret1 is CalledProcessError or ret2 is CalledProcessError:
             logger.error("Could not run git command")
-            exit(ERROR_GIT_COMMAND)
+            exit(self.ERROR_GIT_COMMAND)
 
     def get_current_local_version(self):
         ret_string = check_output_wrapper(f'{self.CODEQL_HOME}/codeql/codeql version', shell=True).decode("utf-8")
         if ret_string is CalledProcessError:
             logger.error("Could not run codeql command")
-            exit(ERROR_EXECUTING_CODEQL)
-        version_match = search("Version: ([0-9.]+)\.", ret_string)
+            exit(self.ERROR_EXECUTING_CODEQL)
+        version_match = search("toolchain release ([0-9.]+)\.", ret_string)
         if not version_match:
             logger.error("Could not determine existing codeql version")
-            exit(ERROR_EXECUTING_CODEQL)
+            exit(self.ERROR_EXECUTING_CODEQL)
         version = f'v{version_match.group(1)}'
         return version
 
@@ -80,7 +80,7 @@ def get_latest_codeql_github_version(self):
 
     def install_codeql_cli(self, download_path):
         logger.info("Installing codeql-cli...")
-        codeql_dir = f'{self.CODEQL_HOME}/codeql-cli'
+        codeql_dir = f'{self.CODEQL_HOME}/codeql'
         wipe_and_create_dir(codeql_dir)
         ret1 = check_output_wrapper(f'unzip {download_path} -d {codeql_dir}', shell=True)
 
@@ -91,5 +91,5 @@ def execute_codeql_command(self, args):
         ret_string = check_output_wrapper(f'{self.CODEQL_HOME}/codeql/codeql {args}', shell=True)
         if ret_string is CalledProcessError:
             logger.error("Could not run codeql command")
-            exit(ERROR_EXECUTING_CODEQL)
+            exit(self.ERROR_EXECUTING_CODEQL)
         return bytearray(ret_string).decode('utf-8')

container/libs/utils.py

@@ -40,7 +40,7 @@ def check_output_wrapper(*args, **kwargs):
         sys.exit(ERROR_EXECUTING_COMMAND);
 
 def wipe_and_create_dir(dirname):
-    rmtree(dirname)
+    rmtree(dirname, True)
     mkdir(dirname)
 
 def get_logger(log_level=INFO):