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
8 changes: 8 additions & 0 deletions pkg/settings/cresettings/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,14 @@ flowchart
PerWorkflow.HTTPAction.RequestSizeLimit{{RequestSizeLimit}}:::bound
PerWorkflow.HTTPAction.ResponseSizeLimit{{ResponseSizeLimit}}:::bound
end
subgraph PerWorkflow.ConfidentialHTTP
direction LR

PerWorkflow.ConfidentialHTTP.CallLimit{{CallLimit}}:::bound
PerWorkflow.ConfidentialHTTP.ConnectionTimeout{{ConnectionTimeout}}:::bound
PerWorkflow.ConfidentialHTTP.RequestSizeLimit{{RequestSizeLimit}}:::bound
PerWorkflow.ConfidentialHTTP.ResponseSizeLimit{{ResponseSizeLimit}}:::bound
end
subgraph PerWorkflow.Secrets
PerWorkflow.Secrets.CallLimit{{CallLimit}}:::bound
end
Expand Down
6 changes: 6 additions & 0 deletions pkg/settings/cresettings/defaults.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@
"RequestSizeLimit": "10kb",
"ResponseSizeLimit": "100kb"
},
"ConfidentialHTTP": {
"CallLimit": "5",
"ConnectionTimeout": "10s",
"RequestSizeLimit": "10kb",
"ResponseSizeLimit": "100kb"
},
"Secrets": {
"CallLimit": "5"
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/settings/cresettings/defaults.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,11 @@ ConnectionTimeout = '10s'
RequestSizeLimit = '10kb'
ResponseSizeLimit = '100kb'

[PerWorkflow.ConfidentialHTTP]
CallLimit = '5'
ConnectionTimeout = '10s'
RequestSizeLimit = '10kb'
ResponseSizeLimit = '100kb'

[PerWorkflow.Secrets]
CallLimit = '5'
23 changes: 18 additions & 5 deletions pkg/settings/cresettings/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ var Default = Schema{
RequestSizeLimit: Size(10 * config.KByte),
ResponseSizeLimit: Size(100 * config.KByte),
},
ConfidentialHTTP: confidentialHTTP{
CallLimit: Int(5),
ConnectionTimeout: Duration(10 * time.Second),
RequestSizeLimit: Size(10 * config.KByte),
ResponseSizeLimit: Size(100 * config.KByte),
},
Secrets: secrets{
CallLimit: Int(5),
},
Expand Down Expand Up @@ -213,11 +219,12 @@ type Workflows struct {
HTTPTrigger httpTrigger
LogTrigger logTrigger

ChainWrite chainWrite
ChainRead chainRead
Consensus consensus
HTTPAction httpAction
Secrets secrets
ChainWrite chainWrite
ChainRead chainRead
Consensus consensus
HTTPAction httpAction
ConfidentialHTTP confidentialHTTP
Secrets secrets
}

type cronTrigger struct {
Expand Down Expand Up @@ -254,6 +261,12 @@ type httpAction struct {
RequestSizeLimit Setting[config.Size]
ResponseSizeLimit Setting[config.Size]
}
type confidentialHTTP struct {
CallLimit Setting[int] `unit:"{call}"`
ConnectionTimeout Setting[time.Duration]
RequestSizeLimit Setting[config.Size]
ResponseSizeLimit Setting[config.Size]
}
type secrets struct {
CallLimit Setting[int] `unit:"{call}"`
}
Expand Down
8 changes: 8 additions & 0 deletions pkg/settings/cresettings/settings_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ func TestSchema_Unmarshal(t *testing.T) {
"CallLimit": "5",
"CacheAgeLimit": "5m"
},
"ConfidentialHTTP": {
"CallLimit": "5",
"ConnectionTimeout": "10s",
"RequestSizeLimit": "10kb",
"ResponseSizeLimit": "100kb"
},
"Secrets": {
"CallLimit": "5"
},
Expand Down Expand Up @@ -126,6 +132,8 @@ func TestSchema_Unmarshal(t *testing.T) {
assert.Equal(t, config.Rate{Limit: rate.Every(13 * time.Second), Burst: 6}, cfg.PerWorkflow.LogTrigger.EventRateLimit.DefaultValue)
assert.Equal(t, 5, cfg.PerWorkflow.HTTPAction.CallLimit.DefaultValue)
assert.Equal(t, 5*time.Minute, cfg.PerWorkflow.HTTPAction.CacheAgeLimit.DefaultValue)
assert.Equal(t, 5, cfg.PerWorkflow.ConfidentialHTTP.CallLimit.DefaultValue)
assert.Equal(t, 10*config.KByte, cfg.PerWorkflow.ConfidentialHTTP.RequestSizeLimit.DefaultValue)
assert.Equal(t, 5, cfg.PerWorkflow.Secrets.CallLimit.DefaultValue)
assert.Equal(t, uint64(500000), cfg.PerWorkflow.ChainWrite.EVM.TransactionGasLimit.DefaultValue)
assert.Equal(t, 3, cfg.PerWorkflow.ChainRead.CallLimit.DefaultValue)
Expand Down
Loading