diff options
| author | Tristan Sloughter <[email protected]> | 2019-08-19 10:05:23 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-08-19 10:05:23 -0600 |
| commit | 6ba95994c5c070a774cd248286e2b4b4e21274d0 (patch) | |
| tree | 83f79b829f53b241d5742d79bc6d28f3dd8e0848 /src/rlx_prv_overlay.erl | |
| parent | def78e1c07c2ae79b8ba5293365a466e79a88b15 (diff) | |
| parent | 460645219de1fea56e2d6885ec1ce355232c63e4 (diff) | |
| download | relx-6ba95994c5c070a774cd248286e2b4b4e21274d0.tar.gz relx-6ba95994c5c070a774cd248286e2b4b4e21274d0.tar.bz2 relx-6ba95994c5c070a774cd248286e2b4b4e21274d0.zip | |
Merge pull request #749 from g-andrade/feature/api-caller-custom-overlay-vars
Allow for API callers to define arbitrary overlay variables
Diffstat (limited to 'src/rlx_prv_overlay.erl')
| -rw-r--r-- | src/rlx_prv_overlay.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/rlx_prv_overlay.erl b/src/rlx_prv_overlay.erl index 75608b3..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. |