Skip to content

Use processed variable file to create merged model for prepare #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 6, 2023
Merged

Use processed variable file to create merged model for prepare #1412

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
113dfc0
Use processed variable file to create merged model for prepare
rakillen Mar 6, 2023
61a27d3
Merge branch 'main' into prepare-missing-variables
rakillen Mar 6, 2023
65dd86d
Renamed variables for clarity
rakillen Mar 6, 2023
b6c361a
Use source variable file for property secret correction
rakillen Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions core/src/main/python/wlsdeploy/tool/prepare/model_preparer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,17 @@ def __walk_attribute(self, model_dict, attribute_name, attribute_location):

self._logger.exiting(class_name=_class_name, method_name=_method_name)

def fix_property_secrets(self, original_variables):
def fix_property_secrets(self):
# Just in case the credential cache has @@PROP in the model's attribute value,
# we use the original variable file to resolve it,
# so that the generated json/script files have the resolved property value(s) instead of the @@PROP token.
# it's possible that the variable file is not specified, or does not exist yet.

original_variables = {}
variable_file = self.model_context.get_variable_file()
if variable_file is not None and os.path.exists(variable_file):
original_variables = variables.load_variables(variable_file)

credential_caches = self.credential_injector.get_variable_cache()
for key in credential_caches:
if variables.is_variable_string(credential_caches[key]):
Expand Down Expand Up @@ -373,15 +378,20 @@ def prepare_models(self):
# resolve variables in the model AFTER the clean and filter has been done,
# but before generating output files.

variable_map = {}
variable_file = self.model_context.get_variable_file()
if variable_file is not None and os.path.exists(variable_file):
variable_map = variables.load_variables(variable_file)
result_variable_map = {}
source_variable_file = self.model_context.get_variable_file()
if source_variable_file:
result_variable_file = os.path.join(self.output_dir, os.path.basename(source_variable_file))
else:
result_variable_file = variables.get_default_variable_file_name(self.model_context)

if os.path.exists(result_variable_file):
result_variable_map = variables.load_variables(result_variable_file)

variables.substitute(merged_model_dictionary, variable_map, self.model_context)
variables.substitute(merged_model_dictionary, result_variable_map, self.model_context)

# correct any secret values that point to @@PROP values
self.fix_property_secrets(variable_map)
self.fix_property_secrets()

# apply final filter changes for the merged model to the last source model
self._apply_final_filters(merged_model_dictionary)
Expand Down