warn about not supported kss keystore type (#515)

Author: CarolynRountree

core/src/main/python/wlsdeploy/aliases/model_constants.py

@@ -1,10 +1,12 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 
 # lists may be represented in the model as comma-separated strings
 MODEL_LIST_DELIMITER = ','
+KSS_KEYSTORE_TYPE = 'kss'
+KSS_KEYSTORE_FILE_INDICATOR = 'kss:'
 
 
 # names of model elements, alphabetically

core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 from java.io import File
@@ -14,6 +14,7 @@
 from wlsdeploy.aliases import model_constants
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import MODEL_LIST_DELIMITER
+from wlsdeploy.aliases.model_constants import KSS_KEYSTORE_FILE_INDICATOR
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.logging.platform_logger import PlatformLogger
@@ -664,13 +665,19 @@ def _add_keystore_file_to_archive(self, model_name, model_value, location):
         _logger.entering(model_name, str(location), class_name=_class_name, method_name=_method_name)
         new_name = None
         if not string_utils.is_empty(model_value):
-            server_name = self._get_server_name_from_location(location)
-            archive_file = self._model_context.get_archive_file()
-            file_path = self._convert_path(model_value)
-            if server_name:
-                new_name = self._add_server_keystore_file_to_archive(server_name, archive_file, file_path)
+            _logger.finer('WLSDPLY-06641', location.get_folder_path(), model_value,
+                          class_name=_class_name, method_name=_method_name)
+            if _kss_file_type(model_value):
+                _logger.warning('WLSDPLY-06642', model_value, location.get_folder_path(),
+                                class_name=_class_name, method_name=_method_name)
             else:
-                new_name = self._add_node_manager_keystore_file_to_archive(archive_file, file_path)
+                server_name = self._get_server_name_from_location(location)
+                archive_file = self._model_context.get_archive_file()
+                file_path = self._convert_path(model_value)
+                if server_name:
+                    new_name = self._add_server_keystore_file_to_archive(server_name, archive_file, file_path)
+                else:
+                    new_name = self._add_node_manager_keystore_file_to_archive(archive_file, file_path)
 
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=new_name)
         return new_name
@@ -732,3 +739,9 @@ def _get_server_name_from_location(self, location):
         temp = LocationContext()
         temp.append_location(model_constants.SERVER)
         return location.get_name_for_token(self._alias_helper.get_name_token(temp))
+
+
+def _kss_file_type(file_name):
+    if file_name.startswith(KSS_KEYSTORE_FILE_INDICATOR):
+        return True
+    return False

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -696,6 +696,11 @@ WLSDPLY-06637=Unable to locate and add node manager keystore file {0} to the arc
 WLSDPLY-06638=Unexpected exception attempting to add node manager keystore file {0} to the archive : {1}
 WLSDPLY-06639=Skipping Embedded LDAP Server Configuration
 WLSDPLY-06640=Adding Embedded LDAP Server Configuration
+WLSDPLY-06641=Custom Keystore file name at location {0} is {1}
+WLSDPLY-06642=Custom Keystore file {0} at location {1} is a kss type which is not currently supported. \
+  The Custom Keystore file will not be added to the archive file. Use export / import to \
+  add the file to the target domain
+
 
 # multi_tenant_discoverer.py, multi_tenant_resources_dsi
 WLSDPLY-06700=Discover Multi-tenant