From 4859cebd9fd2143ff1f57224ee5abb93d46670da Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Wed, 29 May 2024 09:59:13 -0300
Subject: [PATCH] refactor: move `min_block_size` one level up

---
 ...ridge_azure_blob_storage_action_schema.erl | 20 +++++++++----------
 ...qx_bridge_azure_blob_storage_connector.erl |  4 ++--
 .../emqx_bridge_azure_blob_storage_SUITE.erl  |  4 +---
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/apps/emqx_bridge_azure_blob_storage/src/emqx_bridge_azure_blob_storage_action_schema.erl b/apps/emqx_bridge_azure_blob_storage/src/emqx_bridge_azure_blob_storage_action_schema.erl
index f50f1bd03..468b99606 100644
--- a/apps/emqx_bridge_azure_blob_storage/src/emqx_bridge_azure_blob_storage_action_schema.erl
+++ b/apps/emqx_bridge_azure_blob_storage/src/emqx_bridge_azure_blob_storage_action_schema.erl
@@ -120,6 +120,16 @@ fields(aggreg_parameters) ->
                     desc => ?DESC("aggregated_blob_template"),
                     required => true
                 }
+            )},
+        {min_block_size,
+            mk(
+                emqx_schema:bytesize(),
+                #{
+                    default => <<"10mb">>,
+                    importance => ?IMPORTANCE_HIDDEN,
+                    required => true,
+                    validator => fun block_size_validator/1
+                }
             )}
         | fields(common_action_parameters)
     ];
@@ -144,16 +154,6 @@ fields(aggregation) ->
                     default => 1_000_000,
                     desc => ?DESC("aggregation_max_records")
                 }
-            )},
-        {min_block_size,
-            mk(
-                emqx_schema:bytesize(),
-                #{
-                    default => <<"10mb">>,
-                    importance => ?IMPORTANCE_HIDDEN,
-                    required => true,
-                    validator => fun block_size_validator/1
-                }
             )}
     ];
 fields(common_action_parameters) ->
diff --git a/apps/emqx_bridge_azure_blob_storage/src/emqx_bridge_azure_blob_storage_connector.erl b/apps/emqx_bridge_azure_blob_storage/src/emqx_bridge_azure_blob_storage_connector.erl
index 4a66f039f..e9ac07b53 100644
--- a/apps/emqx_bridge_azure_blob_storage/src/emqx_bridge_azure_blob_storage_connector.erl
+++ b/apps/emqx_bridge_azure_blob_storage/src/emqx_bridge_azure_blob_storage_connector.erl
@@ -526,12 +526,12 @@ install_action(#{parameters := #{mode := aggregated}} = ActionConfig, ConnState)
             aggregation := #{
                 container := ContainerOpts,
                 max_records := MaxRecords,
-                min_block_size := MinBlockSize,
                 time_interval := TimeInterval
             },
             container := ContainerName,
             blob := BlobTemplateStr,
-            max_block_size := MaxBlockSize
+            max_block_size := MaxBlockSize,
+            min_block_size := MinBlockSize
         }
     } = ActionConfig,
     Type = ?ACTION_TYPE_BIN,
diff --git a/apps/emqx_bridge_azure_blob_storage/test/emqx_bridge_azure_blob_storage_SUITE.erl b/apps/emqx_bridge_azure_blob_storage/test/emqx_bridge_azure_blob_storage_SUITE.erl
index 89a9db41c..71c1d3a29 100644
--- a/apps/emqx_bridge_azure_blob_storage/test/emqx_bridge_azure_blob_storage_SUITE.erl
+++ b/apps/emqx_bridge_azure_blob_storage/test/emqx_bridge_azure_blob_storage_SUITE.erl
@@ -615,9 +615,7 @@ t_aggreg_pending_upload_restart(Config) ->
                     #{
                         <<"parameters">> =>
                             #{
-                                <<"aggregation">> => #{
-                                    <<"min_block_size">> => <<"1024B">>
-                                }
+                                <<"min_block_size">> => <<"1024B">>
                             }
                     }
                 )