Actually. Let's just raise an error if you try to pass in enable:true

Author: Tim Bielawa

replugin/funcworker/__init__.py

@@ -344,12 +344,12 @@ def parse_params(self, params, command_cfg):
                                   "for this subcommand")
             pass
         except ValueError, e:
-            self.app_logger.error("Could not find parser for specified "
+            self.app_logger.error("Could not find parser or failed to parse specified "
                                   "subcommand: %s" % params['subcommand'])
-            # The handler was imported, but there is no parser for
-            # the given sub-command. Or in other words, this func
-            # worker doesn't have the requested subcommand. Sorry,
-            # bud.
+            # The handler was imported, but: there is no parser for
+            # the given sub-command, or an invalid parameter was
+            # provided.. Or in other words, this func worker doesn't
+            # support the requested subcommand/arg combo. Sorry, bud.
             self.app_logger.error(e)
             raise FuncWorkerError(
                 'Requested subcommand for %s is not supported '

replugin/funcworker/puppet.py

@@ -66,7 +66,7 @@ def _parse_Run(params, app_logger):
     """
     app_logger.info("Parsing puppet:Run")
     # Allowed parameters to the 'run' subcommand
-    _run_params = ['server', 'noop', 'tags', 'enable']
+    _run_params = ['server', 'noop', 'tags']
 
     _params = {}
     # Override the default cmd/subcmd to call the general purpose
@@ -83,11 +83,8 @@ def _parse_Run(params, app_logger):
     # Begin building command string
     ##################################################################
 
-    # enable?
-    # FIXME: Need to move away from shell logic
-    # if params.get('enable', False):
-    #    _cmd_parts.append("puppet agent --enable --color=false")
-    #    _cmd_parts.append("&&")
+    if 'enable' in params:
+        raise ValueError('"enable" is not a valid parameter for the puppet:Run command')
 
     # actual command
     _cmd_parts.append("puppet agent --test")

test/test_puppet_parser.py

@@ -79,24 +79,17 @@ def test_run_server(self):
         (update, cmd) = ppt._parse_Run(params, self.app_logger)
         self.assertEqual(cmd, expected)
 
-    '''
-    # FIXME
-    #
-    # No longer valid. See DE7743 for details. (Basically, we don't get to use
-    # shell '&&' chars anymore and so puppet:Run doesn't allow enable:True any more.
-    #
     def test_run_enable(self):
-        """puppet:Run with agent enable parses correctly"""
-        expected = ["puppet agent --enable --color=false && puppet agent --test --color=false"]
+        """puppet:Run with agent enable raises"""
         params = {
             'hosts': ['testhost.example.com'],
             'command': 'puppet',
             'subcommand': 'Run',
             'enable': True
         }
-        (update, cmd) = ppt._parse_Run(params, self.app_logger)
-        self.assertEqual(cmd, expected)
-    '''
+        with self.assertRaises(ValueError):
+            (update, cmd) = ppt._parse_Run(params, self.app_logger)
+
     ##################################################################
     # The "puppet:Enable" family
     ##################################################################