From 9fcab5d99727e6d2e2c310a37784b165c191dcc7 Mon Sep 17 00:00:00 2001 From: jan shahid shaik Date: Thu, 19 Sep 2024 15:03:29 +0530 Subject: [PATCH 1/3] Implementation of license enforcement application Signed-off-by: jan shahid shaik --- src/oc_erchef/apps/chef_license/.gitignore | 19 ++ src/oc_erchef/apps/chef_license/LICENSE | 191 ++++++++++++++++++ src/oc_erchef/apps/chef_license/README.md | 9 + src/oc_erchef/apps/chef_license/rebar.config | 7 + .../chef_license/src/chef_license.app.src | 15 ++ .../apps/chef_license/src/chef_license.erl | 6 + .../chef_license/src/chef_license_app.erl | 18 ++ .../chef_license/src/chef_license_sup.erl | 37 ++++ .../chef_license/src/chef_license_worker.erl | 141 +++++++++++++ .../test/chef_license_worker_test.erl | 64 ++++++ src/oc_erchef/src/oc_erchef.app.src | 3 +- 11 files changed, 509 insertions(+), 1 deletion(-) create mode 100644 src/oc_erchef/apps/chef_license/.gitignore create mode 100644 src/oc_erchef/apps/chef_license/LICENSE create mode 100644 src/oc_erchef/apps/chef_license/README.md create mode 100644 src/oc_erchef/apps/chef_license/rebar.config create mode 100644 src/oc_erchef/apps/chef_license/src/chef_license.app.src create mode 100644 src/oc_erchef/apps/chef_license/src/chef_license.erl create mode 100644 src/oc_erchef/apps/chef_license/src/chef_license_app.erl create mode 100644 src/oc_erchef/apps/chef_license/src/chef_license_sup.erl create mode 100644 src/oc_erchef/apps/chef_license/src/chef_license_worker.erl create mode 100644 src/oc_erchef/apps/chef_license/test/chef_license_worker_test.erl diff --git a/src/oc_erchef/apps/chef_license/.gitignore b/src/oc_erchef/apps/chef_license/.gitignore new file mode 100644 index 0000000000..f1c4554518 --- /dev/null +++ b/src/oc_erchef/apps/chef_license/.gitignore @@ -0,0 +1,19 @@ +.rebar3 +_* +.eunit +*.o +*.beam +*.plt +*.swp +*.swo +.erlang.cookie +ebin +log +erl_crash.dump +.rebar +logs +_build +.idea +*.iml +rebar3.crashdump +*~ diff --git a/src/oc_erchef/apps/chef_license/LICENSE b/src/oc_erchef/apps/chef_license/LICENSE new file mode 100644 index 0000000000..28d60dcbc7 --- /dev/null +++ b/src/oc_erchef/apps/chef_license/LICENSE @@ -0,0 +1,191 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2024, jan shahid shaik . + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/src/oc_erchef/apps/chef_license/README.md b/src/oc_erchef/apps/chef_license/README.md new file mode 100644 index 0000000000..b2139a0cf9 --- /dev/null +++ b/src/oc_erchef/apps/chef_license/README.md @@ -0,0 +1,9 @@ +chef_license +===== + +An OTP application + +Build +----- + + $ rebar3 compile diff --git a/src/oc_erchef/apps/chef_license/rebar.config b/src/oc_erchef/apps/chef_license/rebar.config new file mode 100644 index 0000000000..e9c2f68cac --- /dev/null +++ b/src/oc_erchef/apps/chef_license/rebar.config @@ -0,0 +1,7 @@ +{erl_opts, [debug_info]}. +{deps, []}. + +{shell, [ + % {config, "config/sys.config"}, + {apps, [chef_license]} +]}. diff --git a/src/oc_erchef/apps/chef_license/src/chef_license.app.src b/src/oc_erchef/apps/chef_license/src/chef_license.app.src new file mode 100644 index 0000000000..17fe19d4c6 --- /dev/null +++ b/src/oc_erchef/apps/chef_license/src/chef_license.app.src @@ -0,0 +1,15 @@ +{application, chef_license, + [{description, "An OTP application"}, + {vsn, "0.1.0"}, + {registered, []}, + {mod, {chef_license_app, []}}, + {applications, + [kernel, + stdlib + ]}, + {env,[]}, + {modules, []}, + + {licenses, ["Apache-2.0"]}, + {links, []} + ]}. diff --git a/src/oc_erchef/apps/chef_license/src/chef_license.erl b/src/oc_erchef/apps/chef_license/src/chef_license.erl new file mode 100644 index 0000000000..52f5e04844 --- /dev/null +++ b/src/oc_erchef/apps/chef_license/src/chef_license.erl @@ -0,0 +1,6 @@ +-module(chef_license). + +-export([get_license/0]). + +get_license()-> + chef_license_worker:get_license(). \ No newline at end of file diff --git a/src/oc_erchef/apps/chef_license/src/chef_license_app.erl b/src/oc_erchef/apps/chef_license/src/chef_license_app.erl new file mode 100644 index 0000000000..3bf8d90ce5 --- /dev/null +++ b/src/oc_erchef/apps/chef_license/src/chef_license_app.erl @@ -0,0 +1,18 @@ +%%%------------------------------------------------------------------- +%% @doc chef_license public API +%% @end +%%%------------------------------------------------------------------- + +-module(chef_license_app). + +-behaviour(application). + +-export([start/2, stop/1]). + +start(_StartType, _StartArgs) -> + chef_license_sup:start_link(). + +stop(_State) -> + ok. + +%% internal functions diff --git a/src/oc_erchef/apps/chef_license/src/chef_license_sup.erl b/src/oc_erchef/apps/chef_license/src/chef_license_sup.erl new file mode 100644 index 0000000000..8e337a72bb --- /dev/null +++ b/src/oc_erchef/apps/chef_license/src/chef_license_sup.erl @@ -0,0 +1,37 @@ +%%%------------------------------------------------------------------- +%% @doc chef_license top level supervisor. +%% @end +%%%------------------------------------------------------------------- + +-module(chef_license_sup). + +-behaviour(supervisor). + +-export([start_link/0]). + +-export([init/1]). + +-define(SERVER, ?MODULE). + +start_link() -> + supervisor:start_link({local, ?SERVER}, ?MODULE, []). + +%% sup_flags() = #{strategy => strategy(), % optional +%% intensity => non_neg_integer(), % optional +%% period => pos_integer()} % optional +%% child_spec() = #{id => child_id(), % mandatory +%% start => mfargs(), % mandatory +%% restart => restart(), % optional +%% shutdown => shutdown(), % optional +%% type => worker(), % optional +%% modules => modules()} % optional +init([]) -> + SupFlags = #{strategy => one_for_all, + intensity => 0, + period => 1}, + ChildSpecs = [{chef_license_worker, + {chef_license_worker, start_link, []}, + permanent, 5000, supervisor, [chef_license_worker]}], + {ok, {SupFlags, ChildSpecs}}. + +%% internal functions diff --git a/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl b/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl new file mode 100644 index 0000000000..6c595b452f --- /dev/null +++ b/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl @@ -0,0 +1,141 @@ +-module(chef_license_worker). + +-behaviour(gen_server). + +-include("../../../include/chef_types.hrl"). + +-export([ + start_link/0, + get_license/0, + test_license/0 +]). + +-ifdef(TEST). +-export([refresh_license/0]). +-endif. + +-export([ + init/1, + handle_call/3, + handle_cast/2, + handle_info/2, + code_change/2, + terminate/2 +]). + +-record(state, { + scanned_time, + grace_period, + license_cache, + message +}). + +-define(DEFAULT_LICENSE_SCAN_INTERVAL, 30000). %milli seconds + +-define(DEFAULT_FILE_PATH, "/tmp/lic"). + +-define(LICENSE_SCAN_CMD, "chef-automate license status --result-json "). + + +%%% ====================================== +%%% Exported +%%% ====================================== + +start_link() -> + gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). + +get_license()-> + gen_server:call(?MODULE, get_license). + +refresh_license()-> + erlang:send(?MODULE, check_license). + +%%% ====================================== +%%% Gen Server callbacks +%%% ====================================== +init(_Config) -> + State = check_license(#state{}), + erlang:send_after(?DEFAULT_LICENSE_SCAN_INTERVAL, self(), check_license), + {ok, State}. + +handle_call(get_license, _From, #state{license_cache = Lic, grace_period = GracePeriod, message = Msg} = State) -> + {reply,{Lic, GracePeriod, Msg}, State}; + +handle_call(_Message, _From, State) -> + {noreply, State}. + +handle_cast(_Message, State) -> + {noreply, State}. + +handle_info(check_license, State)-> + State1 = check_license(State), + erlang:send_after(?DEFAULT_LICENSE_SCAN_INTERVAL, self(), check_license), + {noreply,State1}; + +handle_info(_Message, State) -> + {noreply, State}. + +code_change(_OldVsn, State) -> + {noreply, State}. + +terminate(_Reason, _State) -> + ok. + +%%% ===================== +%%% Internal functions +%%% ===================== +check_license(State) -> + JsonStr = + case catch get_license_info() of + Result when is_list(Result) -> Result; + {'EXIT', _} -> <<"">> + end, + case process_license(JsonStr) of + {ok, valid_license} -> State#state{license_cache=valid, grace_period=undefined, scanned_time = erlang:timestamp()}; + {ok, expired} -> State#state{license_cache=expired, grace_period=undefined, scanned_time = erlang:timestamp()}; + {ok, valid_license, grace_period} -> State#state{license_cache=valid, grace_period=true, scanned_time = erlang:timestamp()}; + {error, _} -> State + end. + +get_license_info() -> + os:cmd(?LICENSE_SCAN_CMD ++ ?DEFAULT_FILE_PATH), + {ok, Bin} = file:read_file(?DEFAULT_FILE_PATH), + {JsonStr} = jiffy:decode(Bin), + JsonStr. + +process_license(<<"">>)-> + {error, invalid_json}; +process_license(LicJson) -> + case ej:get({<<"result">>}, LicJson) of + {LicDetails} -> + case ej:get({<<"expiration_date">>}, LicDetails) of + {[{<<"seconds">>,ExpireInSeconds}]} -> + case os:system_time(second) < ExpireInSeconds of + true -> {ok, valid_license}; + _ -> + case ej:get({<<"license_type">>}, LicDetails) of + <<"commercial">> -> + case ej:get({<<"grace_period">>}, LicDetails) of + true -> + %% WARNING + {ok, valid_license, grace_period}; + _ -> + %% MSG + { ok, expired} + end; + _ -> + {ok, expired} + end + end; + _ -> + {error, invalid_response} + end; + _ -> + {error, invalid_response} + end. + +%%% ============================= +%%% Sample license response +%%% ============================= +test_license()-> + {ok,<<"{\"command\":\"chef-automate license status --result-json /tmp/string3\",\"status\":\"OK\",\"error_code\":0,\"error_description\":\"\",\"error_cause\":\"\",\"error_stack_trace\":\"\",\"error_recovery\":\"\",\"error_type\":\"\",\"result\":{\"set\":true,\"license_id\":\"6541d90a-2ed0-4d64-9861-c20fc21a3093\",\"customer_name\":\"janshahid.shaik@progress.com\",\"expiration_date\":{\"seconds\":1735689599},\"deployment_id\":\"0b9907b3-45d2-4faa-b04e-b76e31ba70e5\",\"deployment_type\":\"Standalone\",\"license_type\":\"trial\",\"deployment_at\":{\"seconds\":1727067698}}}">>}. \ No newline at end of file diff --git a/src/oc_erchef/apps/chef_license/test/chef_license_worker_test.erl b/src/oc_erchef/apps/chef_license/test/chef_license_worker_test.erl new file mode 100644 index 0000000000..d6ca2a16f3 --- /dev/null +++ b/src/oc_erchef/apps/chef_license/test/chef_license_worker_test.erl @@ -0,0 +1,64 @@ +-module(chef_license_worker_test). + +-include_lib("eunit/include/eunit.hrl"). + +-export([]). + +-define(DEFAULT_FILE_PATH, "/tmp/lic"). + +-define(DEFAULT_CONFIG, []). + +get_commercial_license()-> + <<"{\"command\":\"chef-automate license status --result-json /tmp/string3\",\"status\":\"OK\",\"error_code\":0,\"error_description\":\"\",\"error_cause\":\"\",\"error_stack_trace\":\"\",\"error_recovery\":\"\",\"error_type\":\"\",\"result\":{\"set\":true,\"license_id\":\"6541d90a-2ed0-4d64-9861-c20fc21a3093\",\"customer_name\":\"janshahid.shaik@progress.com\",\"expiration_date\":{\"seconds\":1835689599},\"deployment_id\":\"fa7cce37-d8b3-4542-ad38-2e587a05faec\",\"deployment_type\":\"Standalone\",\"license_type\":\"commercial\",\"deployment_at\":{\"seconds\":1727169083}}}">>. + +get_commercial_license_expired()-> + <<"{\"command\":\"chef-automate license status --result-json /tmp/string3\",\"status\":\"OK\",\"error_code\":0,\"error_description\":\"\",\"error_cause\":\"\",\"error_stack_trace\":\"\",\"error_recovery\":\"\",\"error_type\":\"\",\"result\":{\"set\":true,\"license_id\":\"6541d90a-2ed0-4d64-9861-c20fc21a3093\",\"customer_name\":\"janshahid.shaik@progress.com\",\"expiration_date\":{\"seconds\":1635689599},\"deployment_id\":\"fa7cce37-d8b3-4542-ad38-2e587a05faec\",\"deployment_type\":\"Standalone\",\"license_type\":\"commercial\",\"deployment_at\":{\"seconds\":1727169083}}}">>. + +get_commercial_grace_license()-> + <<"{\"command\":\"chef-automate license status --result-json /tmp/string3\",\"status\":\"OK\",\"error_code\":0,\"error_description\":\"\",\"error_cause\":\"\",\"error_stack_trace\":\"\",\"error_recovery\":\"\",\"error_type\":\"\",\"result\":{\"set\":true,\"grace_period\":true,\"license_id\":\"6541d90a-2ed0-4d64-9861-c20fc21a3093\",\"customer_name\":\"janshahid.shaik@progress.com\",\"expiration_date\":{\"seconds\":1635689599},\"deployment_id\":\"fa7cce37-d8b3-4542-ad38-2e587a05faec\",\"deployment_type\":\"Standalone\",\"license_type\":\"commercial\",\"deployment_at\":{\"seconds\":1727169083}}}">>. + +get_trail_license()-> + <<"{\"command\":\"chef-automate license status --result-json /tmp/string3\",\"status\":\"OK\",\"error_code\":0,\"error_description\":\"\",\"error_cause\":\"\",\"error_stack_trace\":\"\",\"error_recovery\":\"\",\"error_type\":\"\",\"result\":{\"set\":true,\"grace_period\":true,\"license_id\":\"6541d90a-2ed0-4d64-9861-c20fc21a3093\",\"customer_name\":\"janshahid.shaik@progress.com\",\"expiration_date\":{\"seconds\":1835689599},\"deployment_id\":\"fa7cce37-d8b3-4542-ad38-2e587a05faec\",\"deployment_type\":\"Standalone\",\"license_type\":\"trail\",\"deployment_at\":{\"seconds\":1727169083}}}">>. + +get_trail_license_expired()-> + <<"{\"command\":\"chef-automate license status --result-json /tmp/string3\",\"status\":\"OK\",\"error_code\":0,\"error_description\":\"\",\"error_cause\":\"\",\"error_stack_trace\":\"\",\"error_recovery\":\"\",\"error_type\":\"\",\"result\":{\"set\":true,\"grace_period\":true,\"license_id\":\"6541d90a-2ed0-4d64-9861-c20fc21a3093\",\"customer_name\":\"janshahid.shaik@progress.com\",\"expiration_date\":{\"seconds\":1635689599},\"deployment_id\":\"fa7cce37-d8b3-4542-ad38-2e587a05faec\",\"deployment_type\":\"Standalone\",\"license_type\":\"trail\",\"deployment_at\":{\"seconds\":1727169083}}}">>. + +license_test()-> + application:start(chef_license), + file:write_file(?DEFAULT_FILE_PATH,get_commercial_license()), + refresh_license(), + timer:sleep(100), + Result = chef_license_worker:get_license(), + ?assertEqual({valid,undefined, undefined}, Result), + os:cmd("rm -rf " ++ ?DEFAULT_FILE_PATH), + + file:write_file(?DEFAULT_FILE_PATH,get_commercial_license_expired()), + refresh_license(), + timer:sleep(100), + Result1 = chef_license_worker:get_license(), + ?assertEqual({expired,undefined, undefined}, Result1), + os:cmd("rm -rf " ++ ?DEFAULT_FILE_PATH), + + file:write_file(?DEFAULT_FILE_PATH,get_commercial_grace_license()), + refresh_license(), + timer:sleep(100), + Result2 = chef_license_worker:get_license(), + ?assertEqual({valid,true,undefined}, Result2), + os:cmd("rm -rf " ++ ?DEFAULT_FILE_PATH), + + file:write_file(?DEFAULT_FILE_PATH,get_trail_license()), + refresh_license(), + timer:sleep(100), + Result3 = chef_license_worker:get_license(), + ?assertEqual({valid, undefined, undefined}, Result3), + os:cmd("rm -rf " ++ ?DEFAULT_FILE_PATH), + + file:write_file(?DEFAULT_FILE_PATH,get_trail_license_expired()), + refresh_license(), + timer:sleep(100), + Result4 = chef_license_worker:get_license(), + ?assertEqual({expired, undefined, undefined}, Result4), + os:cmd("rm -rf " ++ ?DEFAULT_FILE_PATH). + +refresh_license()-> + erlang:send(chef_license_worker, check_license). \ No newline at end of file diff --git a/src/oc_erchef/src/oc_erchef.app.src b/src/oc_erchef/src/oc_erchef.app.src index 4395947ecc..bf07476705 100644 --- a/src/oc_erchef/src/oc_erchef.app.src +++ b/src/oc_erchef/src/oc_erchef.app.src @@ -32,7 +32,8 @@ oc_chef_authz, oc_chef_wm, data_collector, - chef_telemetry + chef_telemetry, + chef_license ]}, {applications, [lager, chef_secrets, From 1f1537786194eb1225e2d21142117bfae3e3decf Mon Sep 17 00:00:00 2001 From: jan shahid shaik Date: Wed, 25 Sep 2024 14:34:21 +0530 Subject: [PATCH 2/3] Fixing pipeline issues Signed-off-by: jan shahid shaik --- src/oc_erchef/apps/chef_license/src/chef_license_worker.erl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl b/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl index 6c595b452f..a49c4f3937 100644 --- a/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl +++ b/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl @@ -47,9 +47,6 @@ start_link() -> get_license()-> gen_server:call(?MODULE, get_license). -refresh_license()-> - erlang:send(?MODULE, check_license). - %%% ====================================== %%% Gen Server callbacks %%% ====================================== @@ -85,7 +82,7 @@ terminate(_Reason, _State) -> %%% Internal functions %%% ===================== check_license(State) -> - JsonStr = + JsonStr = case catch get_license_info() of Result when is_list(Result) -> Result; {'EXIT', _} -> <<"">> From 796cc36c36783b15407d3794fe18530292443fb3 Mon Sep 17 00:00:00 2001 From: jan shahid shaik Date: Wed, 25 Sep 2024 14:39:07 +0530 Subject: [PATCH 3/3] Fixing pipeline issues Signed-off-by: jan shahid shaik --- src/oc_erchef/apps/chef_license/src/chef_license_worker.erl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl b/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl index a49c4f3937..18a3ad1938 100644 --- a/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl +++ b/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl @@ -10,10 +10,6 @@ test_license/0 ]). --ifdef(TEST). --export([refresh_license/0]). --endif. - -export([ init/1, handle_call/3,