From deff42957921aac8cb16f6a470df0a5447a1cddb Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Wed, 14 Sep 2022 17:26:48 -0300 Subject: [PATCH] chore: unify default license references in fn --- .../emqx_license/src/emqx_license_schema.erl | 18 +++++++++++++----- .../test/emqx_license_test_lib.erl | 4 +--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib-ee/emqx_license/src/emqx_license_schema.erl b/lib-ee/emqx_license/src/emqx_license_schema.erl index b2981992d..4300963fd 100644 --- a/lib-ee/emqx_license/src/emqx_license_schema.erl +++ b/lib-ee/emqx_license/src/emqx_license_schema.erl @@ -16,6 +16,7 @@ -export([roots/0, fields/1, validations/0, desc/1]). -export([ + default_license/0, key_license/0 ]). @@ -34,11 +35,7 @@ fields(key_license) -> [ {key, #{ type => string(), - default => - "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KZ" - "GVmYXVsdAoyMDIyMDQxOQoxODI1CjEwMDAK.MEQCICbgRVijCQov2" - "hrvZXR1mk9Oa+tyV1F5oJ6iOZeSHjnQAiB9dUiVeaZekDOjztk+NC" - "Wjhk4PG8tWfw2uFZWruSzD6g==", + default => default_license(), %% so it's not logged sensitive => true, required => true, @@ -78,3 +75,14 @@ check_license_watermark(Conf) -> false -> {bad_license_watermark, #{high => High, low => Low}} end end. + +%% @doc The default license key. +%% This default license has 1000 connections limit. +%% It is issued on 2022-04-19 and valid for 5 years (1825 days) +%% NOTE: when updating a new key, the schema doc in emqx_license_schema_i18n.conf +%% should be updated accordingly +default_license() -> + "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KZ" + "GVmYXVsdAoyMDIyMDQxOQoxODI1CjEwMDAK.MEQCICbgRVijCQov2" + "hrvZXR1mk9Oa+tyV1F5oJ6iOZeSHjnQAiB9dUiVeaZekDOjztk+NC" + "Wjhk4PG8tWfw2uFZWruSzD6g==". diff --git a/lib-ee/emqx_license/test/emqx_license_test_lib.erl b/lib-ee/emqx_license/test/emqx_license_test_lib.erl index acc230d53..008db1b41 100644 --- a/lib-ee/emqx_license/test/emqx_license_test_lib.erl +++ b/lib-ee/emqx_license/test/emqx_license_test_lib.erl @@ -77,6 +77,4 @@ make_license(Values) -> iolist_to_binary([EncodedText, ".", EncodedSignature]). default_license() -> - %% keep it the same as in emqx_license_schema.erl - "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KZGVmYXVsdAoyMDIyMDQxOQoxODI1CjEwMDAK." - "MEQCICbgRVijCQov2hrvZXR1mk9Oa+tyV1F5oJ6iOZeSHjnQAiB9dUiVeaZekDOjztk+NCWjhk4PG8tWfw2uFZWruSzD6g==". + emqx_license_schema:default_license().