From 4df2e0be85c4eb4087c26e0771cf8a1e39ce1e56 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Tue, 2 Jul 2024 10:01:14 -0300 Subject: [PATCH] fix: bad rebase conflict resolution --- apps/emqx_bridge_azure_blob_storage/mix.exs | 34 ------------------ apps/emqx_cluster_link/mix.exs | 32 ----------------- apps/emqx_ds_backends/mix.exs | 36 ------------------- apps/emqx_ds_builtin_local/mix.exs | 33 ----------------- apps/emqx_ds_builtin_raft/mix.exs | 27 -------------- apps/emqx_ds_shared_sub/mix.exs | 27 -------------- .../test/emqx_schema_registry_SUITE.erl | 20 ++++++++--- .../emqx_schema_registry_http_api_SUITE.erl | 20 ++++++++--- mix.exs | 6 +--- 9 files changed, 31 insertions(+), 204 deletions(-) delete mode 100644 apps/emqx_bridge_azure_blob_storage/mix.exs delete mode 100644 apps/emqx_cluster_link/mix.exs delete mode 100644 apps/emqx_ds_backends/mix.exs delete mode 100644 apps/emqx_ds_builtin_local/mix.exs delete mode 100644 apps/emqx_ds_builtin_raft/mix.exs delete mode 100644 apps/emqx_ds_shared_sub/mix.exs diff --git a/apps/emqx_bridge_azure_blob_storage/mix.exs b/apps/emqx_bridge_azure_blob_storage/mix.exs deleted file mode 100644 index acbcfd65d..000000000 --- a/apps/emqx_bridge_azure_blob_storage/mix.exs +++ /dev/null @@ -1,34 +0,0 @@ -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 diff --git a/apps/emqx_cluster_link/mix.exs b/apps/emqx_cluster_link/mix.exs deleted file mode 100644 index dd014e4df..000000000 --- a/apps/emqx_cluster_link/mix.exs +++ /dev/null @@ -1,32 +0,0 @@ -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}, - {:emqtt, - github: "emqx/emqtt", tag: "1.10.1", override: true, system_env: UMP.maybe_no_quic_env()} - ] - end -end diff --git a/apps/emqx_ds_backends/mix.exs b/apps/emqx_ds_backends/mix.exs deleted file mode 100644 index e2573c585..000000000 --- a/apps/emqx_ds_backends/mix.exs +++ /dev/null @@ -1,36 +0,0 @@ -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 diff --git a/apps/emqx_ds_builtin_local/mix.exs b/apps/emqx_ds_builtin_local/mix.exs deleted file mode 100644 index 4145c0601..000000000 --- a/apps/emqx_ds_builtin_local/mix.exs +++ /dev/null @@ -1,33 +0,0 @@ -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 diff --git a/apps/emqx_ds_builtin_raft/mix.exs b/apps/emqx_ds_builtin_raft/mix.exs deleted file mode 100644 index dd4c6313e..000000000 --- a/apps/emqx_ds_builtin_raft/mix.exs +++ /dev/null @@ -1,27 +0,0 @@ -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}, {:ra, "2.7.3"}] - end -end diff --git a/apps/emqx_ds_shared_sub/mix.exs b/apps/emqx_ds_shared_sub/mix.exs deleted file mode 100644 index 866c079d7..000000000 --- a/apps/emqx_ds_shared_sub/mix.exs +++ /dev/null @@ -1,27 +0,0 @@ -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 diff --git a/apps/emqx_schema_registry/test/emqx_schema_registry_SUITE.erl b/apps/emqx_schema_registry/test/emqx_schema_registry_SUITE.erl index 7d538c51f..a403c3976 100644 --- a/apps/emqx_schema_registry/test/emqx_schema_registry_SUITE.erl +++ b/apps/emqx_schema_registry/test/emqx_schema_registry_SUITE.erl @@ -47,12 +47,22 @@ sparkplug_tests() -> ]. init_per_suite(Config) -> - emqx_config:save_schema_mod_and_names(emqx_schema_registry_schema), - emqx_mgmt_api_test_util:init_suite(?APPS), - Config. + Apps = emqx_cth_suite:start( + [ + emqx, + emqx_conf, + emqx_rule_engine, + emqx_schema_registry, + emqx_management, + emqx_mgmt_api_test_util:emqx_dashboard() + ], + #{work_dir => emqx_cth_suite:work_dir(Config)} + ), + [{apps, Apps} | Config]. -end_per_suite(_Config) -> - emqx_mgmt_api_test_util:end_suite(lists:reverse(?APPS)), +end_per_suite(Config) -> + Apps = ?config(apps, Config), + emqx_cth_suite:stop(Apps), ok. init_per_group(avro, Config) -> diff --git a/apps/emqx_schema_registry/test/emqx_schema_registry_http_api_SUITE.erl b/apps/emqx_schema_registry/test/emqx_schema_registry_http_api_SUITE.erl index 21c93b276..dfba3d1cd 100644 --- a/apps/emqx_schema_registry/test/emqx_schema_registry_http_api_SUITE.erl +++ b/apps/emqx_schema_registry/test/emqx_schema_registry_http_api_SUITE.erl @@ -36,12 +36,22 @@ groups() -> ]. init_per_suite(Config) -> - emqx_config:save_schema_mod_and_names(emqx_schema_registry_schema), - emqx_mgmt_api_test_util:init_suite(?APPS), - Config. + Apps = emqx_cth_suite:start( + [ + emqx, + emqx_conf, + emqx_rule_engine, + emqx_schema_registry, + emqx_management, + emqx_mgmt_api_test_util:emqx_dashboard() + ], + #{work_dir => emqx_cth_suite:work_dir(Config)} + ), + [{apps, Apps} | Config]. -end_per_suite(_Config) -> - emqx_mgmt_api_test_util:end_suite(lists:reverse(?APPS)), +end_per_suite(Config) -> + Apps = ?config(apps, Config), + emqx_cth_suite:stop(Apps), ok. init_per_group(avro, Config) -> diff --git a/mix.exs b/mix.exs index ce2b9ab91..8a27f0ba1 100644 --- a/mix.exs +++ b/mix.exs @@ -215,7 +215,6 @@ defmodule EMQXUmbrella.MixProject do :emqx_license, :emqx_s3, :emqx_bridge_s3, - :emqx_bridge_azure_blob_storage, :emqx_schema_registry, :emqx_schema_validation, :emqx_message_transformation, @@ -230,10 +229,7 @@ defmodule EMQXUmbrella.MixProject do :emqx_gateway_ocpp, :emqx_gateway_jt808, :emqx_bridge_syskeeper, - :emqx_ds_shared_sub, - :emqx_auth_ext, - :emqx_cluster_link, - :emqx_ds_builtin_raft + :emqx_auth_ext ]) end