From ee9ad07748b823f4e2d951b1c5bba8310ff09bb4 Mon Sep 17 00:00:00 2001 From: Guilherme Andrade Date: Thu, 15 Aug 2019 20:31:42 +0100 Subject: Allow for API callers to define arbitrary overlay variables --- src/rlx_prv_overlay.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/rlx_prv_overlay.erl') diff --git a/src/rlx_prv_overlay.erl b/src/rlx_prv_overlay.erl index 75608b3..5ba3f75 100644 --- a/src/rlx_prv_overlay.erl +++ b/src/rlx_prv_overlay.erl @@ -273,7 +273,8 @@ generate_state_vars(State) -> erlang:atom_to_list(Name1); {Name1, Vsn1} -> erlang:atom_to_list(Name1) ++ "-" ++ Vsn1 - end}]. + end} + | rlx_state:api_caller_overlays(State)]. -spec do_overlay(rlx_state:t(), list(), proplists:proplist()) -> {ok, rlx_state:t()} | relx:error(). -- cgit v1.2.3 From 460645219de1fea56e2d6885ec1ce355232c63e4 Mon Sep 17 00:00:00 2001 From: Guilherme Andrade Date: Sat, 17 Aug 2019 14:49:29 +0100 Subject: Keep expected overlay behaviour - make API overlays the lesser authority --- src/rlx_prv_overlay.erl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/rlx_prv_overlay.erl') diff --git a/src/rlx_prv_overlay.erl b/src/rlx_prv_overlay.erl index 5ba3f75..ec8a97f 100644 --- a/src/rlx_prv_overlay.erl +++ b/src/rlx_prv_overlay.erl @@ -152,10 +152,15 @@ get_overlay_vars_from_file(State, OverlayVars) -> -spec read_overlay_vars(rlx_state:t(), proplists:proplist(), [file:name()]) -> proplists:proplist() | relx:error(). read_overlay_vars(State, OverlayVars, FileNames) -> + ApiCallerVars = rlx_state:api_caller_overlays(State), Terms = merge_overlay_vars(State, FileNames), - case render_overlay_vars(OverlayVars, Terms, []) of + case render_overlay_vars(OverlayVars ++ ApiCallerVars, Terms, []) of {ok, NewTerms} -> - OverlayVars ++ NewTerms; + % We place `ApiCallerVars' at the end on purpose; their + % definitions should be overwrittenable by both internal + % and rendered vars, as not to change behaviour in + % setups preceding the support for API caller overlays. + OverlayVars ++ NewTerms ++ ApiCallerVars; Error -> Error end. @@ -273,8 +278,7 @@ generate_state_vars(State) -> erlang:atom_to_list(Name1); {Name1, Vsn1} -> erlang:atom_to_list(Name1) ++ "-" ++ Vsn1 - end} - | rlx_state:api_caller_overlays(State)]. + end}]. -spec do_overlay(rlx_state:t(), list(), proplists:proplist()) -> {ok, rlx_state:t()} | relx:error(). -- cgit v1.2.3