From c14319e5bd00fa67b8ff7209bd7012a3ba92bfa7 Mon Sep 17 00:00:00 2001 From: x1001100011 Date: Wed, 22 Sep 2021 21:52:20 -0700 Subject: [PATCH] feat: remove emqx_release_helper --- apps/emqx_config_helper/.formatter.exs | 4 --- apps/emqx_config_helper/.gitignore | 26 -------------- apps/emqx_config_helper/README.md | 21 ------------ .../lib/emqx_config_helper.ex | 9 ----- .../lib/emqx_config_helper/hocon.ex | 34 ------------------- apps/emqx_config_helper/mix.exs | 30 ---------------- .../test/emqx_config_helper_test.exs | 8 ----- apps/emqx_config_helper/test/test_helper.exs | 1 - .../lib/emqx_release_helper/applications.ex | 4 --- .../lib/emqx_release_helper/overlay.ex | 15 +------- 10 files changed, 1 insertion(+), 151 deletions(-) delete mode 100644 apps/emqx_config_helper/.formatter.exs delete mode 100644 apps/emqx_config_helper/.gitignore delete mode 100644 apps/emqx_config_helper/README.md delete mode 100644 apps/emqx_config_helper/lib/emqx_config_helper.ex delete mode 100644 apps/emqx_config_helper/lib/emqx_config_helper/hocon.ex delete mode 100644 apps/emqx_config_helper/mix.exs delete mode 100644 apps/emqx_config_helper/test/emqx_config_helper_test.exs delete mode 100644 apps/emqx_config_helper/test/test_helper.exs diff --git a/apps/emqx_config_helper/.formatter.exs b/apps/emqx_config_helper/.formatter.exs deleted file mode 100644 index d2cda26ed..000000000 --- a/apps/emqx_config_helper/.formatter.exs +++ /dev/null @@ -1,4 +0,0 @@ -# Used by "mix format" -[ - inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"] -] diff --git a/apps/emqx_config_helper/.gitignore b/apps/emqx_config_helper/.gitignore deleted file mode 100644 index f2013c094..000000000 --- a/apps/emqx_config_helper/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -# The directory Mix will write compiled artifacts to. -/_build/ - -# If you run "mix test --cover", coverage assets end up here. -/cover/ - -# The directory Mix downloads your dependencies sources to. -/deps/ - -# Where third-party dependencies like ExDoc output generated docs. -/doc/ - -# Ignore .fetch files in case you like to edit your project deps locally. -/.fetch - -# If the VM crashes, it generates a dump, let's ignore it too. -erl_crash.dump - -# Also ignore archive artifacts (built via "mix archive.build"). -*.ez - -# Ignore package tarball (built via "mix hex.build"). -emqx_config_helper-*.tar - -# Temporary files, for example, from tests. -/tmp/ diff --git a/apps/emqx_config_helper/README.md b/apps/emqx_config_helper/README.md deleted file mode 100644 index d4b3b9723..000000000 --- a/apps/emqx_config_helper/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# EmqxConfigHelper - -**TODO: Add description** - -## Installation - -If [available in Hex](https://hex.pm/docs/publish), the package can be installed -by adding `emqx_config_helper` to your list of dependencies in `mix.exs`: - -```elixir -def deps do - [ - {:emqx_config_helper, "~> 0.1.0"} - ] -end -``` - -Documentation can be generated with [ExDoc](https://github.com/elixir-lang/ex_doc) -and published on [HexDocs](https://hexdocs.pm). Once published, the docs can -be found at [https://hexdocs.pm/emqx_config_helper](https://hexdocs.pm/emqx_config_helper). - diff --git a/apps/emqx_config_helper/lib/emqx_config_helper.ex b/apps/emqx_config_helper/lib/emqx_config_helper.ex deleted file mode 100644 index 186be4456..000000000 --- a/apps/emqx_config_helper/lib/emqx_config_helper.ex +++ /dev/null @@ -1,9 +0,0 @@ -defmodule EmqxConfigHelper do - def hocon_cli(arg) do - arg - |> String.split() - |> Enum.map(&to_charlist/1) - |> :hocon_cli.main() - :ok - end -end diff --git a/apps/emqx_config_helper/lib/emqx_config_helper/hocon.ex b/apps/emqx_config_helper/lib/emqx_config_helper/hocon.ex deleted file mode 100644 index 4956bf982..000000000 --- a/apps/emqx_config_helper/lib/emqx_config_helper/hocon.ex +++ /dev/null @@ -1,34 +0,0 @@ -defmodule EmqxConfigHelper.Hocon do - def hocon(_application, options) do - {:ok, config} = - options - |> Keyword.fetch!(:config_file) - |> List.wrap() - |> Enum.map(&to_charlist/1) - |> :hocon.files(%{format: :richmap}) - - options - |> Keyword.fetch!(:schema_module) - |> :hocon_schema.generate(config, %{atom_key: true, return_plain: true}) - |> Enum.each(fn {application, envs} -> - Config.config(application, Enum.to_list(envs)) - end) - end -end - -defmodule EmqxConfigHelper.Cuttlefish do - def cuttlefish(application, options) do - config = - options - |> Keyword.fetch!(:config_file) - |> :cuttlefish_conf.file() - - application - |> :code.priv_dir() - |> Path.join("#{application}.schema") - |> List.wrap() - |> :cuttlefish_schema.files() - |> :cuttlefish_generator.map(config) - |> Enum.each(fn {application, envs} -> Config.config(application, envs) end) - end -end diff --git a/apps/emqx_config_helper/mix.exs b/apps/emqx_config_helper/mix.exs deleted file mode 100644 index 90ac774e9..000000000 --- a/apps/emqx_config_helper/mix.exs +++ /dev/null @@ -1,30 +0,0 @@ -defmodule EmqxConfigHelper.MixProject do - use Mix.Project - - def project do - [ - app: :emqx_config_helper, - version: "0.1.0", - build_path: "../../_build", - config_path: "../../config/config.exs", - deps_path: "../../deps", - lockfile: "../../mix.lock", - elixir: "~> 1.12", - start_permanent: Mix.env() == :prod, - deps: deps() - ] - end - - def application do - [ - extra_applications: [:logger] - ] - end - - defp deps do - [ - {:cuttlefish, github: "emqx/cuttlefish", tag: "v4.0.1"}, - {:hocon, github: "emqx/hocon"} - ] - end -end diff --git a/apps/emqx_config_helper/test/emqx_config_helper_test.exs b/apps/emqx_config_helper/test/emqx_config_helper_test.exs deleted file mode 100644 index 0aa7a37b6..000000000 --- a/apps/emqx_config_helper/test/emqx_config_helper_test.exs +++ /dev/null @@ -1,8 +0,0 @@ -defmodule EmqxConfigHelperTest do - use ExUnit.Case - doctest EmqxConfigHelper - - test "greets the world" do - assert EmqxConfigHelper.hello() == :world - end -end diff --git a/apps/emqx_config_helper/test/test_helper.exs b/apps/emqx_config_helper/test/test_helper.exs deleted file mode 100644 index 869559e70..000000000 --- a/apps/emqx_config_helper/test/test_helper.exs +++ /dev/null @@ -1 +0,0 @@ -ExUnit.start() diff --git a/apps/emqx_release_helper/lib/emqx_release_helper/applications.ex b/apps/emqx_release_helper/lib/emqx_release_helper/applications.ex index 8f6b67fbb..a2bc0c6fb 100644 --- a/apps/emqx_release_helper/lib/emqx_release_helper/applications.ex +++ b/apps/emqx_release_helper/lib/emqx_release_helper/applications.ex @@ -100,10 +100,6 @@ defmodule EmqxReleaseHelper.Applications do overlay :application end - application :emqx_config_helper do - start_type :load - end - application :emqx_prometheus, %{release_type: :cloud} do start_type :permanent overlay :application diff --git a/apps/emqx_release_helper/lib/emqx_release_helper/overlay.ex b/apps/emqx_release_helper/lib/emqx_release_helper/overlay.ex index 785b3d687..28aff89b0 100644 --- a/apps/emqx_release_helper/lib/emqx_release_helper/overlay.ex +++ b/apps/emqx_release_helper/lib/emqx_release_helper/overlay.ex @@ -4,7 +4,6 @@ defmodule EmqxReleaseHelper.Overlay do overlay %{release_version: release_version} do mkdir "log" mkdir "etc" - mkdir "etc/plugins" mkdir "data" mkdir "data/mnesia" mkdir "data/configs" @@ -14,22 +13,10 @@ defmodule EmqxReleaseHelper.Overlay do copy "bin/install_upgrade.escript", "bin/install_upgrade.escript" copy "bin/node_dump", "bin/node_dump" - # copy "bin/nodetool", "bin/nodetool" - # copy "bin/nodetool", "bin/nodetool-#{release_version}" - - # copy "bin/emqx", "bin/emqx" - # copy "bin/emqx_ctl", "bin/emqx_ctl" - - # for relup - copy "bin/emqx", "bin/emqx-#{release_version}" - copy "bin/emqx_ctl", "bin/emqx_ctl-#{release_version}" - - copy "bin/install_upgrade.escript", "bin/install_upgrade.escript-#{release_version}" + copy "bin/emqx_ctl", "bin/emqx_ctl" template "data/emqx_vars", "releases/emqx_vars" template "data/BUILT_ON", "releases/#{release_version}/BUILT_ON" - # template "bin/emqx.cmd", "bin/emqx.cmd" - # template "bin/emqx_ctl.cmd", "bin/emqx_ctl.cmd" end def run(release, config) do