Merge pull request #13413 from thalesmg/20240703-m-mix-umbrella-part-II

chore: add missing mix files to new apps

apps/emqx_bridge_azure_blob_storage/mix.exs

@@ -0,0 +1,34 @@
+defmodule EMQXBridgeAzureBlobStorage.MixProject do
+  use Mix.Project
+  alias EMQXUmbrella.MixProject, as: UMP
+
+  def project do
+    [
+      app: :emqx_bridge_azure_blob_storage,
+      version: "0.1.0",
+      build_path: "../../_build",
+      erlc_options: UMP.erlc_options(),
+      erlc_paths: UMP.erlc_paths(),
+      deps_path: "../../deps",
+      lockfile: "../../mix.lock",
+      elixir: "~> 1.14",
+      start_permanent: Mix.env() == :prod,
+      deps: deps()
+    ]
+  end
+
+  def application do
+    [
+      extra_applications: UMP.extra_applications(),
+      mod: {:emqx_bridge_azure_blob_storage_app, []}
+    ]
+  end
+
+  def deps() do
+    [
+      {:emqx_resource, in_umbrella: true},
+      {:emqx_connector_aggregator, in_umbrella: true},
+      {:erlazure, github: "emqx/erlazure", tag: "0.4.0.0"}
+    ]
+  end
+end

apps/emqx_bridge_azure_blob_storage/test/emqx_bridge_azure_blob_storage_SUITE.erl

@@ -14,7 +14,7 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
 -include_lib("erlazure/include/erlazure.hrl").
