Merge branch 'wdt-665' into 'main'

Wdt 665

See merge request weblogic-cloud/weblogic-deploy-tooling!1518

Author: robertpatrick

core/src/main/python/create.py

@@ -378,8 +378,6 @@ def main(model_context):
             domain_path = _get_domain_path(model_context, model_dictionary)
             archive_helper = ArchiveHelper(archive_file_name, domain_path, __logger, ExceptionType.CREATE)
 
-        has_atp, has_ssl = validate_rcu_args_and_model(model_context, model_dictionary, archive_helper, aliases)
-
         if archive_helper:
             domain_parent = model_context.get_domain_parent_dir()
             domain_home = model_context.get_domain_home()
@@ -390,6 +388,8 @@ def main(model_context):
 
             archive_helper.extract_all_database_wallets()
 
+        has_atp, has_ssl = validate_rcu_args_and_model(model_context, model_dictionary, archive_helper, aliases)
+
         creator = DomainCreator(model_dictionary, model_context, aliases)
 
         rcu_db_info = rcudbinfo_helper.create(model_dictionary, model_context, aliases)

core/src/main/python/wlsdeploy/tool/create/atp_helper.py

@@ -43,10 +43,12 @@ def set_ssl_properties(xml_doc, atp_creds_path, keystore_password, truststore_pa
             else:
                 set_property(dom_tree, prop, 'javax.net.ssl.trustStore', truststore)
 
-            if keystore_password is not None:
-                set_property(dom_tree, prop, 'javax.net.ssl.keyStorePassword', keystore_password)
-            if truststore_password is not None:
-                set_property(dom_tree, prop, 'javax.net.ssl.trustStorePassword', truststore_password)
+            if keystore_type == 'JKS' and keystore_password is not None:
+                    set_property(dom_tree, prop, 'javax.net.ssl.keyStorePassword', keystore_password)
+
+            if truststore_type == 'JKS' and truststore_password is not None:
+                    set_property(dom_tree, prop, 'javax.net.ssl.trustStorePassword', truststore_password)
+
             # Persist the changes in the xml file
             file_handle = open(xml_doc, "w")
             dom_tree.writexml(file_handle)
@@ -56,14 +58,19 @@ def set_ssl_properties(xml_doc, atp_creds_path, keystore_password, truststore_pa
 def fix_store_type_and_default_value(keystore, keystore_type, truststore, truststore_type):
     # historical reason atp does not need these inputs by default and it uses JKS
     # set the default and return it
-    if truststore is None:
-        truststore = "truststore.jks"
+
     if keystore is None:
-        keystore = "keystore.jks"
-    if truststore_type is None:
-        truststore_type = "JKS"
-    if keystore_type is None:
-        keystore_type = "JKS"
+        if keystore_type == 'SSO':
+            keystore = 'cwallet.sso'
+        else:
+            keystore = 'keystore.jks'
+
+    if truststore is None:
+        if truststore_type == 'SSO':
+            truststore = 'cwallet.sso'
+        else:
+            truststore = 'truststore.jks'
+
     return keystore, keystore_type, truststore, truststore_type