fix(config): allow empty strings in commands and args

garden-io · Aug 13, 2020 · 5a9228b · 5a9228b
1 parent a5ad44a
commit 5a9228b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/core/src/plugins/container/config.ts b/core/src/plugins/container/config.ts
@@ -371,12 +371,12 @@ const containerServiceSchema = () =>
     ),
     command: joi
       .array()
-      .items(joi.string())
+      .items(joi.string().allow(""))
       .description("The command/entrypoint to run the container with when starting the service.")
       .example(commandExample),
     args: joi
       .array()
-      .items(joi.string())
+      .items(joi.string().allow(""))
       .description("The arguments to run the container with when starting the service.")
       .example(["npm", "start"]),
     daemon: joi.boolean().default(false).description(deline`
@@ -496,13 +496,13 @@ export const containerTestSchema = () =>
   baseTestSpecSchema().keys({
     args: joi
       .array()
-      .items(joi.string())
+      .items(joi.string().allow(""))
       .description("The arguments used to run the test inside the container.")
       .example(["npm", "test"]),
     artifacts: artifactsSchema(),
     command: joi
       .array()
-      .items(joi.string())
+      .items(joi.string().allow(""))
       .description("The command/entrypoint used to run the test inside the container.")
       .example(commandExample),
     env: containerEnvVarsSchema(),
@@ -523,14 +523,14 @@ export const containerTaskSchema = () =>
     .keys({
       args: joi
         .array()
-        .items(joi.string())
+        .items(joi.string().allow(""))
         .description("The arguments used to run the task inside the container.")
         .example(["rake", "db:migrate"]),
       artifacts: artifactsSchema(),
       cacheResult: cacheResultSchema(),
       command: joi
         .array()
-        .items(joi.string())
+        .items(joi.string().allow(""))
         .description("The command/entrypoint used to run the task inside the container.")
         .example(commandExample),
       env: containerEnvVarsSchema(),

diff --git a/core/src/plugins/exec.ts b/core/src/plugins/exec.ts
@@ -67,7 +67,7 @@ export const execTestSchema = () =>
     .keys({
       command: joi
         .array()
-        .items(joi.string())
+        .items(joi.string().allow(""))
         .description(
           dedent`
         The command to run to test the module.
@@ -93,7 +93,7 @@ export const execTaskSpecSchema = () =>
       artifacts: artifactsSchema().description("A list of artifacts to copy after the task run."),
       command: joi
         .array()
-        .items(joi.string())
+        .items(joi.string().allow(""))
         .description(
           dedent`
         The command to run.

diff --git a/core/src/plugins/kubernetes/config.ts b/core/src/plugins/kubernetes/config.ts
@@ -640,12 +640,12 @@ export const kubernetesTaskSchema = () =>
       cacheResult: cacheResultSchema(),
       command: joi
         .array()
-        .items(joi.string())
+        .items(joi.string().allow(""))
         .description("The command/entrypoint used to run the task inside the container.")
         .example(commandExample),
       args: joi
         .array()
-        .items(joi.string())
+        .items(joi.string().allow(""))
         .description("The arguments to pass to the container used for execution.")
         .example(["rake", "db:migrate"]),
       env: containerEnvVarsSchema(),
@@ -665,12 +665,12 @@ export const kubernetesTestSchema = () =>
       ),
       command: joi
         .array()
-        .items(joi.string())
+        .items(joi.string().allow(""))
         .description("The command/entrypoint used to run the test inside the container.")
         .example(commandExample),
       args: joi
         .array()
-        .items(joi.string())
+        .items(joi.string().allow(""))
         .description("The arguments to pass to the container used for testing.")
         .example(["npm", "test"]),
       env: containerEnvVarsSchema(),

diff --git a/core/src/types/plugin/base.ts b/core/src/types/plugin/base.ts
@@ -99,7 +99,7 @@ export const runResultSchema = () =>
       moduleName: joi.string().description("The name of the module that was run."),
       command: joi
         .array()
-        .items(joi.string())
+        .items(joi.string().allow(""))
         .required()
         .description("The command that was run in the module."),
       version: joi.string().description("The string version of the module."),

diff --git a/core/src/types/plugin/task/getTaskResult.ts b/core/src/types/plugin/task/getTaskResult.ts
@@ -30,7 +30,7 @@ export const taskResultSchema = () =>
       taskName: joi.string().description("The name of the task that was run."),
       command: joi
         .array()
-        .items(joi.string())
+        .items(joi.string().allow(""))
         .required()
         .description("The command that the task ran in the module."),
       version: joi.string().description("The string version of the task."),