Fix ordering issue

Signed-off-by: Mark Anderson <[email protected]>

src/oc_erchef/apps/oc_chef_authz/src/oc_chef_authz_scoped_name.erl

@@ -435,7 +435,7 @@ render_names_in_context(OrgId, ScopedNames, Context) ->
     GroupedScopedNames = group_by_key(ScopedNames),
     {Expanded, _Cache} = lists:foldl(fun(E, A) -> render_names_in_context_f(OrgId, E, A) end,
                                      {[], Context}, GroupedScopedNames),
-    lists:flatten(Expanded).
+    lists:sort(lists:flatten(Expanded)).
 
 %% We are in the same scope, omit qualifier
 render_names_in_context_f(OrgId, {OrgId, Names}, {Expanded, Context}) ->

src/oc_erchef/apps/oc_chef_authz/test/oc_chef_authz_scoped_name_tests.erl

@@ -45,7 +45,7 @@
 -define(GLOBAL_NAME_AUTHZ_ID, global_name_authz_id).
 -define(ORGLOCAL_NAME_AUTHZ_ID, orglocal_name_authz_id).
 
--define(SCOPE_PERMUTATIONS, [{?ORG1_ID, ?PLAIN_GROUP}, {?ORG2_ID, ?PLAIN_GROUP}, {?GLOBAL_PLACEHOLDER_ORG_ID, ?PLAIN_GROUP}]).
+-define(SCOPE_PERMUTATIONS, lists:sort([{?ORG1_ID, ?PLAIN_GROUP}, {?ORG2_ID, ?PLAIN_GROUP}, {?GLOBAL_PLACEHOLDER_ORG_ID, ?PLAIN_GROUP}])).
 
 %% Copypast for oc_chef_authz_scoped_name.erl
 %-record(context, {org_name :: undefined,
@@ -309,7 +309,8 @@ render_names_in_context_test_() ->
       {"longer list returns and and no errors",
        fun() ->
                Answer = Subject(?ORG1_ID, ?SCOPE_PERMUTATIONS, Context),
-               ?assertEqual([?ORGLOCAL_GROUP,?PLAIN_GROUP, ?M:make_name(<<>>,?PLAIN_GROUP)],
+               Expected = lists:sort([?ORGLOCAL_GROUP,?PLAIN_GROUP, ?M:make_name(<<>>,?PLAIN_GROUP)]),
+               ?assertEqual(Expected,
                             Answer)
        end
       }