Skip to content
Draft
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
3 changes: 2 additions & 1 deletion pkg/settings/cresettings/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ flowchart
PerWorkflow.ExecutionResponseLimit{{PerWorkflow.ExecutionResponseLimit}}:::bound
PerWorkflow.ExecutionTimestampsEnabled[/PerWorkflow.ExecutionTimestampsEnabled\]:::gate
PerWorkflow.FeatureMultiTriggerExecutionIDsActiveAt[/PerWorkflow.FeatureMultiTriggerExecutionIDsActiveAt\]:::gate
PerWorkflow.FeatureOCRQueueEnabled[/PerWorkflow.FeatureOCRQueueEnabled\]:::gate

PerWorkflow.ExecutionTimestampsEnabled-->PerWorkflow.FeatureMultiTriggerExecutionIDsActiveAt-->PerWorkflow.ExecutionTimeout-->PerWorkflow.ExecutionResponseLimit
PerWorkflow.ExecutionTimestampsEnabled-->PerWorkflow.FeatureMultiTriggerExecutionIDsActiveAt-->PerWorkflow.FeatureOCRQueueEnabled-->PerWorkflow.ExecutionTimeout-->PerWorkflow.ExecutionResponseLimit
end

subgraph ExecutionHelper.GetSecrets
Expand Down
3 changes: 2 additions & 1 deletion pkg/settings/cresettings/defaults.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
"Secrets": {
"CallLimit": "5"
},
"FeatureMultiTriggerExecutionIDsActiveAt": "2100-01-01 00:00:00 +0000 UTC"
"FeatureMultiTriggerExecutionIDsActiveAt": "2100-01-01 00:00:00 +0000 UTC",
"FeatureOCRQueueEnabled": "false"
}
}
1 change: 1 addition & 0 deletions pkg/settings/cresettings/defaults.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ WASMSecretsSizeLimit = '1mb'
LogLineLimit = '1kb'
LogEventLimit = '1000'
FeatureMultiTriggerExecutionIDsActiveAt = '2100-01-01 00:00:00 +0000 UTC'
FeatureOCRQueueEnabled = 'false'

[PerWorkflow.ChainAllowed]
Default = 'false'
Expand Down
3 changes: 3 additions & 0 deletions pkg/settings/cresettings/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ var Default = Schema{
},

FeatureMultiTriggerExecutionIDsActiveAt: Time(time.Date(2100, 1, 1, 0, 0, 0, 0, time.UTC)),
FeatureOCRQueueEnabled: Bool(false),
},
}

Expand Down Expand Up @@ -240,6 +241,7 @@ type Schema struct {
PerOwner Owners `scope:"owner"`
PerWorkflow Workflows `scope:"workflow"`
}

type Orgs struct {
ZeroBalancePruningTimeout Setting[time.Duration]
}
Expand Down Expand Up @@ -289,6 +291,7 @@ type Workflows struct {
Secrets secrets

FeatureMultiTriggerExecutionIDsActiveAt Setting[config.Timestamp]
FeatureOCRQueueEnabled Setting[bool]
}

type cronTrigger struct {
Expand Down
12 changes: 11 additions & 1 deletion pkg/settings/cresettings/settings_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,15 @@ func TestSchema_Unmarshal(t *testing.T) {
"ChainRead": {
"CallLimit": "3"
},
"FeatureMultiTriggerExecutionIDsActiveAt": "2025-06-15 00:00:00 +0000 UTC"
"FeatureMultiTriggerExecutionIDsActiveAt": "2025-06-15 00:00:00 +0000 UTC",
"FeatureOCRQueueEnabled": "true"
}
}`), &cfg))

assert.Equal(t, 500, cfg.WorkflowLimit.DefaultValue)
assert.Equal(t, 14*config.KByte, cfg.GatewayIncomingPayloadSizeLimit.DefaultValue)
assert.Equal(t, true, cfg.GatewayVaultManagementEnabled.DefaultValue)
assert.Equal(t, true, cfg.PerWorkflow.FeatureOCRQueueEnabled.DefaultValue)
assert.Equal(t, 48*time.Hour, cfg.PerOrg.ZeroBalancePruningTimeout.DefaultValue)
assert.Equal(t, 99, cfg.PerOwner.WorkflowExecutionConcurrencyLimit.DefaultValue)
assert.Equal(t, 250*config.MByte, cfg.PerWorkflow.WASMMemoryLimit.DefaultValue)
Expand All @@ -141,6 +143,14 @@ func TestSchema_Unmarshal(t *testing.T) {
assert.Equal(t, config.Timestamp(time.Date(2025, 6, 15, 0, 0, 0, 0, time.UTC).Unix()), cfg.PerWorkflow.FeatureMultiTriggerExecutionIDsActiveAt.DefaultValue)
}

func TestFeatureOCRQueueEnabled(t *testing.T) {
assert.False(t, Default.PerWorkflow.FeatureOCRQueueEnabled.DefaultValue, "default should be false")

got, err := Default.PerWorkflow.FeatureOCRQueueEnabled.GetOrDefault(t.Context(), nil)
require.NoError(t, err)
assert.False(t, got, "GetOrDefault with nil getter should return default false")
}

func TestDefaultGetter(t *testing.T) {
limit := Default.PerWorkflow.HTTPAction.CallLimit

Expand Down
Loading