Merge pull request #9266 from shirady/iam-minor-fixes

IAM | Minor Fixes

Author: shirady

src/endpoint/iam/iam_rest.js

@@ -89,34 +89,34 @@ const IAM_OPS = js_utils.deep_freeze({
     post_delete_user_policy: require('./ops/iam_delete_user_policy'),
     post_list_user_policies: require('./ops/iam_list_user_policies'),
     // other (currently ops that return empty or NoSuchEntity error - just not to fail them)
-    post_list_groups_for_user: require('./ops/iam_list_groups_for_user.js'),
-    post_list_account_aliases: require('./ops/iam_list_account_aliases.js'),
-    post_list_attached_group_policies: require('./ops/iam_list_attached_group_policies.js'),
-    post_list_attached_role_policies: require('./ops/iam_list_attached_role_policies.js'),
-    post_list_attached_user_policies: require('./ops/iam_list_attached_user_policies.js'),
-    post_list_entities_for_policy: require('./ops/iam_list_entities_for_policy.js'),
-    post_list_group_policies: require('./ops/iam_list_group_policies.js'),
-    post_list_groups: require('./ops/iam_list_groups.js'),
-    post_list_instance_profiles: require('./ops/iam_list_instance_profiles.js'),
-    post_list_instance_profiles_for_role: require('./ops/iam_list_instance_profiles_for_role.js'),
-    post_list_instance_profile_tags: require('./ops/iam_list_instance_profile_tags.js'),
-    post_list_mfa_devices: require('./ops/iam_list_mfa_devices.js'),
-    post_list_mfa_device_tags: require('./ops/iam_list_mfa_device_tags.js'),
-    post_list_open_id_connect_providers: require('./ops/iam_list_open_id_connect_providers.js'),
-    post_list_open_id_connect_provider_tags: require('./ops/iam_list_open_id_connect_provider_tags.js'),
-    post_list_policies: require('./ops/iam_list_policies.js'),
-    post_list_policy_tags: require('./ops/iam_list_policy_tags.js'),
-    post_list_policy_versions: require('./ops/iam_list_policy_versions.js'),
-    post_list_roles: require('./ops/iam_list_roles.js'),
-    post_list_role_tags: require('./ops/iam_list_role_tags.js'),
-    post_list_saml_providers: require('./ops/iam_list_saml_providers.js'),
-    post_list_server_certificates: require('./ops/iam_list_server_certificates.js'),
-    post_list_server_certificate_tags: require('./ops/iam_list_server_certificate_tags.js'),
-    post_list_service_specific_credentials: require('./ops/iam_list_service_specific_credentials.js'),
-    post_list_signing_certificates: require('./ops/iam_list_signing_certificates.js'),
-    post_list_ssh_public_keys: require('./ops/iam_list_ssh_public_keys.js'),
-    post_list_user_tags: require('./ops/iam_list_user_tags.js'),
-    post_list_virtual_mfa_devices: require('./ops/iam_list_virtual_mfa_devices.js'),
+    post_list_groups_for_user: require('./ops/iam_list_groups_for_user'),
+    post_list_account_aliases: require('./ops/iam_list_account_aliases'),
+    post_list_attached_group_policies: require('./ops/iam_list_attached_group_policies'),
+    post_list_attached_role_policies: require('./ops/iam_list_attached_role_policies'),
+    post_list_attached_user_policies: require('./ops/iam_list_attached_user_policies'),
+    post_list_entities_for_policy: require('./ops/iam_list_entities_for_policy'),
+    post_list_group_policies: require('./ops/iam_list_group_policies'),
+    post_list_groups: require('./ops/iam_list_groups'),
+    post_list_instance_profiles: require('./ops/iam_list_instance_profiles'),
+    post_list_instance_profiles_for_role: require('./ops/iam_list_instance_profiles_for_role'),
+    post_list_instance_profile_tags: require('./ops/iam_list_instance_profile_tags'),
+    post_list_mfa_devices: require('./ops/iam_list_mfa_devices'),
+    post_list_mfa_device_tags: require('./ops/iam_list_mfa_device_tags'),
+    post_list_open_id_connect_providers: require('./ops/iam_list_open_id_connect_providers'),
+    post_list_open_id_connect_provider_tags: require('./ops/iam_list_open_id_connect_provider_tags'),
+    post_list_policies: require('./ops/iam_list_policies'),
+    post_list_policy_tags: require('./ops/iam_list_policy_tags'),
+    post_list_policy_versions: require('./ops/iam_list_policy_versions'),
+    post_list_roles: require('./ops/iam_list_roles'),
+    post_list_role_tags: require('./ops/iam_list_role_tags'),
+    post_list_saml_providers: require('./ops/iam_list_saml_providers'),
+    post_list_server_certificates: require('./ops/iam_list_server_certificates'),
+    post_list_server_certificate_tags: require('./ops/iam_list_server_certificate_tags'),
+    post_list_service_specific_credentials: require('./ops/iam_list_service_specific_credentials'),
+    post_list_signing_certificates: require('./ops/iam_list_signing_certificates'),
+    post_list_ssh_public_keys: require('./ops/iam_list_ssh_public_keys'),
+    post_list_user_tags: require('./ops/iam_list_user_tags'),
+    post_list_virtual_mfa_devices: require('./ops/iam_list_virtual_mfa_devices'),
 });
 
 async function iam_rest(req, res) {

src/endpoint/iam/iam_utils.js

@@ -278,8 +278,7 @@ function validate_delete_user(params) {
         check_required_username(params);
         validation_utils.validate_username(params.username, iam_constants.IAM_PARAMETER_NAME.USERNAME);
     } catch (err) {
-        check_required_username(params);
-        validation_utils.validate_username(params.username, iam_constants.IAM_PARAMETER_NAME.USERNAME);
+        translate_rpc_error(err);
     }
 }
 

src/endpoint/iam/ops/iam_delete_user.js

@@ -16,7 +16,7 @@ async function delete_user(req, res) {
         username: req.body.user_name,
     };
     dbg.log1('IAM DELETE USER', params);
-    iam_utils.validate_params(iam_constants.IAM_ACTIONS.UPDATE_USER, params);
+    iam_utils.validate_params(iam_constants.IAM_ACTIONS.DELETE_USER, params);
     await req.account_sdk.delete_user(params);
 
     return {

src/sdk/accountspace_fs.js

@@ -977,8 +977,8 @@ class AccountSpaceFS {
 
     _check_number_of_access_key_array(action, requested_account) {
         if (requested_account.access_keys.length >= MAX_NUMBER_OF_ACCESS_KEYS) {
-            dbg.error(`AccountSpaceFS.${action} requested account is not owned by root account `,
-            requested_account);
+            dbg.error(`AccountSpaceFS.${action} number of access keys exceeded for requested_account ID`,
+            requested_account._id, requested_account.access_keys.length, 'max allowed', MAX_NUMBER_OF_ACCESS_KEYS);
             const message_with_details = `Cannot exceed quota for AccessKeysPerUser: ${MAX_NUMBER_OF_ACCESS_KEYS}.`;
             const { code, http_code, type } = IamError.LimitExceeded;
             throw new IamError({ code, message: message_with_details, http_code, type });