JIRA WDT-426 Use "weblogic" and "password1" as placeholders for target option(#664)

Author: rakillen

core/src/main/python/prepare_model.py

@@ -50,6 +50,7 @@
 from wlsdeploy.util.model_translator import FileToPython
 from wlsdeploy.util.target_configuration import CONFIG_OVERRIDES_SECRETS_METHOD
 from wlsdeploy.util.target_configuration import SECRETS_METHOD
+from wlsdeploy.util.target_configuration_helper import ADMINUSER_PLACEHOLDER
 from wlsdeploy.util.target_configuration_helper import PASSWORD_PLACEHOLDER
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 from wlsdeploy.yaml.yaml_translator import PythonToYaml
@@ -312,7 +313,10 @@ def __substitute_password_with_token(self, model_path, attribute_name, validatio
             # for config override secrets, assign a placeholder password to the attribute.
             # config overrides will be used to override the value in the target domain.
             if credentials_method == CONFIG_OVERRIDES_SECRETS_METHOD:
-                model_value = PASSWORD_PLACEHOLDER
+                if attribute_name == ADMIN_USERNAME:
+                    model_value = ADMINUSER_PLACEHOLDER
+                else:
+                    model_value = PASSWORD_PLACEHOLDER
                 self.cache[cache_key] = ''
 
             if model_value is not None:

core/src/main/python/wlsdeploy/tool/util/variable_injector.py

@@ -20,6 +20,7 @@
 from wlsdeploy.aliases import alias_constants
 from wlsdeploy.aliases.aliases import Aliases
 from wlsdeploy.aliases.location_context import LocationContext
+from wlsdeploy.aliases.model_constants import ADMIN_USERNAME
 from wlsdeploy.aliases.validation_codes import ValidationCodes
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.json.json_translator import JsonToPython
@@ -401,10 +402,13 @@ def _process_attribute(self, model, attribute, location, injector_values):
                     and variable_value == alias_constants.PASSWORD_TOKEN:
                 model[attribute] = target_configuration_helper.format_as_secret_token(variable_name)
 
-            # for config_override_secrets, assign a placeholder password to the attribute
+            # for config_override_secrets, assign a placeholder value to the attribute
             elif credentials_method == CONFIG_OVERRIDES_SECRETS_METHOD \
                     and variable_value == alias_constants.PASSWORD_TOKEN:
-                model[attribute] = target_configuration_helper.PASSWORD_PLACEHOLDER
+                if attribute == ADMIN_USERNAME:
+                    model[attribute] = target_configuration_helper.ADMINUSER_PLACEHOLDER
+                else:
+                    model[attribute] = target_configuration_helper.PASSWORD_PLACEHOLDER
 
             else:
                 model[attribute] = _format_as_property(variable_name)

core/src/main/python/wlsdeploy/util/target_configuration_helper.py

@@ -37,8 +37,9 @@
 USER_TAG = "<user>"
 PASSWORD_TAG = "<password>"
 
-# password placeholder for config override secrets
-PASSWORD_PLACEHOLDER = "password"
+# placeholders for config override secrets
+ADMINUSER_PLACEHOLDER = "weblogic"
+PASSWORD_PLACEHOLDER = "password1"
 
 _jdbc_pattern = re.compile("^JDBC\\.([ \\w.-]+)\\.PasswordEncrypted$")