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
1 change: 1 addition & 0 deletions pkg/settings/cresettings/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ flowchart
VaultBase64EncodingEnabled[/VaultBase64EncodingEnabled\]:::gate
VaultForceEmptyOCRRounds[/VaultForceEmptyOCRRounds\]:::gate
VaultOptimizationsEnabled[/VaultOptimizationsEnabled\]:::gate
VaultGetSecretsShareAggregationIncludesPublicKeys[/VaultGetSecretsShareAggregationIncludesPublicKeys\]:::gate
VaultOwnerAddressCanonicalizationEnabled[/VaultOwnerAddressCanonicalizationEnabled\]:::gate
VaultSignedResponseRequestIDEnabled[/VaultSignedResponseRequestIDEnabled\]:::gate
end
Expand Down
1 change: 1 addition & 0 deletions pkg/settings/cresettings/defaults.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"VaultBase64EncodingEnabled": "false",
"VaultForceEmptyOCRRounds": "false",
"VaultOptimizationsEnabled": "false",
"VaultGetSecretsShareAggregationIncludesPublicKeys": "false",
"VaultOwnerAddressCanonicalizationEnabled": "false",
"VaultSignedResponseRequestIDEnabled": "false",
"GatewayHTTPGlobalRate": "500rps:500",
Expand Down
1 change: 1 addition & 0 deletions pkg/settings/cresettings/defaults.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ PropagateOrgIDInRequestMetadata = 'false'
VaultBase64EncodingEnabled = 'false'
VaultForceEmptyOCRRounds = 'false'
VaultOptimizationsEnabled = 'false'
VaultGetSecretsShareAggregationIncludesPublicKeys = 'false'
VaultOwnerAddressCanonicalizationEnabled = 'false'
VaultSignedResponseRequestIDEnabled = 'false'
GatewayHTTPGlobalRate = '500rps:500'
Expand Down
86 changes: 44 additions & 42 deletions pkg/settings/cresettings/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,24 +58,25 @@ var Default = Schema{
GatewayVaultManagementEnabled: Bool(true),
VaultJWTAuthEnabled: Bool(false),
// Deprecated: retained for backwards compatibility; workflow owner identifies secret ownership.
VaultOrgIdAsSecretOwnerEnabled: Bool(false),
PropagateOrgIDInRequestMetadata: Bool(false),
VaultBase64EncodingEnabled: Bool(false),
VaultForceEmptyOCRRounds: Bool(false),
VaultOptimizationsEnabled: Bool(false),
VaultOwnerAddressCanonicalizationEnabled: Bool(false),
VaultSignedResponseRequestIDEnabled: Bool(false),
GatewayHTTPGlobalRate: Rate(rate.Limit(500), 500),
GatewayHTTPPerNodeRate: Rate(rate.Limit(100), 100),
GatewayConfidentialRelayGlobalRate: Rate(rate.Limit(50), 10),
GatewayConfidentialRelayPerNodeRate: Rate(rate.Limit(10), 10),
GatewayHTTPActionMtlsRequestRate: Rate(rate.Every(30*time.Second), 0),
GatewayHTTPActionMtlsConcurrencyLimit: Int(50),
TriggerRegistrationStatusUpdateTimeout: Duration(0 * time.Second),
BaseTriggerRetryInterval: Duration(30 * time.Second),
BaseTriggerMaxRetries: Int(20),
BaseTriggerPruneAge: Duration(24 * time.Hour),
BaseTriggerMaxSendsPerTick: Int(20),
VaultOrgIdAsSecretOwnerEnabled: Bool(false),
PropagateOrgIDInRequestMetadata: Bool(false),
VaultBase64EncodingEnabled: Bool(false),
VaultForceEmptyOCRRounds: Bool(false),
VaultOptimizationsEnabled: Bool(false),
VaultGetSecretsShareAggregationIncludesPublicKeys: Bool(false),
VaultOwnerAddressCanonicalizationEnabled: Bool(false),
VaultSignedResponseRequestIDEnabled: Bool(false),
GatewayHTTPGlobalRate: Rate(rate.Limit(500), 500),
GatewayHTTPPerNodeRate: Rate(rate.Limit(100), 100),
GatewayConfidentialRelayGlobalRate: Rate(rate.Limit(50), 10),
GatewayConfidentialRelayPerNodeRate: Rate(rate.Limit(10), 10),
GatewayHTTPActionMtlsRequestRate: Rate(rate.Every(30*time.Second), 0),
GatewayHTTPActionMtlsConcurrencyLimit: Int(50),
TriggerRegistrationStatusUpdateTimeout: Duration(0 * time.Second),
BaseTriggerRetryInterval: Duration(30 * time.Second),
BaseTriggerMaxRetries: Int(20),
BaseTriggerPruneAge: Duration(24 * time.Hour),
BaseTriggerMaxSendsPerTick: Int(20),

// DANGER(cedric): Be extremely careful changing these vault limits below as they act as a default value
// used by the Vault OCR plugin -- changing these values could cause issues with the plugin during an image
Expand Down Expand Up @@ -270,25 +271,26 @@ var Default = Schema{
}

type Schema struct {
WorkflowLimit Setting[int] `unit:"{workflow}"`
WorkflowExecutionConcurrencyLimit Setting[int] `unit:"{workflow}"`
GatewayIncomingPayloadSizeLimit Setting[config.Size]
GatewayVaultManagementEnabled Setting[bool]
VaultJWTAuthEnabled Setting[bool]
VaultOrgIdAsSecretOwnerEnabled Setting[bool] // Deprecated
PropagateOrgIDInRequestMetadata Setting[bool]
VaultBase64EncodingEnabled Setting[bool]
VaultForceEmptyOCRRounds Setting[bool]
VaultOptimizationsEnabled Setting[bool]
VaultOwnerAddressCanonicalizationEnabled Setting[bool]
VaultSignedResponseRequestIDEnabled Setting[bool]
GatewayHTTPGlobalRate Setting[config.Rate]
GatewayHTTPPerNodeRate Setting[config.Rate]
GatewayConfidentialRelayGlobalRate Setting[config.Rate]
GatewayConfidentialRelayPerNodeRate Setting[config.Rate]
GatewayHTTPActionMtlsRequestRate Setting[config.Rate]
GatewayHTTPActionMtlsConcurrencyLimit Setting[int] `unit:"{request}"`
TriggerRegistrationStatusUpdateTimeout Setting[time.Duration]
WorkflowLimit Setting[int] `unit:"{workflow}"`
WorkflowExecutionConcurrencyLimit Setting[int] `unit:"{workflow}"`
GatewayIncomingPayloadSizeLimit Setting[config.Size]
GatewayVaultManagementEnabled Setting[bool]
VaultJWTAuthEnabled Setting[bool]
VaultOrgIdAsSecretOwnerEnabled Setting[bool] // Deprecated
PropagateOrgIDInRequestMetadata Setting[bool]
VaultBase64EncodingEnabled Setting[bool]
VaultForceEmptyOCRRounds Setting[bool]
VaultOptimizationsEnabled Setting[bool]
VaultGetSecretsShareAggregationIncludesPublicKeys Setting[bool]
VaultOwnerAddressCanonicalizationEnabled Setting[bool]
VaultSignedResponseRequestIDEnabled Setting[bool]
GatewayHTTPGlobalRate Setting[config.Rate]
GatewayHTTPPerNodeRate Setting[config.Rate]
GatewayConfidentialRelayGlobalRate Setting[config.Rate]
GatewayConfidentialRelayPerNodeRate Setting[config.Rate]
GatewayHTTPActionMtlsRequestRate Setting[config.Rate]
GatewayHTTPActionMtlsConcurrencyLimit Setting[int] `unit:"{request}"`
TriggerRegistrationStatusUpdateTimeout Setting[time.Duration]

BaseTriggerRetryInterval Setting[time.Duration]
BaseTriggerMaxRetries Setting[int] `unit:"{attempt}"`
Expand Down Expand Up @@ -380,12 +382,12 @@ type Workflows struct {
Secrets secrets
DONTime donTime

FeatureMultiTriggerExecutionIDsActiveAt Setting[config.Timestamp] // Deprecated
FeatureMultiTriggerExecutionIDsActivePeriod Setting[Range[config.Timestamp]]
FeatureMultiTriggerExecutionIDsActiveAt Setting[config.Timestamp] // Deprecated
FeatureMultiTriggerExecutionIDsActivePeriod Setting[Range[config.Timestamp]]
FeatureUseSingleDONTimeProviderPerExecutionActivePeriod Setting[Range[config.Timestamp]]
FeatureChainCapabilityHashBasedOCRActivePeriod Setting[Range[config.Timestamp]]
FeatureEVMWriteReportL1FeeActivePeriod Setting[Range[config.Timestamp]]
FeatureAptosWriteReportBlockTimestampActivePeriod Setting[Range[config.Timestamp]]
FeatureChainCapabilityHashBasedOCRActivePeriod Setting[Range[config.Timestamp]]
FeatureEVMWriteReportL1FeeActivePeriod Setting[Range[config.Timestamp]]
FeatureAptosWriteReportBlockTimestampActivePeriod Setting[Range[config.Timestamp]]
}

type cronTrigger struct {
Expand Down
1 change: 1 addition & 0 deletions pkg/settings/cresettings/settings_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ func TestSchema_Unmarshal(t *testing.T) {
assert.False(t, cfg.VaultBase64EncodingEnabled.DefaultValue)
assert.False(t, cfg.VaultForceEmptyOCRRounds.DefaultValue)
assert.False(t, cfg.VaultOptimizationsEnabled.DefaultValue)
assert.False(t, cfg.VaultGetSecretsShareAggregationIncludesPublicKeys.DefaultValue)
assert.False(t, cfg.VaultOwnerAddressCanonicalizationEnabled.DefaultValue)
assert.False(t, cfg.VaultSignedResponseRequestIDEnabled.DefaultValue)
assert.Equal(t, config.Rate{Limit: rate.Limit(20), Burst: 7}, cfg.GatewayConfidentialRelayGlobalRate.DefaultValue)
Expand Down
Loading