Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmd/workflow/simulate/capabilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ func NewManualTriggerCapabilities(
limits *SimulationLimits,
) (*ManualTriggers, error) {
// Cron
manualCronTrigger := fakes.NewManualCronTriggerService(lggr)
manualCronTrigger, err := fakes.NewManualCronTriggerService(lggr)
if err != nil {
return nil, err
}
manualCronTriggerServer := crontrigger.NewCronServer(manualCronTrigger)
if err := registry.Add(ctx, manualCronTriggerServer); err != nil {
return nil, err
Expand Down
38 changes: 34 additions & 4 deletions cmd/workflow/simulate/simulate.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,11 @@ func (h *handler) ValidateInputs(inputs Inputs) error {
inputs.ConfigPath = savedConfig

// forbid the default 0x...01 key when broadcasting
if inputs.Broadcast && inputs.EthPrivateKey != nil && inputs.EthPrivateKey.D.Cmp(big.NewInt(1)) == 0 {
return fmt.Errorf("you must configure a valid private key to perform on-chain writes. Please set your private key in the .env file before using the -–broadcast flag")
if inputs.Broadcast && inputs.EthPrivateKey != nil {
keyBytes, keyBytesErr := inputs.EthPrivateKey.Bytes()
if keyBytesErr == nil && new(big.Int).SetBytes(keyBytes).Cmp(big.NewInt(1)) == 0 {
return fmt.Errorf("you must configure a valid private key to perform on-chain writes. Please set your private key in the .env file before using the -–broadcast flag")
}
}

rpcErr := ui.WithSpinner("Checking RPC connectivity...", func() error {
Expand Down Expand Up @@ -749,7 +752,25 @@ func makeBeforeStartInteractive(holder *TriggerInfoAndBeforeStart, inputs Inputs
switch {
case trigger == "cron-trigger@1.0.0":
holder.TriggerFunc = func() error {
return triggerCaps.ManualCronTrigger.ManualTrigger(ctx, triggerRegistrationID, time.Now())
skipWaitSignal := make(chan struct{}, 1)

userPromptCtx, cancel := context.WithCancel(ctx)
defer cancel()

go func() {
ui.Line()
pressed := ui.WaitForEnter(userPromptCtx, "Cron scheduler started. Press Enter to skip waiting...")
if pressed {
skipWaitSignal <- struct{}{}
}
}()

err := triggerCaps.ManualCronTrigger.ManualTrigger(ctx, triggerRegistrationID, skipWaitSignal)
if err != nil {
return err
}

return nil
Comment thread
tarcisiozf marked this conversation as resolved.
}
case trigger == "http-trigger@1.0.0-alpha":
payload, err := getHTTPTriggerPayload(inputs.InvocationDir)
Expand Down Expand Up @@ -824,7 +845,16 @@ func makeBeforeStartNonInteractive(holder *TriggerInfoAndBeforeStart, inputs Inp
switch {
case trigger == "cron-trigger@1.0.0":
holder.TriggerFunc = func() error {
return triggerCaps.ManualCronTrigger.ManualTrigger(ctx, triggerRegistrationID, time.Now())
skipWaitSignal := make(chan struct{}, 1)
err := triggerCaps.ManualCronTrigger.ManualTrigger(ctx, triggerRegistrationID, skipWaitSignal)
if err != nil {
return err
}

// With cron schedule on non-interactive mode
skipWaitSignal <- struct{}{}

return nil
}
case trigger == "http-trigger@1.0.0-alpha":
if strings.TrimSpace(inputs.HTTPPayload) == "" {
Expand Down
Loading
Loading