Skip to content

Remove default for WDT_MODEL_SECRETS_DIRS, skip check if not specified #581

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 3 commits into from
Apr 2, 2020
Merged

Remove default for WDT_MODEL_SECRETS_DIRS, skip check if not specified #581

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bc59ad
Log at INFO level if WDT_MODEL_SECRETS_DIRS directory does not exist
rakillen Apr 2, 2020
cdeccfc
Remove default value for WDT_MODEL_SECRETS_DIRS, skip if not set
rakillen Apr 2, 2020
bb742bd
Merge branch 'master' into secrets-dir-log-info
ddsharpe Apr 2, 2020
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
25 changes: 13 additions & 12 deletions core/src/main/python/wlsdeploy/util/variables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
_unresolved_token_pattern = re.compile("(@@(PROP|FILE|ENV|SECRET):)")

_secret_dirs_variable = "WDT_MODEL_SECRETS_DIRS"
_secret_dirs_default = "/weblogic-operator/config-overrides-secrets"
_secret_dir_pairs_variable="WDT_MODEL_SECRETS_NAME_DIR_PAIRS"

_secret_token_map = None
Expand Down Expand Up @@ -355,17 +354,19 @@ def _init_secret_token_map(model_context):

# add name/key pairs for files in sub-directories of directories in WDT_MODEL_SECRETS_DIRS.

locations = os.environ.get(_secret_dirs_variable, _secret_dirs_default)
for dir in locations.split(","):
if not os.path.isdir(dir):
# log at WARN or INFO, but no exception is thrown
log_method('WLSDPLY-01738', _secret_dirs_variable, dir, class_name=_class_name, method_name=method_name)
continue

for subdir_name in os.listdir(dir):
subdir_path = os.path.join(dir, subdir_name)
if os.path.isdir(subdir_path):
_add_file_secrets_to_map(subdir_path, subdir_name, model_context)
locations = os.environ.get(_secret_dirs_variable, None)
if locations is not None:
for dir in locations.split(","):
if not os.path.isdir(dir):
# log at WARN or INFO, but no exception is thrown
log_method('WLSDPLY-01738', _secret_dirs_variable, dir, class_name=_class_name,
method_name=method_name)
continue

for subdir_name in os.listdir(dir):
subdir_path = os.path.join(dir, subdir_name)
if os.path.isdir(subdir_path):
_add_file_secrets_to_map(subdir_path, subdir_name, model_context)

# add name/key pairs for files in directories assigned in WDT_MODEL_SECRETS_NAME_DIR_PAIRS.
# these pairs will override if they were previously added as sub-directory pairs.
Expand Down