--include("emqx_bridge_azure_blob_storage.hrl").
+-include("../src/emqx_bridge_azure_blob_storage.hrl").
 
 -define(ACCOUNT_NAME_BIN, <<"devstoreaccount1">>).
 -define(ACCOUNT_KEY_BIN, <<

apps/emqx_cluster_link/mix.exs

@@ -0,0 +1,31 @@
+defmodule EMQXClusterLink.MixProject do
+  use Mix.Project
+  alias EMQXUmbrella.MixProject, as: UMP
+
+  def project do
+    [
+      app: :emqx_cluster_link,
+      version: "0.1.0",
+      build_path: "../../_build",
+      erlc_options: UMP.erlc_options(),
+      erlc_paths: UMP.erlc_paths(),
+      deps_path: "../../deps",
+      lockfile: "../../mix.lock",
+      elixir: "~> 1.14",
+      start_permanent: Mix.env() == :prod,
+      deps: deps()
+    ]
+  end
+
+  def application do
+    [extra_applications: UMP.extra_applications(), mod: {:emqx_cluster_link_app, []}]
+  end
+
+  def deps() do
+    [
+      {:emqx, in_umbrella: true},
+      {:emqx_resource, in_umbrella: true},
+      UMP.common_dep(:emqtt)
+    ]
+  end
+end

apps/emqx_ds_backends/mix.exs

@@ -0,0 +1,36 @@
+defmodule EMQXDsBackends.MixProject do
+  use Mix.Project
+  alias EMQXUmbrella.MixProject, as: UMP
+
+  def project do
+    [
+      app: :emqx_ds_backends,
+      version: "0.1.0",
+      build_path: "../../_build",
+      erlc_options: UMP.erlc_options(),
+      erlc_paths: UMP.erlc_paths(),
+      deps_path: "../../deps",
+      lockfile: "../../mix.lock",
+      elixir: "~> 1.14",
+      start_permanent: Mix.env() == :prod,
+      deps: deps()
+    ]
+  end
+
+  def application do
+    [extra_applications: UMP.extra_applications()]
+  end
+
+  def deps() do
+    %{edition_type: edition_type} = UMP.profile_info()
+    ee_deps = if edition_type == :enterprise,
+      do: [{:emqx_ds_builtin_raft, in_umbrella: true}],
+      else: []
+
+    ee_deps ++ [
+      {:emqx_utils, in_umbrella: true},
+      {:emqx_durable_storage, in_umbrella: true},
+      {:emqx_ds_builtin_local, in_umbrella: true},
+    ]
+  end
+end

apps/emqx_ds_builtin_local/mix.exs

@@ -0,0 +1,33 @@
+defmodule EMQXDsBuiltinLocal.MixProject do
+  use Mix.Project
+  alias EMQXUmbrella.MixProject, as: UMP
+
+  def project do
+    [
+      app: :emqx_ds_builtin_local,
+      version: "0.1.0",
+      build_path: "../../_build",
+      erlc_options: UMP.erlc_options(),
+      erlc_paths: UMP.erlc_paths(),
+      deps_path: "../../deps",
+      lockfile: "../../mix.lock",
+      elixir: "~> 1.14",
+      start_permanent: Mix.env() == :prod,
+      deps: deps()
+    ]
+  end
+
+  def application do
+    [
+      extra_applications: [:gproc, :mria, :rocksdb | UMP.extra_applications()],
+      mod: {:emqx_ds_builtin_local_app, []}
+    ]
+  end
+
+  def deps() do
+    [
+      {:emqx_utils, in_umbrella: true},
+      {:emqx_durable_storage, in_umbrella: true}
+    ]
+  end
+end

apps/emqx_ds_builtin_local/src/emqx_ds_builtin_local.erl

@@ -48,7 +48,7 @@
 
 -export_type([db_opts/0, shard/0, iterator/0, delete_iterator/0]).
 
--include_lib("emqx_utils/include/emqx_message.hrl").
+-include("../../emqx_utils/include/emqx_message.hrl").
 
 %%================================================================================
 %% Type declarations

apps/emqx_ds_builtin_local/test/emqx_ds_builtin_local_SUITE.erl

@@ -18,10 +18,10 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include_lib("emqx/include/emqx.hrl").
+-include("../../emqx_utils/include/emqx_message.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("stdlib/include/assert.hrl").
--include_lib("emqx/include/asserts.hrl").
+-include("../../emqx/include/asserts.hrl").
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
 
 -define(N_SHARDS, 1).

apps/emqx_ds_builtin_raft/mix.exs

@@ -0,0 +1,30 @@
+defmodule EMQXDsBuiltinRaft.MixProject do
+  use Mix.Project
+  alias EMQXUmbrella.MixProject, as: UMP
+
+  def project do
+    [
+      app: :emqx_ds_builtin_raft,
+      version: "0.1.0",
+      build_path: "../../_build",
+      erlc_options: UMP.erlc_options(),
+      erlc_paths: UMP.erlc_paths(),
+      deps_path: "../../deps",
+      lockfile: "../../mix.lock",
+      elixir: "~> 1.14",
+      start_permanent: Mix.env() == :prod,
+      deps: deps()
+    ]
+  end
+
+  def application do
+    [extra_applications: UMP.extra_applications(), mod: {:emqx_ds_builtin_raft_app, []}]
+  end
+
+  def deps() do
+    [
+      {:emqx_durable_storage, in_umbrella: true},
+      UMP.common_dep(:ra),
+    ]
+  end
+end

apps/emqx_ds_shared_sub/mix.exs

@@ -0,0 +1,27 @@
+defmodule EMQXDsSharedSub.MixProject do
+  use Mix.Project
+  alias EMQXUmbrella.MixProject, as: UMP
+
+  def project do
+    [
+      app: :emqx_ds_shared_sub,
+      version: "0.1.0",
+      build_path: "../../_build",
+      erlc_options: UMP.erlc_options(),
+      erlc_paths: UMP.erlc_paths(),
+      deps_path: "../../deps",
+      lockfile: "../../mix.lock",
+      elixir: "~> 1.14",
+      start_permanent: Mix.env() == :prod,
+      deps: deps()
+    ]
+  end
+
+  def application do
+    [extra_applications: UMP.extra_applications(), mod: {:emqx_ds_shared_sub_app, []}]
+  end
+
+  def deps() do
+    [{:emqx, in_umbrella: true}]
+  end
+end

mix.exs

@@ -91,7 +91,8 @@ defmodule EMQXUmbrella.MixProject do
   end
 
   def new_deps() do
-    quicer_dep() ++
+    common_deps() ++
+      quicer_dep() ++
       jq_dep() ++
       extra_release_apps() ++
       overridden_deps()
@@ -161,7 +162,7 @@ defmodule EMQXUmbrella.MixProject do
       common_dep(:bcrypt),
       {:uuid, github: "okeuday/uuid", tag: "v2.0.6", override: true},
       {:quickrand, github: "okeuday/quickrand", tag: "v2.0.6", override: true},
-      {:ra, "2.7.3", override: true},
+      common_dep(:ra),
       {:mimerl, "1.2.0", override: true}
     ]
   end
@@ -196,6 +197,7 @@ defmodule EMQXUmbrella.MixProject do
   def common_dep(:telemetry), do: {:telemetry, "1.1.0", override: true}
   # in conflict by grpc and eetcd
   def common_dep(:gpb), do: {:gpb, "4.19.9", override: true, runtime: false}
+  def common_dep(:ra), do: {:ra, "2.7.3", override: true}
 
   def common_dep(:covertool),
     do: {:covertool, github: "zmstone/covertool", tag: "2.0.4.1", override: true}