chore: keep optional command arg to avoid breaking change

core/src/commands/exec.ts

@@ -29,6 +29,10 @@ const execArgs = {
       return Object.keys(configDump.actionConfigs.Deploy)
     },
   }),
+  command: new StringParameter({
+    help: "The command to run.",
+    required: false,
+  }),
 }
 
 const execOpts = {
@@ -57,12 +61,15 @@ export class ExecCommand extends Command<Args, Opts> {
   override description = dedent`
     Finds an active container for a deployed Deploy and executes the given command within the container.
     Supports interactive shells.
+    You can specify the command to run as a parameter, or pass it after a \`--\` separator. For commands
+    with arguments or quoted substrings, use the \`--\` separator.
 
     _NOTE: This command may not be supported for all action types._
 
     Examples:
 
-         garden exec my-service -- /bin/sh   # runs a shell in the my-service Deploy's container
+         garden exec my-service /bin/sh   # runs an interactive shell in the my-service Deploy's container
+         garden exec my-service -- /bin/sh -c echo "hello world" # prints "hello world" in the my-service Deploy's container and exits
   `
 
   override arguments = execArgs
@@ -160,6 +167,6 @@ export class ExecCommand extends Command<Args, Opts> {
   }
 
   private getCommand(args: ParameterValues<Args>) {
-    return args["--"] || []
+    return args.command ? args.command.split(" ") : args["--"] || []
   }
 }

core/test/integ/src/plugins/kubernetes/commands/exec.ts

@@ -45,9 +45,9 @@ describe("runExecCommand", () => {
     }
   })
 
-  it("should exec a command in a running service", async () => {
+  it("should exec a command in a running service using the -- separator", async () => {
     const execCommand = new ExecCommand()
-    const args = { deploy: "simple-service" }
+    const args = { deploy: "simple-service", command: "" }
     args["--"] = ["echo", "ok, lots of text"]
 
     const { result, errors } = await execCommand.action({
@@ -66,9 +66,29 @@ describe("runExecCommand", () => {
     expect(result?.output).to.equal("ok, lots of text")
   })
 
+  it("should exec a command in a running service without the -- separator", async () => {
+    const execCommand = new ExecCommand()
+    const args = { deploy: "simple-service", command: "echo hello" }
+
+    const { result, errors } = await execCommand.action({
+      garden,
+      log: garden.log,
+      args,
+      opts: withDefaultGlobalOpts({
+        interactive: false,
+        target: "",
+      }),
+    })
+
+    if (errors) {
+      throw errors[0]
+    }
+    expect(result?.output).to.equal("hello")
+  })
+
   it("should throw if no command was specified", async () => {
     const execCommand = new ExecCommand()
-    const args = { deploy: "simple-service" }
+    const args = { deploy: "simple-service", command: "" }
     await expectError(
       () =>
         execCommand.action({

core/test/unit/src/commands/exec.ts

@@ -17,7 +17,7 @@ describe("ExecCommand", () => {
     const garden = await makeTestGardenA()
     const log = garden.log
 
-    const args = { deploy: "service-a" }
+    const args = { deploy: "service-a", command: "" }
     args["--"] = ["echo", "ok"]
 
     command.printHeader({ log, args })

docs/reference/commands.md

@@ -1346,22 +1346,26 @@ run:
 
 Finds an active container for a deployed Deploy and executes the given command within the container.
 Supports interactive shells.
+You can specify the command to run as a parameter, or pass it after a `--` separator. For commands
+with arguments, use the `--` separator.
 
 _NOTE: This command may not be supported for all action types._
 
 Examples:
 
-     garden exec my-service -- /bin/sh   # runs a shell in the my-service Deploy's container
+     garden exec my-service /bin/sh   # runs an interactive shell in the my-service Deploy's container
+     garden exec my-service -- /bin/sh -c echo "hello world" # prints "hello world" in the my-service Deploy's container and exits
 
 #### Usage
 
-    garden exec <deploy> [options]
+    garden exec <deploy> [command] [options]
 
 #### Arguments
 
 | Argument | Required | Description |
 | -------- | -------- | ----------- |
   | `deploy` | Yes | The running Deploy action to exec the command in.
+  | `command` | No | The command to run.
 
 #### Options