Merge branch 'hmmr/develop/saml' of github.com:TI-Tokyo/riak_cs into …

…hmmr/develop/saml
TI-Tokyo · Aug 21, 2023 · d4e2a59 · d4e2a59
2 parents 0250228 + 612c418
commit d4e2a59
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/apps/riak_cs/src/riak_cs_app.erl b/apps/riak_cs/src/riak_cs_app.erl
@@ -84,8 +84,8 @@ ensure_bucket_props(Pbc) ->
                              ?IAM_POLICY_BUCKET,
                              ?IAM_SAMLPROVIDER_BUCKET,
                              ?TEMP_SESSIONS_BUCKET],
-    [riakc_pb_socket:set_bucket(Pbc, B, [{allow_mult, true}]) || B <- BucketsWithMultiTrue],
-    [riakc_pb_socket:set_bucket(Pbc, B, [{allow_mult, false}]) || B <- BucketsWithMultiFalse],
+    [ok = riakc_pb_socket:set_bucket(Pbc, B, [{allow_mult, true}]) || B <- BucketsWithMultiTrue],
+    [ok = riakc_pb_socket:set_bucket(Pbc, B, [{allow_mult, false}]) || B <- BucketsWithMultiFalse],
     ?LOG_DEBUG("ensure_bucket_props done"),
     ok.
 

diff --git a/apps/riak_cs/src/riak_cs_wm_utils.erl b/apps/riak_cs/src/riak_cs_wm_utils.erl
@@ -855,7 +855,7 @@ handle_acl_check_result(false, Acl, Policy, AccessType, _Deletable, RD, Ctx) ->
 handle_policy_eval_result(_, true, OwnerId, RD, Ctx) ->
     %% Policy says yes while ACL says no
     shift_to_owner(RD, Ctx, OwnerId, Ctx#rcs_web_context.riak_client);
-handle_policy_eval_result(User, _, _, RD, Ctx) ->
+handle_policy_eval_result(_, _, _, RD, Ctx) ->
     %% Policy says no
     #rcs_web_context{riak_client = RcPid,
                      response_module = ResponseMod,

diff --git a/tools/create-admin b/tools/create-admin
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os, sys, getopt, httplib2, json, pprint
 import boto3