Rework missing principle checks

Author: gregwood-db

dbclient/WorkspaceClient.py

@@ -665,10 +665,10 @@ def apply_acl_on_object(self, acl_str, error_logger, checkpoint_key_set):
                 api_args = {'access_control_list': access_control_list}
                 resp = self.patch(api_path, api_args)
 
+                # if skipping non-existing users, add error code to allowlist
+                ignore_error_list = wmconstants.IGNORE_ERROR_LIST
                 if self.skip_missing_users:
-                    ignore_error_list = ["RESOURCE_DOES_NOT_EXIST", "RESOURCE_ALREADY_EXISTS"]
-                else:
-                    ignore_error_list = ["RESOURCE_ALREADY_EXISTS"]
+                    ignore_error_list.append("RESOURCE_DOES_NOT_EXIST")
 
                 if logging_utils.check_error(resp, ignore_error_list):
                     logging_utils.log_response_error(error_logger, resp)

logging_utils.py

@@ -2,6 +2,7 @@
 import json
 import os
 import re
+import wmconstants
 
 
 def set_default_logging(parent_dir, level=logging.INFO):
@@ -39,18 +40,17 @@ def get_error_log_file(action_type, object_type, parent_dir):
 def _get_log_dir(parent_dir):
     return parent_dir + "/app_logs"
 
-default_ignore_error_list=[
-    'RESOURCE_ALREADY_EXISTS'
-]
-
 
 def log_response_error(error_logger,
-                      response,
-                      error_msg=None,
-                      ignore_error_list=default_ignore_error_list):
+                       response,
+                       error_msg=None,
+                       ignore_error_list=None):
     """
     Logs errors based on the response. Usually used when the response is the http response.
     """
+    if ignore_error_list is None:
+        ignore_error_list = wmconstants.IGNORE_ERROR_LIST
+
     if check_error(response, ignore_error_list):
         if error_msg:
             error_logger.error(error_msg)
@@ -61,10 +61,14 @@ def log_response_error(error_logger,
         return False
 
 
-def check_error(response, ignore_error_list=default_ignore_error_list):
+def check_error(response, ignore_error_list=None):
+    if ignore_error_list is None:
+        ignore_error_list = wmconstants.IGNORE_ERROR_LIST
+
     if type(response) is list:
         for resp in response:
-            if (_check_error_helper(resp, ignore_error_list)): return True
+            if _check_error_helper(resp, ignore_error_list):
+                return True
         return False
     else:
         return _check_error_helper(response, ignore_error_list)
@@ -75,11 +79,6 @@ def _check_error_helper(response, ignore_error_list):
     if re.match("Cluster .*? is in unexpected state (Running|Pending)\\.", response.get("message", "")):
         return False
 
-    # suppress principal error; this should be surfaced from the client level
-    if re.match("Principal: .*? does not exist", response.get("message", "")) \
-            and (response.get("error_code") == "RESOURCE_DOES_NOT_EXIST"):
-        return False
-
     return ('error_code' in response and response['error_code'] not in ignore_error_list) \
             or ('error' in response and response['error'] not in ignore_error_list) \
             or (response.get('resultType', None) == 'error' and 'already exists' not in response.get('summary', None))

wmconstants.py

@@ -19,8 +19,10 @@
 MLFLOW_EXPERIMENT_OBJECT = "mlflow_experiments"
 MLFLOW_EXPERIMENT_PERMISSION_OBJECT = "mlflow_experiments_permissions"
 MLFLOW_RUN_OBJECT = "mlflow_runs"
+
 # Migration pipeline placeholder constants
 MIGRATION_PIPELINE_OBJECT_TYPE = "tasks"
+IGNORE_ERROR_LIST = ['RESOURCE_ALREADY_EXISTS', 'FEATURE_DISABLED']
 
 # Actions
 WM_EXPORT = "export"