From 5ea3b1862aadfdeefd01c4a351f19d1dfae25501 Mon Sep 17 00:00:00 2001
From: Trent Mick <trentm@gmail.com>
Date: Wed, 16 Dec 2015 10:47:46 -0800
Subject: [PATCH] sorted stable fields for 'triton rbac role ROLE' output; use
 'add' for added fields in 'triton rbac apply' resource updates

---
 CHANGES.md             |  3 ++-
 lib/do_rbac/do_role.js | 23 ++++++++++++++++++++++-
 lib/rbac.js            | 10 +++++++---
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 32b3563..a0e2a98 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,7 +3,8 @@
 ## 3.4.1 (not yet released)
 
 - Add `-d,--data <data>` option to `triton cloudapi`.
-- Fix `triton rbac role ROLE`.
+- Fix `triton rbac role ROLE`. Also get that command to have a stable order for the
+  displayed fields.
 
 
 ## 3.4.0
diff --git a/lib/do_rbac/do_role.js b/lib/do_rbac/do_role.js
index a51b899..6249989 100644
--- a/lib/do_rbac/do_role.js
+++ b/lib/do_rbac/do_role.js
@@ -34,6 +34,10 @@ var CREATE_ROLE_FIELDS = [
     {key: 'policies', array: true}
 ];
 
+var SHOW_ORDER_FIELDS = [
+    'id', 'name', 'default_members', 'members', 'policies'
+];
+
 var _isArrayFromKey = {};
 UPDATABLE_ROLE_FIELDS.forEach(function (field) {
     _isArrayFromKey[field.key] = Boolean(field.array);
@@ -61,7 +65,24 @@ function _showRole(opts, cb) {
         if (opts.json) {
             console.log(JSON.stringify(role));
         } else {
-            Object.keys(role).forEach(function (key) {
+            var keys = Object.keys(role);
+            keys.sort(function cmpKeys(a, b) {
+                var idxA = SHOW_ORDER_FIELDS.indexOf(a);
+                var idxB = SHOW_ORDER_FIELDS.indexOf(b);
+                if (idxA === -1 && idxB === -1) {
+                    return 0;
+                } else if (idxA === -1) {
+                    return -1;
+                } else if (idxB === -1) {
+                    return 1;
+                } else if (idxA < idxB) {
+                    return -1;
+                } else if (idxA > idxB) {
+                    return 1;
+                }
+            });
+
+            keys.forEach(function (key) {
                 var val = role[key];
                 if (Array.isArray(val)) {
                     val = val.join(', ');
diff --git a/lib/rbac.js b/lib/rbac.js
index 4f9d3af..cc8e9ab 100644
--- a/lib/rbac.js
+++ b/lib/rbac.js
@@ -149,7 +149,7 @@ function crudChangesForThings(opts) {
             });
             Object.keys(wantThing_).forEach(function (field) {
                 if (! haveThing_.hasOwnProperty(field)) {
-                    diff[field] = 'create';
+                    diff[field] = 'add';
                 }
             });
             if (opts.compareFields) {
@@ -370,7 +370,7 @@ function loadRbacState(ctx, cb) {
                 next();
                 return;
             }
-            // XXX Q! or concurrency forEachParallel
+            // XXX Limit concurrency here!
             // TODO: Optimization: could avoid getting keys for users that are
             // going to be deleted, for the `triton rbac apply` use case.
             vasync.forEachParallel({
@@ -540,7 +540,11 @@ function createRbacUpdatePlan(ctx, cb) {
             idField: 'name',
             have: ctx.rbacState.roles || [],
             want: ctx.rbacConfig.roles || [],
-            compareFields: ['members', 'default_members', 'policies'],
+            compareFields: [
+                'members',
+                'default_members',
+                'policies'
+            ],
             normThing: function normRole(role) {
                 role.members.sort();
                 role.default_members.sort();