Merge branch 'skip_archive_remote_arg_validation' into 'main'

adding logic to discoverDomain to validate -skip_archive and -remote args

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

Author: robertpatrick

core/src/main/python/discover.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+Copyright (c) 2017, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 The entry point for the discoverDomain tool.
@@ -140,6 +140,8 @@ def __process_args(args, is_encryption_supported):
     if __wlst_mode == WlstModes.ONLINE:
         cla_helper.process_encryption_args(argument_map, is_encryption_supported)
 
+    __validate_skip_archive_and_remote_args(argument_map, __wlst_mode)
+
     target_configuration_helper.process_target_arguments(argument_map)
     __process_model_arg(argument_map)
     __process_archive_filename_arg(argument_map)
@@ -154,6 +156,23 @@ def __process_args(args, is_encryption_supported):
     return model_context
 
 
+def __validate_skip_archive_and_remote_args(argument_map, wlst_mode):
+    _method_name = '__validate_skip_archive_and_remote_args'
+
+    if wlst_mode == WlstModes.OFFLINE and CommandLineArgUtil.REMOTE_SWITCH in argument_map:
+        ex = exception_helper.create_cla_exception(ExitCode.ARG_VALIDATION_ERROR, 'WLSDPLY-06064',
+                                                   _program_name, CommandLineArgUtil.REMOTE_SWITCH)
+        __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+        raise ex
+
+    if CommandLineArgUtil.REMOTE_SWITCH in argument_map and CommandLineArgUtil.SKIP_ARCHIVE_FILE_SWITCH in argument_map:
+        ex = exception_helper.create_cla_exception(ExitCode.ARG_VALIDATION_ERROR, 'WLSDPLY-06065',
+                                                   _program_name, CommandLineArgUtil.REMOTE_SWITCH,
+                                                   CommandLineArgUtil.SKIP_ARCHIVE_FILE_SWITCH)
+        __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+        raise ex
+
+
 def __process_model_arg(argument_map):
     """
     Verify that specified model file's parent directory exists.

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

@@ -819,6 +819,8 @@ WLSDPLY-06060={0} invoked with {1} argument but discovering security provider da
 WLSDPLY-06061=Enter the OPSS wallet passphrase to use to encrypt the OPSS wallet
 WLSDPLY-06062=Failed to read OPSS wallet passphrase: {0}
 WLSDPLY-06063=User failed to provide the required OPSS wallet passphrase
+WLSDPLY-06064={0} invoked with {1} argument but that argument is only valid in online mode.
+WLSDPLY-06065={0} invoked with both {1} and {2} arguments, which are mutually exclusive.
 
 # discoverer.py
 WLSDPLY-06100=Find attributes at location {0}