Fix typo in function name

gregwood-db · gregwood-db · commit 5d180e5bd437 · 2022-12-12T10:03:09.000-05:00
diff --git a/dbclient/ClustersClient.py b/dbclient/ClustersClient.py
@@ -276,7 +276,7 @@ def import_cluster_configs(self, log_file='clusters.log', acl_log_file='acl_clus
                     if 'cluster_id' in cluster_conf:
                         checkpoint_cluster_configs_set.write(cluster_conf['cluster_id'])
                 else:
-                    logging_utils.log_reponse_error(error_logger, cluster_resp)
+                    logging_utils.log_response_error(error_logger, cluster_resp)
                     print(cluster_resp)
 
         # TODO: May be put it into a separate step to make it more rerunnable.
@@ -299,7 +299,7 @@ def import_cluster_configs(self, log_file='clusters.log', acl_log_file='acl_clus
                     raise ValueError(error_message)
                 api = f'/preview/permissions/clusters/{cid}'
                 resp = self.put(api, acl_args)
-                if not logging_utils.log_reponse_error(error_logger, resp):
+                if not logging_utils.log_response_error(error_logger, resp):
                     if 'object_id' in data:
                         checkpoint_cluster_configs_set.write(data['object_id'])
                 print(resp)
@@ -397,7 +397,7 @@ def import_cluster_policies(self, log_file='cluster_policies.log', acl_log_file=
                                    'definition': policy_conf['definition']}
                     resp = self.post('/policies/clusters/create', create_args)
                     ignore_error_list = ['INVALID_PARAMETER_VALUE']
-                    if not logging_utils.log_reponse_error(error_logger, resp, ignore_error_list=ignore_error_list):
+                    if not logging_utils.log_response_error(error_logger, resp, ignore_error_list=ignore_error_list):
                         if 'policy_id' in policy_conf:
                             checkpoint_cluster_policies_set.write(policy_conf['policy_id'])
 
@@ -412,7 +412,7 @@ def import_cluster_policies(self, log_file='cluster_policies.log', acl_log_file=
                     policy_id = id_map[p_acl['name']]
                     api = f'/permissions/cluster-policies/{policy_id}'
                     resp = self.put(api, acl_create_args)
-                    if not logging_utils.log_reponse_error(error_logger, resp):
+                    if not logging_utils.log_response_error(error_logger, resp):
                         if 'object_id' in p_acl:
                             checkpoint_cluster_policies_set.write(p_acl['object_id'])
         else:
@@ -430,7 +430,7 @@ def import_instance_pools(self, log_file='instance_pools.log'):
                 pool_conf = json.loads(line)
                 pool_resp = self.post('/instance-pools/create', pool_conf)
                 ignore_error_list = ['INVALID_PARAMETER_VALUE']
-                logging_utils.log_reponse_error(error_logger, pool_resp, ignore_error_list=ignore_error_list)
+                logging_utils.log_response_error(error_logger, pool_resp, ignore_error_list=ignore_error_list)
 
     def import_instance_profiles(self, log_file='instance_profiles.log'):
         # currently an AWS only operation
@@ -453,7 +453,7 @@ def import_instance_profiles(self, log_file='instance_profiles.log'):
                 if ip_arn not in list_of_profiles:
                     print("Importing arn: {0}".format(ip_arn))
                     resp = self.post('/instance-profiles/add', {'instance_profile_arn': ip_arn})
-                    if not logging_utils.log_reponse_error(error_logger, resp):
+                    if not logging_utils.log_response_error(error_logger, resp):
                         import_profiles_count += 1
                 else:
                     logging.info("Skipping since profile already exists: {0}".format(ip_arn))
diff --git a/dbclient/HiveClient.py b/dbclient/HiveClient.py
@@ -377,7 +377,7 @@ def import_hive_metastore(self, cluster_name=None, metastore_dir='metastore/', v
                 logging.info(all_db_details_json)
                 raise ValueError('Missing Database Attributes Log. Re-run metastore export')
             create_db_resp = self.create_database_db(db_name, ec_id, cid, database_attributes)
-            if logging_utils.log_reponse_error(error_logger, create_db_resp):
+            if logging_utils.log_response_error(error_logger, create_db_resp):
                 logging.error(f"Failed to create database {db_name} during metastore import. Exiting Import.")
                 return
             db_path = database_attributes.get('Location')
@@ -394,7 +394,7 @@ def import_hive_metastore(self, cluster_name=None, metastore_dir='metastore/', v
                         if not self.move_table_view(db_name, tbl_name, local_table_ddl):
                             # we hit a table ddl here, so we apply the ddl
                             resp = self.apply_table_ddl(local_table_ddl, ec_id, cid, db_path, has_unicode)
-                            if not logging_utils.log_reponse_error(error_logger, resp):
+                            if not logging_utils.log_response_error(error_logger, resp):
                                 checkpoint_metastore_set.write(full_table_name)
                         else:
                             logging.info(f'Moving view ddl to re-apply later: {db_name}.{tbl_name}')
@@ -414,7 +414,7 @@ def import_hive_metastore(self, cluster_name=None, metastore_dir='metastore/', v
                         logging.info(f"Importing view {full_view_name}")
                         local_view_ddl = metastore_view_dir + db_name + '/' + view_name
                         resp = self.apply_table_ddl(local_view_ddl, ec_id, cid, db_path, has_unicode)
-                        if logging_utils.log_reponse_error(error_logger, resp):
+                        if logging_utils.log_response_error(error_logger, resp):
                             checkpoint_metastore_set.write(full_view_name)
                         logging.info(resp)
 
@@ -428,7 +428,7 @@ def get_all_databases(self, error_logger, cid, ec_id):
         # DBR 7.0 changes databaseName to namespace for the return value of show databases
         all_dbs_cmd = 'all_dbs = [x.databaseName for x in spark.sql("show databases").collect()]; print(len(all_dbs))'
         results = self.submit_command(cid, ec_id, all_dbs_cmd)
-        if logging_utils.log_reponse_error(error_logger, results):
+        if logging_utils.log_response_error(error_logger, results):
             raise ValueError("Cannot identify number of databases due to the above error")
         num_of_dbs = ast.literal_eval(results['data'])
         batch_size = 100    # batch size to iterate over databases
@@ -510,12 +510,12 @@ def log_table_ddl(self, cid, ec_id, db_name, table_name, metastore_dir, error_lo
         if ddl_len > 2048 or has_unicode:
             # create the dbfs tmp path for exports / imports. no-op if exists
             resp = self.post('/dbfs/mkdirs', {'path': '/tmp/migration/'})
-            if logging_utils.log_reponse_error(error_logger, resp):
+            if logging_utils.log_response_error(error_logger, resp):
                 return False
             # save the ddl to the tmp path on dbfs
             save_ddl_cmd = "with open('/dbfs/tmp/migration/tmp_export_ddl.txt', 'w') as fp: fp.write(ddl_str)"
             save_resp = self.submit_command(cid, ec_id, save_ddl_cmd)
-            if logging_utils.log_reponse_error(error_logger, save_resp):
+            if logging_utils.log_response_error(error_logger, save_resp):
                 return False
             # read that data using the dbfs rest endpoint which can handle 2MB of text easily
             read_args = {'path': '/tmp/migration/tmp_export_ddl.txt'}
diff --git a/dbclient/JobsClient.py b/dbclient/JobsClient.py
@@ -73,7 +73,7 @@ def update_imported_job_names(self, error_logger, checkpoint_job_configs_set):
             update_args = {'job_id': job_id, 'new_settings': new_settings}
             logging.info(f'Updating job name: {update_args}')
             resp = self.post('/jobs/update', update_args)
-            if not logging_utils.log_reponse_error(error_logger, resp):
+            if not logging_utils.log_response_error(error_logger, resp):
                 checkpoint_job_configs_set.write(job_name)
             else:
                 raise RuntimeError("Import job has failed. Refer to the previous log messages to investigate.")
@@ -118,7 +118,7 @@ def log_job_configs(self, users_list=None, groups_list = None, log_file='jobs.lo
                 x['settings'] = job_settings
                 log_fp.write(json.dumps(x) + '\n')
                 job_perms = self.get(f'/preview/permissions/jobs/{job_id}')
-                if not logging_utils.log_reponse_error(error_logger, job_perms):
+                if not logging_utils.log_response_error(error_logger, job_perms):
                     job_perms['job_name'] = new_job_name
                     acl_fp.write(json.dumps(job_perms) + '\n')
 
@@ -188,7 +188,7 @@ def adjust_ids_for_cluster(settings): #job_settings or task_settings
                     logging.info("Resetting job to use default cluster configs due to expired configurations.")
                     job_settings['new_cluster'] = self.get_jobs_default_cluster_conf()
                     create_resp_retry = self.post('/jobs/create', job_settings)
-                    if not logging_utils.log_reponse_error(error_logger, create_resp_retry):
+                    if not logging_utils.log_response_error(error_logger, create_resp_retry):
                         if 'job_id' in job_conf:
                             checkpoint_job_configs_set.write(job_conf["job_id"])
                     else:
@@ -215,7 +215,7 @@ def adjust_ids_for_cluster(settings): #job_settings or task_settings
                 acl_perms = self.build_acl_args(acl_conf['access_control_list'], True)
                 acl_create_args = {'access_control_list': acl_perms}
                 acl_resp = self.patch(api, acl_create_args)
-                if not logging_utils.log_reponse_error(error_logger, acl_resp) and 'object_id' in acl_conf:
+                if not logging_utils.log_response_error(error_logger, acl_resp) and 'object_id' in acl_conf:
                     checkpoint_job_configs_set.write(acl_conf['object_id'])
                 else:
                     raise RuntimeError("Import job has failed. Refer to the previous log messages to investigate.")
diff --git a/dbclient/MLFlowClient.py b/dbclient/MLFlowClient.py
@@ -82,7 +82,7 @@ def _put_mlflow_experiment_acl(self, acl_str, experiment_id_map, checkpoint_key_
         new_experiment_id = experiment_id_map[experiment_id]
         acl_create_args = {'access_control_list': self.build_acl_args(acl_obj['access_control_list'], True)}
         resp = self.put(f'/permissions/experiments/{new_experiment_id}', acl_create_args)
-        if not logging_utils.log_reponse_error(error_logger, resp):
+        if not logging_utils.log_response_error(error_logger, resp):
             checkpoint_key_set.write(experiment_id)
 
     def _get_mlflow_experiment_acls(self, acl_log_file_writer, experiment_str, checkpoint_key_set, error_logger):
@@ -97,7 +97,7 @@ def _get_mlflow_experiment_acls(self, acl_log_file_writer, experiment_str, check
             return
         logging.info(f"Exporting ACLs for experiment_id: {experiment_id}.")
         perms = self.get(f"/permissions/experiments/{experiment_id}", do_not_throw=True)
-        if not logging_utils.log_reponse_error(error_logger, perms):
+        if not logging_utils.log_response_error(error_logger, perms):
             acl_log_file_writer.write(json.dumps(perms) + '\n')
             checkpoint_key_set.write(experiment_id)
             logging.info(f"Successfully exported ACLs for experiment_id: {experiment_id}.")
diff --git a/dbclient/ScimClient.py b/dbclient/ScimClient.py
@@ -229,7 +229,7 @@ def assign_group_entitlements(self, group_dir, error_logger):
                     g_id = group_ids[group_name]
                     update_entitlements = self.assign_entitlements_args(entitlements)
                     up_resp = self.patch(f'/preview/scim/v2/Groups/{g_id}', update_entitlements)
-                    logging_utils.log_reponse_error(error_logger, up_resp)
+                    logging_utils.log_response_error(error_logger, up_resp)
 
     def assign_group_roles(self, group_dir, error_logger):
         # assign group role ACLs, which are only available via SCIM apis
@@ -246,13 +246,13 @@ def assign_group_roles(self, group_dir, error_logger):
                     g_id = group_ids[group_name]
                     update_roles = self.assign_roles_args(roles)
                     up_resp = self.patch(f'/preview/scim/v2/Groups/{g_id}', update_roles)
-                    logging_utils.log_reponse_error(error_logger, up_resp)
+                    logging_utils.log_response_error(error_logger, up_resp)
                 entitlements = group_data.get('entitlements', None)
                 if entitlements:
                     g_id = group_ids[group_name]
                     update_entitlements = self.assign_entitlements_args(entitlements)
                     up_resp = self.patch(f'/preview/scim/v2/Groups/{g_id}', update_entitlements)
-                    logging_utils.log_reponse_error(error_logger, up_resp)
+                    logging_utils.log_response_error(error_logger, up_resp)
 
     def get_current_group_ids(self):
         # return a dict of group displayName and id mappings
@@ -303,7 +303,7 @@ def assign_user_entitlements(self, current_user_ids, error_logger, user_log_file
                 if user_entitlements:
                     entitlements_args = self.assign_entitlements_args(user_entitlements)
                     update_resp = self.patch(f'/preview/scim/v2/Users/{user_id}', entitlements_args)
-                    logging_utils.log_reponse_error(error_logger, update_resp)
+                    logging_utils.log_response_error(error_logger, update_resp)
 
     def assign_user_roles(self, current_user_ids, error_logger, user_log_file='users.log'):
         """
@@ -351,7 +351,7 @@ def assign_user_roles(self, current_user_ids, error_logger, user_log_file='users
                     # get the json to add the roles to the user profile
                     patch_roles = self.add_roles_arg(roles_needed)
                     update_resp = self.patch(f'/preview/scim/v2/Users/{user_id}', patch_roles)
-                    logging_utils.log_reponse_error(error_logger, update_resp)
+                    logging_utils.log_response_error(error_logger, update_resp)
 
     @staticmethod
     def get_member_args(member_id_list):
@@ -409,7 +409,7 @@ def import_groups(self, group_dir, current_user_ids, error_logger):
                     "displayName": x
                 }
                 group_resp = self.post('/preview/scim/v2/Groups', create_args)
-                if not logging_utils.log_reponse_error(error_logger, group_resp):
+                if not logging_utils.log_response_error(error_logger, group_resp):
                     checkpoint_groups_set.write(x)
 
         # dict of { group_name : group_id }
@@ -444,7 +444,7 @@ def import_groups(self, group_dir, current_user_ids, error_logger):
                     add_members_json = self.get_member_args(member_id_list)
                     group_id = current_group_ids[group_name]
                     add_resp = self.patch('/preview/scim/v2/Groups/{0}'.format(group_id), add_members_json)
-                    logging_utils.log_reponse_error(error_logger, add_resp)
+                    logging_utils.log_response_error(error_logger, add_resp)
 
     def import_users(self, user_log, error_logger, checkpoint_set, num_parallel):
         # first create the user identities with the required fields
@@ -468,7 +468,7 @@ def _import_users_helper(self, user_data, create_keys, checkpoint_set, error_log
             logging.info("Creating user: {0}".format(user_name))
             user_create = {k: user[k] for k in create_keys if k in user}
             create_resp = self.post('/preview/scim/v2/Users', user_create)
-            if not logging_utils.log_reponse_error(error_logger, create_resp):
+            if not logging_utils.log_response_error(error_logger, create_resp):
                 checkpoint_set.write(user_name)
 
 
diff --git a/dbclient/SecretsClient.py b/dbclient/SecretsClient.py
@@ -24,9 +24,9 @@ def get_secret_value(self, scope_name, secret_key, cid, ec_id, error_logger):
         results_set = self.submit_command(cid, ec_id, cmd_set_value)
         results_convert = self.submit_command(cid, ec_id, cmd_convert_b64)
         results_get = self.submit_command(cid, ec_id, cmd_get_b64)
-        if logging_utils.log_reponse_error(error_logger, results_set) \
-                or logging_utils.log_reponse_error(error_logger, results_convert) \
-                or logging_utils.log_reponse_error(error_logger, results_get):
+        if logging_utils.log_response_error(error_logger, results_set) \
+                or logging_utils.log_response_error(error_logger, results_convert) \
+                or logging_utils.log_response_error(error_logger, results_get):
             return None
         else:
             return results_get.get('data')
@@ -44,7 +44,7 @@ def log_all_secrets(self, cluster_name=None, log_dir='secret_scopes/'):
         for scope_json in scopes_list:
             scope_name = scope_json.get('name')
             secrets_list = self.get_secrets(scope_name)
-            if logging_utils.log_reponse_error(error_logger, secrets_list):
+            if logging_utils.log_response_error(error_logger, secrets_list):
                 continue
             scopes_logfile = scopes_dir + scope_name
             try:
@@ -72,7 +72,7 @@ def log_all_secrets_acls(self, log_name='secret_scopes_acls.log'):
             for scope_json in scopes_list:
                 scope_name = scope_json.get('name', None)
                 resp = self.get('/secrets/acls/list', {'scope': scope_name})
-                if logging_utils.log_reponse_error(error_logger, resp):
+                if logging_utils.log_response_error(error_logger, resp):
                     return
                 else:
                     resp['scope_name'] = scope_name
@@ -150,7 +150,7 @@ def import_all_secrets(self, log_dir='secret_scopes/'):
                     create_scope_args['initial_manage_principal'] = 'users'
                 other_permissions = self.get_all_other_permissions(scope_name, scopes_acl_dict)
                 create_resp = self.post('/secrets/scopes/create', create_scope_args)
-                logging_utils.log_reponse_error(
+                logging_utils.log_response_error(
                     error_logger, create_resp, ignore_error_list=['RESOURCE_ALREADY_EXISTS'])
                 if other_permissions:
                     # use this dict minus the `users:MANAGE` permissions and apply the other permissions to the scope
@@ -161,7 +161,7 @@ def import_all_secrets(self, log_dir='secret_scopes/'):
                             put_acl_args["principal"] = x
                             logging.info(put_acl_args)
                             put_resp = self.post('/secrets/acls/put', put_acl_args)
-                            logging_utils.log_reponse_error(error_logger, put_resp)
+                            logging_utils.log_response_error(error_logger, put_resp)
                 # loop through the scope and create the k/v pairs
                 with open(file_path, 'r') as fp:
                     for s in fp:
@@ -176,7 +176,7 @@ def import_all_secrets(self, log_dir='secret_scopes/'):
                                                'key': k,
                                                'string_value': base64.b64decode(v.encode('ascii')).decode('ascii')}
                             put_resp = self.post('/secrets/put', put_secret_args)
-                            logging_utils.log_reponse_error(error_logger, put_resp)
+                            logging_utils.log_response_error(error_logger, put_resp)
                         except Exception as error:
                             if "Invalid base64-encoded string" in str(error) or 'decode' in str(error) or "padding" in str(error):
                                 error_msg = f"secret_scope: {scope_name} has invalid invalid data characters: {str(error)} skipping.. and logging to error file."
diff --git a/dbclient/WorkspaceClient.py b/dbclient/WorkspaceClient.py
diff --git a/logging_utils.py b/logging_utils.py
