Merge branch 'wdt-807' into 'main'

Fix NPE when not enough information is specified RCUDbinfo

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

Author: robertpatrick

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

@@ -25,7 +25,8 @@ def set_ssl_properties(xml_doc, atp_creds_path, keystore_password, truststore_pa
     props = collection.getElementsByTagName("propertySet")
 
     keystore, keystore_type, truststore, truststore_type = fix_store_type_and_default_value(keystore, keystore_type,
-                                                                                            truststore, truststore_type)
+                                                             truststore, truststore_type, truststore_password,
+                                                                                            keystore_password)
 
     for prop in props:
         if prop.getAttribute('name') == 'props.db.1':
@@ -55,21 +56,34 @@ def set_ssl_properties(xml_doc, atp_creds_path, keystore_password, truststore_pa
             file_handle.close()
 
 
-def fix_store_type_and_default_value(keystore, keystore_type, truststore, truststore_type):
+def fix_store_type_and_default_value(keystore, keystore_type, truststore, truststore_type, truststore_pw, keystore_pw):
     # historical reason atp does not need these inputs by default and it uses JKS
     # set the default and return it
 
-    if keystore is None:
-        if keystore_type == 'SSO':
-            keystore = 'cwallet.sso'
-        else:
-            keystore = 'keystore.jks'
+    # If there is password and type not set, set it to JKS
+
+    if keystore_pw is not None and keystore_type is None:
+        keystore_type = 'JKS'
+
+    if truststore_pw is not None and truststore_type is None:
+        truststore_type = 'JKS'
+
+    # If both type and store are not set, default to SSO
+    if keystore_type is None and keystore is None:
+        keystore_type = 'SSO'
+        keystore = 'cwallet.sso'
+
+    if truststore_type is None and truststore is None:
+        truststore_type = 'SSO'
+        truststore = 'cwallet.sso'
+
+    # If no store specify for JKS type
+    if keystore_type == 'JKS' and keystore is None:
+        keystore = 'keystore.jks'
+
+    if truststore_type == 'JKS' and truststore is None:
+        truststore = 'truststore.jks'
 
-    if truststore is None:
-        if truststore_type == 'SSO':
-            truststore = 'cwallet.sso'
-        else:
-            truststore = 'truststore.jks'
 
     return keystore, keystore_type, truststore, truststore_type
 

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

@@ -303,7 +303,8 @@ def __run_rcu(self):
             truststore_type = rcu_db_info.get_truststore_type()
             keystore_type = rcu_db_info.get_keystore_type()
             keystore, keystore_type, truststore, truststore_type = atp_helper.fix_store_type_and_default_value(keystore,
-                                                                        keystore_type, truststore, truststore_type)
+                                                                        keystore_type, truststore, truststore_type,
+                                                                        truststore_pwd, keystore_pwd)
 
 
             self._set_rcu_ssl_args_properties(ssl_conn_properties, rcu_db_info, keystore, keystore_type, truststore,
@@ -1279,7 +1280,8 @@ def __set_atp_standard_conn_properties(self, datasource_name, tns_admin, trustst
                                            truststore_type, keystore_pwd, keystore_type, keystore):
         location = deployer_utils.get_jdbc_driver_params_properties_location(datasource_name, self.aliases)
         keystore, keystore_type, truststore, truststore_type = atp_helper.fix_store_type_and_default_value(keystore,
-                                                                    keystore_type, truststore, truststore_type)
+                                                                    keystore_type, truststore, truststore_type,
+                                                                    truststore_pwd, keystore_pwd)
 
         properties_set = []
         self.__set_connection_property_info(location, DRIVER_PARAMS_KEYSTORE_PROPERTY, self.__get_store_path(tns_admin,
@@ -1668,7 +1670,8 @@ def get_atp_standard_conn_properties(self, tns_admin, truststore, truststore_pwd
                                          truststore_type, keystore_pwd, keystore_type, keystore):
 
         keystore, keystore_type, truststore, truststore_type = atp_helper.fix_store_type_and_default_value(keystore,
-                                                                       keystore_type, truststore, truststore_type)
+                                                                       keystore_type, truststore, truststore_type,
+                                                                        truststore_pwd, keystore_pwd)
 
         properties_set = []