refactor: add optional timeout field in BaseActionConfig

garden-io · May 5, 2023 · 35a343e · 35a343e
1 parent 0f2c3d2
commit 35a343e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/core/src/actions/build.ts b/core/src/actions/build.ts
@@ -52,7 +52,6 @@ export interface BuildActionConfig<T extends string = string, S extends object =
   allowPublish?: boolean
   buildAtSource?: boolean
   copyFrom?: BuildCopyFrom[]
-  timeout?: number
 }
 
 export const copyFromSchema = createSchema({

diff --git a/core/src/actions/run.ts b/core/src/actions/run.ts
@@ -19,9 +19,7 @@ import { Action, BaseActionConfig } from "./types"
 import { DEFAULT_RUN_TIMEOUT_SEC } from "../constants"
 
 export interface RunActionConfig<N extends string = any, S extends object = any>
-  extends BaseRuntimeActionConfig<"Run", N, S> {
-  timeout?: number
-}
+  extends BaseRuntimeActionConfig<"Run", N, S> {}
 
 export const runActionConfigSchema = memoize(() =>
   baseRuntimeActionConfigSchema().keys({

diff --git a/core/src/actions/test.ts b/core/src/actions/test.ts
@@ -19,9 +19,7 @@ import { Action, BaseActionConfig } from "./types"
 import { DEFAULT_TEST_TIMEOUT_SEC } from "../constants"
 
 export interface TestActionConfig<N extends string = any, S extends object = any>
-  extends BaseRuntimeActionConfig<"Test", N, S> {
-  timeout?: number
-}
+  extends BaseRuntimeActionConfig<"Test", N, S> {}
 
 export const testActionConfigSchema = memoize(() =>
   baseRuntimeActionConfigSchema().keys({

diff --git a/core/src/actions/types.ts b/core/src/actions/types.ts
@@ -79,6 +79,8 @@ export interface BaseActionConfig<K extends ActionKind = ActionKind, T = string,
   include?: string[]
   exclude?: string[]
 
+  timeout?: number
+
   // Variables
   // -> Templating with ActionConfigContext allowed
   variables?: DeepPrimitiveMap