Merge pull request #9327 from shirady/iam-get-user-with-tags

IAM | Add `Tags` to `GetUser` Reply

Author: shirady

src/api/account_api.js

@@ -1305,6 +1305,17 @@ module.exports = {
                         $ref: 'common_api#/definitions/access_keys'
                     }
                 },
+                tags: {
+                    type: 'array',
+                    items: {
+                        type: 'object',
+                        properties: {
+                            member: {
+                                $ref: '#/definitions/tag'
+                            },
+                        },
+                    },
+                },
             }
         },
         user_accesskey_info: {

src/endpoint/iam/ops/iam_get_user.js

@@ -29,6 +29,7 @@ async function get_user(req, res) {
                     Arn: reply.arn,
                     CreateDate: iam_utils.format_iam_xml_date(reply.create_date),
                     PasswordLastUsed: iam_utils.format_iam_xml_date(reply.password_last_used),
+                    Tags: reply.tags && reply.tags.length === 0 ? undefined : reply.tags
                 }
             },
             ResponseMetadata: {

src/server/system_services/account_server.js

@@ -1210,6 +1210,7 @@ async function get_user(req) {
     const username = account_util.get_iam_username(req.rpc_params.username || requested_account.name.unwrap());
     const iam_arn = iam_utils.create_arn_for_user(requesting_account._id.toString(), username,
                                 requested_account.iam_path || IAM_DEFAULT_PATH);
+    const tags = account_util.get_sorted_list_tags_for_user(requested_account.tagging);
     return {
         user_id: requested_account._id.toString(),
         iam_path: requested_account.iam_path || IAM_DEFAULT_PATH,
@@ -1219,6 +1220,7 @@ async function get_user(req) {
         create_date: Date.now(),
         // TODO: Dates missing : GAP
         password_last_used: Date.now(),
+        tags: tags
     };
 }
 
@@ -1504,16 +1506,8 @@ async function list_user_tags(req) {
     account_util._check_if_requested_is_owned_by_root_account(action, requesting_account, requested_account);
 
     // TODO: Pagination not supported - currently returns all tags, ignoring marker and max_items params
-    const all_tags = requested_account.tagging || [];
-    const sorted_tags = all_tags.sort((a, b) => a.key.localeCompare(b.key));
-
-    const tags = sorted_tags.length > 0 ? sorted_tags.map(tag => ({
-        member: {
-            Key: tag.key,
-            Value: tag.value
-        }
-    })) : [];
-    dbg.log0('AccountSpaceNB.list_user_tags: returning', tags, 'tags for user', req.rpc_params.username);
+    const tags = account_util.get_sorted_list_tags_for_user(requested_account.tagging);
+    dbg.log1('AccountSpaceNB.list_user_tags: returning', tags, 'tags for user', req.rpc_params.username);
 
     return {
         tags: tags,

src/test/integration_tests/api/iam/test_iam_basic_integration.js

@@ -423,6 +423,16 @@ mocha.describe('IAM basic integration tests - happy path', async function() {
             assert.equal(response2.Tags.length, 2);
             const sorted = arr => _.sortBy(arr, 'Key');
             assert.deepEqual(sorted(response2.Tags), sorted(user_tags));
+
+            // verify it with get user (Tags are included in the User object)
+            const input3 = {
+                UserName: username4
+            };
+            const command3 = new GetUserCommand(input3);
+            const response3 = await iam_account.send(command3);
+            _check_status_code_ok(response3);
+            assert.equal(response3.User.Tags.length, 2);
+            assert.deepEqual(sorted(response3.User.Tags), sorted(user_tags));
         });
 
         mocha.it('untag user', async function() {

src/util/account_util.js

@@ -730,6 +730,19 @@ function return_list_member(iam_user, iam_path, iam_username) {
     };
 }
 
+function get_sorted_list_tags_for_user(user_tagging) {
+    if (!user_tagging || user_tagging.length === 0) {
+        return [];
+    }
+    const sorted_tags = user_tagging.sort((a, b) => a.key.localeCompare(b.key));
+    return sorted_tags.map(tag => ({
+        member: {
+            Key: tag.key,
+            Value: tag.value
+        }
+    }));
+}
+
 
 exports.delete_account = delete_account;
 exports.create_account = create_account;
@@ -757,3 +770,4 @@ exports.validate_and_return_requested_account = validate_and_return_requested_ac
 exports.get_iam_username = get_iam_username;
 exports.return_list_member = return_list_member;
 exports.get_owner_account_id = get_owner_account_id;
+exports.get_sorted_list_tags_for_user = get_sorted_list_tags_for_user;