COMPUTE-1764_no_selector_extra_args

(feat) parsers.py, tests - disallowed instanceTypeSelector to be passed in extra-args.

Author: aogorodnikov-dna

src/python/dxpy/cli/parsers.py

@@ -222,6 +222,28 @@ def process_extra_args(args):
         except:
             raise DXParserError('Value given for --extra-args could not be parsed as JSON')
 
+        # Validate that instanceTypeSelector is not specified in systemRequirements
+        def check_system_requirements(sys_reqs, context="systemRequirements"):
+            if isinstance(sys_reqs, dict):
+                for entry_point, reqs in sys_reqs.items():
+                    if isinstance(reqs, dict) and 'instanceTypeSelector' in reqs:
+                        raise DXParserError(
+                            'instanceTypeSelector cannot be specified in runtime --extra-args. '
+                            'It must be defined in the dxapp.json at build time.'
+                        )
+
+        if 'systemRequirements' in args.extra_args:
+            check_system_requirements(args.extra_args['systemRequirements'])
+
+        # Also check regionalOptions
+        if 'regionalOptions' in args.extra_args:
+            regional_opts = args.extra_args['regionalOptions']
+            if isinstance(regional_opts, dict):
+                for region, region_spec in regional_opts.items():
+                    if isinstance(region_spec, dict) and 'systemRequirements' in region_spec:
+                        check_system_requirements(region_spec['systemRequirements'],
+                                                 f"regionalOptions.{region}.systemRequirements")
+
 exec_input_args = argparse.ArgumentParser(add_help=False)
 exec_input_args.add_argument('-i', '--input', help=fill('An input to be added using "<input name>[:<class>]=<input value>" (provide "class" if there is no input spec; it can be any job IO class, e.g. "string", "array:string", or "array"; if "class" is "array" or not specified, the value will be attempted to be parsed as JSON and is otherwise treated as a string)', width_adjustment=-24), action='append')
 exec_input_args.add_argument('-j', '--input-json', help=fill('The full input JSON (keys=input field names, values=input field values)', width_adjustment=-24))

src/python/test/test_dxclient.py

@@ -3280,6 +3280,31 @@ def test_dx_run_extra_args(self):
         with self.assertSubprocessFailure(stderr_regexp='JSON', exit_code=3):
             run("dx run " + applet_id + " --extra-args not-a-JSON-string")
 
+    def test_dx_run_extra_args_instanceTypeSelector_rejected(self):
+        # Validate that instanceTypeSelector cannot be specified in runtime extra-args
+        applet_id = dxpy.api.applet_new({"project": self.project,
+                                         "dxapi": "1.0.0",
+                                         "runSpec": {"interpreter": "bash",
+                                                     "distribution": "Ubuntu",
+                                                     "release": "14.04",
+                                                     "code": "echo 'hello'"}
+                                         })['id']
+
+        # Test with wildcard entry point
+        with self.assertSubprocessFailure(stderr_regexp='instanceTypeSelector cannot be specified in runtime', exit_code=3):
+            run('dx run ' + applet_id + ' --extra-args ' +
+                '\'{"systemRequirements": {"*": {"instanceTypeSelector": {"allowedInstanceTypes": ["mem2_ssd1_v2_x2"]}}}}\'')
+
+        # Test with specific entry point
+        with self.assertSubprocessFailure(stderr_regexp='instanceTypeSelector cannot be specified in runtime', exit_code=3):
+            run('dx run ' + applet_id + ' --extra-args ' +
+                '\'{"systemRequirements": {"main": {"instanceTypeSelector": {"allowedInstanceTypes": ["mem2_ssd1_v2_x2"]}}}}\'')
+
+        # Test with regionalOptions
+        with self.assertSubprocessFailure(stderr_regexp='instanceTypeSelector cannot be specified in runtime', exit_code=3):
+            run('dx run ' + applet_id + ' --extra-args ' +
+                '\'{"regionalOptions": {"aws:us-east-1": {"systemRequirements": {"*": {"instanceTypeSelector": {"allowedInstanceTypes": ["mem2_ssd1_v2_x2"]}}}}}}\'')
+
     def test_dx_run_sys_reqs(self):
         app_spec = {"project": self.project,
                     "dxapi": "1.0.0",