Skip to content

Commit 95cb3d8

Browse files
committed
Clean up from code review
1 parent 6baa865 commit 95cb3d8

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

core/services/workflows/syncer/handler.go

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -695,20 +695,20 @@ func (h *eventHandler) tryEngineCreate(ctx context.Context, spec *job.WorkflowSp
695695

696696
// Before running the engine, handle validations
697697
// Workflow ID should match what is generated from the stored artifacts
698-
owner, err := hex.DecodeString(spec.WorkflowOwner)
698+
ownerBytes, err := hex.DecodeString(spec.WorkflowOwner)
699699
if err != nil {
700700
return fmt.Errorf("failed to decode owner: %w", err)
701701
}
702-
hash, err := pkgworkflows.GenerateWorkflowID(owner, spec.WorkflowName, decodedBinary, []byte(spec.Config), secretsURL)
702+
hash, err := pkgworkflows.GenerateWorkflowID(ownerBytes, spec.WorkflowName, decodedBinary, []byte(spec.Config), secretsURL)
703703
if err != nil {
704704
return fmt.Errorf("failed to generate workflow id: %w", err)
705705
}
706-
wfID, err := types.WorkflowIDFromHex(spec.WorkflowID)
706+
wid, err := types.WorkflowIDFromHex(spec.WorkflowID)
707707
if err != nil {
708708
return fmt.Errorf("invalid workflow id: %w", err)
709709
}
710-
if !types.WorkflowID(hash).Equal(wfID) {
711-
return fmt.Errorf("workflowID mismatch: %x != %x", hash, wfID)
710+
if !types.WorkflowID(hash).Equal(wid) {
711+
return fmt.Errorf("workflowID mismatch: %x != %x", hash, wid)
712712
}
713713

714714
// Secrets should be valid
@@ -738,16 +738,6 @@ func (h *eventHandler) tryEngineCreate(ctx context.Context, spec *job.WorkflowSp
738738
return fmt.Errorf("failed to start workflow engine: %w", err)
739739
}
740740

741-
ownerBytes, err := hex.DecodeString(spec.WorkflowOwner)
742-
if err != nil {
743-
return err
744-
}
745-
746-
wid, err := types.WorkflowIDFromHex(spec.WorkflowID)
747-
if err != nil {
748-
return err
749-
}
750-
751741
if err := h.engineRegistry.Add(EngineRegistryKey{Owner: ownerBytes, Name: spec.WorkflowName}, engine, wid); err != nil {
752742
if closeErr := engine.Close(); closeErr != nil {
753743
return fmt.Errorf("failed to close workflow engine: %w during invariant violation: %w", closeErr, err)

0 commit comments

Comments
 (0)