From fa9cd0617d14b7e776918d24b745eebd72089d30 Mon Sep 17 00:00:00 2001 From: Dmitrii Tikhomirov Date: Mon, 28 Apr 2025 16:36:19 -0700 Subject: [PATCH 1/2] Set EventRef.ResultEventRef to optional Signed-off-by: Dmitrii Tikhomirov --- model/event.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/event.go b/model/event.go index bad1ce4..1848d4c 100644 --- a/model/event.go +++ b/model/event.go @@ -96,7 +96,7 @@ type EventRef struct { // +kubebuilder:validation:Required TriggerEventRef string `json:"triggerEventRef" validate:"required"` // Reference to the unique name of a 'consumed' event definition - // +kubebuilder:validation:Required + // +optional ResultEventRef string `json:"resultEventRef" validate:"required"` // Maximum amount of time (ISO 8601 format) to wait for the result event. If not defined it be set to the // actionExecutionTimeout From 9641187c34ff95c78b03051f20192bdf9b793fde Mon Sep 17 00:00:00 2001 From: Dmitrii Tikhomirov Date: Tue, 29 Apr 2025 10:36:50 -0700 Subject: [PATCH 2/2] removed validate declaration and updated tests Signed-off-by: Dmitrii Tikhomirov --- model/event.go | 2 +- model/event_validator_test.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/model/event.go b/model/event.go index 1848d4c..ddc5ab2 100644 --- a/model/event.go +++ b/model/event.go @@ -97,7 +97,7 @@ type EventRef struct { TriggerEventRef string `json:"triggerEventRef" validate:"required"` // Reference to the unique name of a 'consumed' event definition // +optional - ResultEventRef string `json:"resultEventRef" validate:"required"` + ResultEventRef string `json:"resultEventRef"` // Maximum amount of time (ISO 8601 format) to wait for the result event. If not defined it be set to the // actionExecutionTimeout // +optional diff --git a/model/event_validator_test.go b/model/event_validator_test.go index 80340b0..89566e8 100644 --- a/model/event_validator_test.go +++ b/model/event_validator_test.go @@ -175,11 +175,9 @@ func TestEventRefStructLevelValidation(t *testing.T) { Model: func() Workflow { model := baseWorkflow.DeepCopy() model.States[0].OperationState.Actions[0].EventRef.TriggerEventRef = "" - model.States[0].OperationState.Actions[0].EventRef.ResultEventRef = "" return *model }, - Err: `workflow.states[0].actions[0].eventRef.triggerEventRef is required -workflow.states[0].actions[0].eventRef.resultEventRef is required`, + Err: `workflow.states[0].actions[0].eventRef.triggerEventRef is required`, }, { Desp: "exists",