From 242a1b147705e7e17e75c780ed062867083b1db3 Mon Sep 17 00:00:00 2001
From: Andriy Zavada <andriy.zavada@tiot.jp>
Date: Sat, 19 Aug 2023 19:02:40 +0300
Subject: [PATCH 1/5] case of two User variables borking the matching pattern

---
 apps/riak_cs/src/riak_cs_wm_utils.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/riak_cs/src/riak_cs_wm_utils.erl b/apps/riak_cs/src/riak_cs_wm_utils.erl
index 5a2b4d936..f2566376c 100644
--- 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,

From 69581b562bf6e77863850640076cfa08df9cf3fb Mon Sep 17 00:00:00 2001
From: Andriy Zavada <andriy.zavada@tiot.jp>
Date: Mon, 21 Aug 2023 14:14:05 +0300
Subject: [PATCH 2/5] use  in schema, like in riak

---
 apps/riak_cs/priv/riak_cs.schema | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/riak_cs/priv/riak_cs.schema b/apps/riak_cs/priv/riak_cs.schema
index d955096c3..cb96b8bdc 100644
--- a/apps/riak_cs/priv/riak_cs.schema
+++ b/apps/riak_cs/priv/riak_cs.schema
@@ -425,7 +425,7 @@
 
 %% @doc Access log directory.
 {mapping, "log.access.dir", "webmachine.log_handlers", [
-  {default, "{{platform_log_dir}}" },
+  {default, "$(platform_log_dir)" },
   {datatype, string}
 ]}.
 
@@ -515,7 +515,7 @@
 
 %% @doc Filename to use for log files.
 {mapping, "logger.file", "kernel.logger", [
-  {default, "{{platform_log_dir}}/console.log"},
+  {default, "$(platform_log_dir)/console.log"},
   {datatype, file}
 ]}.
 
@@ -541,7 +541,7 @@
 
 %% @doc Filename to use for SASL reports.
 {mapping, "logger.sasl.file", "kernel.logger", [
-  {default, "{{platform_log_dir}}/reports.log"},
+  {default, "$(platform_log_dir)/reports.log"},
   {datatype, file}
 ]}.
 

From b6381bec34fe280514dede01d4b9cf092973d516 Mon Sep 17 00:00:00 2001
From: Andriy Zavada <andriy.zavada@tiot.jp>
Date: Mon, 21 Aug 2023 14:33:52 +0300
Subject: [PATCH 3/5] explicitly use python3 in create-admin

---
 tools/create-admin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/create-admin b/tools/create-admin
index b1b452387..15ca91ddb 100755
--- 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

From 69695fd5a8c5aa1b48b4865298d148bef554b02a Mon Sep 17 00:00:00 2001
From: Andriy Zavada <andriy.zavada@tiot.jp>
Date: Mon, 21 Aug 2023 15:55:30 +0300
Subject: [PATCH 4/5] Revert "use  in schema, like in riak"

This reverts commit 69581b562bf6e77863850640076cfa08df9cf3fb.
---
 apps/riak_cs/priv/riak_cs.schema | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/riak_cs/priv/riak_cs.schema b/apps/riak_cs/priv/riak_cs.schema
index cb96b8bdc..d955096c3 100644
--- a/apps/riak_cs/priv/riak_cs.schema
+++ b/apps/riak_cs/priv/riak_cs.schema
@@ -425,7 +425,7 @@
 
 %% @doc Access log directory.
 {mapping, "log.access.dir", "webmachine.log_handlers", [
-  {default, "$(platform_log_dir)" },
+  {default, "{{platform_log_dir}}" },
   {datatype, string}
 ]}.
 
@@ -515,7 +515,7 @@
 
 %% @doc Filename to use for log files.
 {mapping, "logger.file", "kernel.logger", [
-  {default, "$(platform_log_dir)/console.log"},
+  {default, "{{platform_log_dir}}/console.log"},
   {datatype, file}
 ]}.
 
@@ -541,7 +541,7 @@
 
 %% @doc Filename to use for SASL reports.
 {mapping, "logger.sasl.file", "kernel.logger", [
-  {default, "$(platform_log_dir)/reports.log"},
+  {default, "{{platform_log_dir}}/reports.log"},
   {datatype, file}
 ]}.
 

From 612c418379da995d84d86ffc6bf7fd4f0bac3677 Mon Sep 17 00:00:00 2001
From: Andriy Zavada <andriy.zavada@tiot.jp>
Date: Mon, 21 Aug 2023 16:04:51 +0300
Subject: [PATCH 5/5] crash hard if no riak connection at startup

---
 apps/riak_cs/src/riak_cs_app.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/riak_cs/src/riak_cs_app.erl b/apps/riak_cs/src/riak_cs_app.erl
index eea527968..bd9670cb0 100644
--- 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.