Merge branch 'jira-wdt-883-default-wko-target' into 'main'

Change wko and wko* targets to point to current versioned config wko4*

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

Author: robertpatrick

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

@@ -26,7 +26,8 @@
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.util.targets.model_crd_helper import VERRAZZANO_PRODUCT_KEY
 from wlsdeploy.util import path_helper
-import wlsdeploy.util.unicode_helper as str_helper
+from wlsdeploy.util import target_configuration as target_config_module
+from wlsdeploy.util import unicode_helper as str_helper
 from wlsdeploy.util.exit_code import ExitCode
 from wlsdeploy.util.target_configuration import TargetConfiguration
 from wlsdeploy.util.validate_configuration import VALIDATION_METHODS
@@ -1014,10 +1015,14 @@ def is_target_switch(self, key):
     def _validate_target_arg(self, value):
         method_name = '_validate_target_arg'
 
+        # log if the target key was translated to a version-specific key
+        target_config_key = target_config_module.get_target_configuration_key(value)
+        if target_config_key != value:
+            _logger.info("WLSDPLY-00917", target_config_key, value)
+
         # Check if the target configuration file exists
         _path_helper = path_helper.get_path_helper()
-        target_configuration_file = \
-            _path_helper.find_local_config_path(_path_helper.local_join('targets', value, 'target.json'))
+        target_configuration_file = target_config_module.get_target_configuration_path(value)
         if not os.path.exists(target_configuration_file):
             ex = create_cla_exception(ExitCode.ARG_VALIDATION_ERROR, 'WLSDPLY-01643', value, target_configuration_file)
             _logger.throwing(ex, class_name=self._class_name, method_name=method_name)

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

@@ -22,6 +22,7 @@
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.json.json_translator import JsonToPython
 from wlsdeploy.logging import platform_logger
+from wlsdeploy.util import target_configuration
 from wlsdeploy.util import validate_configuration
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util import path_helper
@@ -787,8 +788,7 @@ def get_target_configuration(self):
 
     def get_target_configuration_file(self):
         if self._target:
-            target_path = os.path.join('targets', self._target, 'target.json')
-            return self._path_helper.find_local_config_path(target_path)
+            return target_configuration.get_target_configuration_path(self._target)
         return None
 
     def get_target(self):

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

@@ -5,6 +5,7 @@
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.util import dictionary_utils
+from wlsdeploy.util import path_helper
 from wlsdeploy.util.validate_configuration import VALIDATION_METHODS
 from wlsdeploy.tool.util.targets import model_crd_helper
 
@@ -53,6 +54,9 @@
     CONFIG_OVERRIDES_SECRETS_METHOD
 ]
 
+# wko and wko_* targets are translated to current version
+WKO_DEFAULT_PREFIX = 'wko4'
+
 # domain home source types and names
 DOMAIN_IN_IMAGE_SOURCE_TYPE = 'dii'
 MODEL_IN_IMAGE_SOURCE_TYPE = 'mii'
@@ -328,3 +332,21 @@ def _validate_enumerated_field(self, key, value, valid_values, exit_code, target
                                                        value, key, ', '.join(valid_values))
             self._logger.throwing(ex, class_name=self._class_name, method_name=method_name)
             raise ex
+
+
+def get_target_configuration_path(target_name):
+    _path_helper = path_helper.get_path_helper()
+    directory_name = get_target_configuration_key(target_name)
+    target_config_path = _path_helper.local_join('targets', directory_name, 'target.json')
+    return _path_helper.find_local_config_path(target_config_path)
+
+
+def get_target_configuration_key(target_name):
+    target_key = target_name
+    if target_name == 'wko':
+        target_key = WKO_DEFAULT_PREFIX
+
+    if target_name.startswith('wko-'):
+        target_key = WKO_DEFAULT_PREFIX + target_name[3:]
+
+    return target_key

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

@@ -388,6 +388,7 @@ WLSDPLY-00913=Supplied local output directory {0} was not valid: {1}
 WLSDPLY-00914=Verrazzano product key {0} used by target {1} has been deprecated, and will be removed in a future release
 WLSDPLY-00915=Specified discover security provider data scope was empty or null
 WLSDPLY-00916=Unrecognized scopes specified in discover security provider data scope ({0}): {1}
+WLSDPLY-00917=Using default configuration {0} for target {1}
 
 # wlsdeploy/util/cla_helper.py
 

core/src/main/targetconfigs/wko-dii/target.json renamed to core/src/main/targetconfigs/wko3-dii/target.json

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2021, 2023, Oracle and/or its affiliates.
+Copyright (c) 2021, 2024, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import os
@@ -44,12 +44,12 @@ def testDefaultModel(self):
         are incorporated into the resulting domain resource file.
         """
         # Configure the target to set cluster replicas
-        target_path = os.path.join(self.config_dir, 'targets', 'wko', 'target.json')
+        target_path = os.path.join(self.config_dir, 'targets', 'wko3', 'target.json')
         config = JsonToPython(target_path).parse()
         config['set_cluster_replicas'] = True
         PythonToJson(config).write_to_json_file(target_path)
 
-        documents = self._extract_resource_documents('1', 'wko', 'wko-domain.yaml')
+        documents = self._extract_resource_documents('1', 'wko3', 'wko-domain.yaml')
         resource = documents[0]
 
         # clusters from topology should be in the domain resource file
@@ -71,7 +71,7 @@ def testKubernetesModel(self):
         Test that fields from the kubernetes section of the model
         are transferred to the resulting domain resource file
         """
-        documents = self._extract_resource_documents('2', 'wko', 'wko-domain.yaml')
+        documents = self._extract_resource_documents('2', 'wko3', 'wko-domain.yaml')
         resource = documents[0]
 
         # clusters from kubernetes section should be in the domain resource file