Skip to content

Commit 5326b32

Browse files
VladimirFilonovalbertoblaz
VladimirFilonov
authored and
albertoblaz
committed
[One Workflow] Remove obsolete 'enabled' property from workflow trigger schemas (elastic#240844)
## Summary closes: elastic/security-team#14382 <img width="991" height="483" alt="image" src="https://github.com/user-attachments/assets/36b90e23-3e03-42c3-89f8-5a7a1a393572" />
1 parent f95fdeb commit 5326b32

File tree

17 files changed

+50
-151
lines changed

17 files changed

+50
-151
lines changed

‎src/platform/packages/shared/kbn-workflows/spec/schema.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,13 @@ export function getWorkflowSettingsSchema(stepSchema: z.ZodType, loose: boolean
7878
/* --- Triggers --- */
7979
export const AlertRuleTriggerSchema = z.object({
8080
type: z.literal('alert'),
81-
enabled: z.boolean().optional().default(true),
8281
with: z
8382
.union([z.object({ rule_id: z.string().min(1) }), z.object({ rule_name: z.string().min(1) })])
8483
.optional(),
8584
});
8685

8786
export const ScheduledTriggerSchema = z.object({
8887
type: z.literal('scheduled'),
89-
enabled: z.boolean().optional().default(true),
9088
with: z.union([
9189
// New format: every: "5m", "2h", "1d", "30s"
9290
z.object({
@@ -111,7 +109,6 @@ export const ScheduledTriggerSchema = z.object({
111109

112110
export const ManualTriggerSchema = z.object({
113111
type: z.literal('manual'),
114-
enabled: z.boolean().optional().default(true),
115112
});
116113

117114
export const TriggerSchema = z.discriminatedUnion('type', [

‎src/platform/plugins/shared/workflows_management/common/lib/validate_step_names.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('validateStepNameUniqueness', () => {
1616
version: '1',
1717
name: 'Test Workflow',
1818
enabled: true,
19-
triggers: [{ type: 'manual', enabled: true }],
19+
triggers: [{ type: 'manual' }],
2020
steps: [
2121
{ name: 'step1', type: 'console' },
2222
{ name: 'step2', type: 'http' },
@@ -35,7 +35,7 @@ describe('validateStepNameUniqueness', () => {
3535
version: '1',
3636
name: 'Test Workflow',
3737
enabled: true,
38-
triggers: [{ type: 'manual', enabled: true }],
38+
triggers: [{ type: 'manual' }],
3939
steps: [
4040
{ name: 'step1', type: 'console' },
4141
{ name: 'step2', type: 'http' },
@@ -59,7 +59,7 @@ describe('validateStepNameUniqueness', () => {
5959
version: '1',
6060
name: 'Test Workflow',
6161
enabled: true,
62-
triggers: [{ type: 'manual', enabled: true }],
62+
triggers: [{ type: 'manual' }],
6363
steps: [
6464
{ name: 'root_step', type: 'console' },
6565
{
@@ -87,7 +87,7 @@ describe('validateStepNameUniqueness', () => {
8787
version: '1',
8888
name: 'Test Workflow',
8989
enabled: true,
90-
triggers: [{ type: 'manual', enabled: true }],
90+
triggers: [{ type: 'manual' }],
9191
steps: [
9292
{
9393
name: 'if_step',
@@ -112,7 +112,7 @@ describe('validateStepNameUniqueness', () => {
112112
version: '1',
113113
name: 'Test Workflow',
114114
enabled: true,
115-
triggers: [{ type: 'manual', enabled: true }],
115+
triggers: [{ type: 'manual' }],
116116
steps: [
117117
{
118118
name: 'parallel_step',
@@ -144,7 +144,7 @@ describe('validateStepNameUniqueness', () => {
144144
version: '1',
145145
name: 'Test Workflow',
146146
enabled: true,
147-
triggers: [{ type: 'manual', enabled: true }],
147+
triggers: [{ type: 'manual' }],
148148
steps: [
149149
{
150150
name: 'atomic_step',
@@ -170,7 +170,7 @@ describe('validateStepNameUniqueness', () => {
170170
version: '1',
171171
name: 'Test Workflow',
172172
enabled: true,
173-
triggers: [{ type: 'manual', enabled: true }],
173+
triggers: [{ type: 'manual' }],
174174
steps: [
175175
{
176176
name: 'merge_step',
@@ -196,7 +196,7 @@ describe('validateStepNameUniqueness', () => {
196196
version: '1',
197197
name: 'Test Workflow',
198198
enabled: true,
199-
triggers: [{ type: 'manual', enabled: true }],
199+
triggers: [{ type: 'manual' }],
200200
steps: [
201201
{ name: 'root_step', type: 'console' },
202202
{
@@ -237,7 +237,7 @@ describe('validateStepNameUniqueness', () => {
237237
version: '1',
238238
name: 'Test Workflow',
239239
enabled: true,
240-
triggers: [{ type: 'manual', enabled: true }],
240+
triggers: [{ type: 'manual' }],
241241
steps: [],
242242
};
243243

@@ -252,7 +252,7 @@ describe('validateStepNameUniqueness', () => {
252252
version: '1',
253253
name: 'Test Workflow',
254254
enabled: true,
255-
triggers: [{ type: 'manual', enabled: true }],
255+
triggers: [{ type: 'manual' }],
256256
} as WorkflowYaml;
257257

258258
const result = validateStepNameUniqueness(workflow);

‎src/platform/plugins/shared/workflows_management/public/entities/workflows/lib/get_workflow_graph.test.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ describe('getWorkflowGraph', () => {
1818
triggers: [
1919
{
2020
type: 'manual' as const,
21-
enabled: true,
2221
},
2322
],
2423
steps: [
@@ -50,7 +49,6 @@ describe('getWorkflowGraph', () => {
5049
triggers: [
5150
{
5251
type: 'manual' as const,
53-
enabled: true,
5452
},
5553
],
5654
steps: [

‎src/platform/plugins/shared/workflows_management/public/features/run_workflow/ui/workflow_execute_modal.test.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ describe('WorkflowExecuteModal', () => {
204204
<WorkflowExecuteModal
205205
definition={{
206206
...baseWorkflowDefinition,
207-
triggers: [{ type: 'manual', enabled: true }],
207+
triggers: [{ type: 'manual' }],
208208
}}
209209
onClose={mockOnClose}
210210
onSubmit={mockOnSubmit}
@@ -220,7 +220,7 @@ describe('WorkflowExecuteModal', () => {
220220
<WorkflowExecuteModal
221221
definition={{
222222
...baseWorkflowDefinition,
223-
triggers: [{ type: 'alert', enabled: true }],
223+
triggers: [{ type: 'alert' }],
224224
}}
225225
onClose={mockOnClose}
226226
onSubmit={mockOnSubmit}
@@ -256,7 +256,7 @@ describe('WorkflowExecuteModal', () => {
256256
<WorkflowExecuteModal
257257
definition={{
258258
...baseWorkflowDefinition,
259-
triggers: [{ type: 'alert', enabled: true }],
259+
triggers: [{ type: 'alert' }],
260260
}}
261261
onClose={mockOnClose}
262262
onSubmit={mockOnSubmit}
@@ -275,7 +275,7 @@ describe('WorkflowExecuteModal', () => {
275275
<WorkflowExecuteModal
276276
definition={{
277277
...baseWorkflowDefinition,
278-
triggers: [{ type: 'manual', enabled: true }],
278+
triggers: [{ type: 'manual' }],
279279
inputs: [{ name: 'test-input', type: 'string', required: true }],
280280
}}
281281
onClose={mockOnClose}

‎src/platform/plugins/shared/workflows_management/public/features/validate_workflow_yaml/lib/collect_all_variables.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ steps:
5757
name: 'Test Workflow',
5858
version: '1',
5959
enabled: true,
60-
triggers: [{ type: 'manual', enabled: true }],
60+
triggers: [{ type: 'manual' }],
6161
steps: [
6262
{
6363
name: 'Test Step',
@@ -95,7 +95,7 @@ steps:
9595
name: 'Test Workflow',
9696
version: '1',
9797
enabled: true,
98-
triggers: [{ type: 'manual', enabled: true }],
98+
triggers: [{ type: 'manual' }],
9999
steps: [
100100
{
101101
name: 'Foreach Step',
@@ -134,7 +134,7 @@ steps:
134134
name: 'Test Workflow',
135135
version: '1',
136136
enabled: true,
137-
triggers: [{ type: 'manual', enabled: true }],
137+
triggers: [{ type: 'manual' }],
138138
steps: [
139139
{
140140
name: 'Test Step',
@@ -167,7 +167,7 @@ steps:
167167
name: 'Test Workflow',
168168
version: '1',
169169
enabled: true,
170-
triggers: [{ type: 'manual', enabled: true }],
170+
triggers: [{ type: 'manual' }],
171171
steps: [
172172
{
173173
name: 'Test Step',
@@ -201,7 +201,7 @@ steps:
201201
name: 'Test Workflow',
202202
version: '1',
203203
enabled: true,
204-
triggers: [{ type: 'manual', enabled: true }],
204+
triggers: [{ type: 'manual' }],
205205
steps: [
206206
{
207207
name: 'Test Step',
@@ -242,7 +242,7 @@ steps:
242242
name: 'Test Workflow',
243243
version: '1',
244244
enabled: true,
245-
triggers: [{ type: 'manual', enabled: true }],
245+
triggers: [{ type: 'manual' }],
246246
steps: [
247247
{
248248
name: 'Test Step',
@@ -284,7 +284,7 @@ steps:
284284
name: 'Test Workflow',
285285
version: '1',
286286
enabled: true,
287-
triggers: [{ type: 'manual', enabled: true }],
287+
triggers: [{ type: 'manual' }],
288288
steps: [
289289
{
290290
name: 'Conditional Step',
@@ -325,7 +325,7 @@ steps:
325325
name: 'Test Workflow',
326326
version: '1',
327327
enabled: true,
328-
triggers: [{ type: 'manual', enabled: true }],
328+
triggers: [{ type: 'manual' }],
329329
steps: [
330330
{
331331
name: 'Test Step',

‎src/platform/plugins/shared/workflows_management/public/features/validate_workflow_yaml/lib/validate_variables.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('validateVariables', () => {
4545
name: 'Test Workflow',
4646
version: '1',
4747
enabled: true,
48-
triggers: [{ type: 'manual', enabled: true }],
48+
triggers: [{ type: 'manual' }],
4949
steps: [
5050
{
5151
name: 'Test Step',

‎src/platform/plugins/shared/workflows_management/public/features/workflow_context/lib/get_context_for_path.test.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ describe('getContextSchemaForPath', () => {
2222
triggers: [
2323
{
2424
type: 'manual' as const,
25-
enabled: true,
2625
},
2726
],
2827
steps: [
@@ -125,7 +124,6 @@ describe('getContextSchemaForPath', () => {
125124
triggers: [
126125
{
127126
type: 'manual' as const,
128-
enabled: true,
129127
},
130128
],
131129
consts: {

‎src/platform/plugins/shared/workflows_management/public/features/workflow_execution_detail/ui/hooks/use_workflow_execution_polling.test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ describe('useWorkflowExecutionPolling', () => {
5959
triggers: [
6060
{
6161
type: 'manual' as const,
62-
enabled: true,
6362
},
6463
],
6564
steps: [
@@ -84,7 +83,7 @@ describe('useWorkflowExecutionPolling', () => {
8483
stepExecutions: [],
8584
duration: PollingIntervalMs * 2,
8685
triggeredBy: 'manual',
87-
yaml: 'version: "1"\\nname: test-workflow\\nenabled: true\\ntriggers:\\n - type: manual\\n enabled: true\\nsteps:\\n - name: test-step\\n type: console.log\\n with:\\n message: Hello World',
86+
yaml: 'version: "1"\\nname: test-workflow\\nenabled: true\\ntriggers:\\n - type: manual\\nsteps:\\n - name: test-step\\n type: console.log\\n with:\\n message: Hello World',
8887
});
8988

9089
it('should return workflow execution data, loading state, and error from useWorkflowExecution', () => {

0 commit comments

Comments
 (0)