From e22c1c01ec3dad342bc12651a4a7104b31ef5ee0 Mon Sep 17 00:00:00 2001
From: Ilya Averyanov <av@rubybox.dev>
Date: Thu, 13 Apr 2023 19:47:12 +0300
Subject: [PATCH] feat(s3): make acl optional

---
 apps/emqx_s3/src/emqx_s3_client.erl        |  8 +++++---
 apps/emqx_s3/src/emqx_s3_profile_conf.erl  |  2 +-
 apps/emqx_s3/src/emqx_s3_schema.erl        |  2 +-
 apps/emqx_s3/test/emqx_s3_client_SUITE.erl | 13 ++++++++++++-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/apps/emqx_s3/src/emqx_s3_client.erl b/apps/emqx_s3/src/emqx_s3_client.erl
index 6bb6c2e3b..e3e1d84af 100644
--- a/apps/emqx_s3/src/emqx_s3_client.erl
+++ b/apps/emqx_s3/src/emqx_s3_client.erl
@@ -199,10 +199,12 @@ format(#{aws_config := AwsConfig} = Client) ->
 %% Internal functions
 %%--------------------------------------------------------------------
 
-upload_options(Config) ->
+upload_options(#{acl := Acl}) when Acl =/= undefined ->
     [
-        {acl, maps:get(acl, Config)}
-    ].
+        {acl, Acl}
+    ];
+upload_options(#{}) ->
+    [].
 
 headers(#{headers := Headers}) ->
     headers_user_to_erlcloud_request(Headers);
diff --git a/apps/emqx_s3/src/emqx_s3_profile_conf.erl b/apps/emqx_s3/src/emqx_s3_profile_conf.erl
index 3d9d6ed3f..3d66823a7 100644
--- a/apps/emqx_s3/src/emqx_s3_profile_conf.erl
+++ b/apps/emqx_s3/src/emqx_s3_profile_conf.erl
@@ -198,7 +198,7 @@ client_config(ProfileConfig, PoolName) ->
         port => maps:get(port, ProfileConfig),
         url_expire_time => maps:get(url_expire_time, ProfileConfig),
         headers => maps:get(headers, HTTPOpts, #{}),
-        acl => maps:get(acl, ProfileConfig),
+        acl => maps:get(acl, ProfileConfig, undefined),
         bucket => maps:get(bucket, ProfileConfig),
         access_key_id => maps:get(access_key_id, ProfileConfig, undefined),
         secret_access_key => maps:get(secret_access_key, ProfileConfig, undefined),
diff --git a/apps/emqx_s3/src/emqx_s3_schema.erl b/apps/emqx_s3/src/emqx_s3_schema.erl
index 4d017deed..2d714bb7d 100644
--- a/apps/emqx_s3/src/emqx_s3_schema.erl
+++ b/apps/emqx_s3/src/emqx_s3_schema.erl
@@ -105,7 +105,7 @@ fields(s3) ->
                 #{
                     default => private,
                     desc => ?DESC("acl"),
-                    required => true
+                    required => false
                 }
             )},
         {transport_options,
diff --git a/apps/emqx_s3/test/emqx_s3_client_SUITE.erl b/apps/emqx_s3/test/emqx_s3_client_SUITE.erl
index 4af803c67..cb55bc083 100644
--- a/apps/emqx_s3/test/emqx_s3_client_SUITE.erl
+++ b/apps/emqx_s3/test/emqx_s3_client_SUITE.erl
@@ -60,7 +60,8 @@ init_per_testcase(_TestCase, Config0) ->
     ok = erlcloud_s3:create_bucket(Bucket, TestAwsConfig),
     Config1 = [
         {key, emqx_s3_test_helpers:unique_key()},
-        {bucket, Bucket}
+        {bucket, Bucket},
+        {aws_config, TestAwsConfig}
         | Config0
     ],
     {ok, PoolName} = emqx_s3_profile_conf:start_http_pool(?PROFILE_ID, profile_config(Config1)),
@@ -131,6 +132,16 @@ t_url(Config) ->
         httpc:request(Url)
     ).
 
+t_no_acl(Config) ->
+    Key = ?config(key, Config),
+
+    ClientConfig = emqx_s3_profile_conf:client_config(
+        profile_config(Config), ?config(ehttpc_pool_name, Config)
+    ),
+    Client = emqx_s3_client:create(maps:without([acl], ClientConfig)),
+
+    ok = emqx_s3_client:put_object(Client, Key, <<"data">>).
+
 %%--------------------------------------------------------------------
 %% Helpers
 %%--------------------------------------------------------------------