Skip to content

Commit cd99794

Browse files
russell-sternrussell-stern
authored
Added label consensus flag (#2187)
* Added label consensus flag * Renamed the flag
1 parent 127757c commit cd99794

5 files changed

Lines changed: 48 additions & 42 deletions

File tree

‎pkg/settings/cresettings/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ flowchart
4242
VaultBase64EncodingEnabled[/VaultBase64EncodingEnabled\]:::gate
4343
VaultForceEmptyOCRRounds[/VaultForceEmptyOCRRounds\]:::gate
4444
VaultOptimizationsEnabled[/VaultOptimizationsEnabled\]:::gate
45+
VaultGetSecretsShareAggregationIncludesPublicKeys[/VaultGetSecretsShareAggregationIncludesPublicKeys\]:::gate
4546
VaultOwnerAddressCanonicalizationEnabled[/VaultOwnerAddressCanonicalizationEnabled\]:::gate
4647
VaultSignedResponseRequestIDEnabled[/VaultSignedResponseRequestIDEnabled\]:::gate
4748
end

‎pkg/settings/cresettings/defaults.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"VaultBase64EncodingEnabled": "false",
1010
"VaultForceEmptyOCRRounds": "false",
1111
"VaultOptimizationsEnabled": "false",
12+
"VaultGetSecretsShareAggregationIncludesPublicKeys": "false",
1213
"VaultOwnerAddressCanonicalizationEnabled": "false",
1314
"VaultSignedResponseRequestIDEnabled": "false",
1415
"GatewayHTTPGlobalRate": "500rps:500",

‎pkg/settings/cresettings/defaults.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ PropagateOrgIDInRequestMetadata = 'false'
88
VaultBase64EncodingEnabled = 'false'
99
VaultForceEmptyOCRRounds = 'false'
1010
VaultOptimizationsEnabled = 'false'
11+
VaultGetSecretsShareAggregationIncludesPublicKeys = 'false'
1112
VaultOwnerAddressCanonicalizationEnabled = 'false'
1213
VaultSignedResponseRequestIDEnabled = 'false'
1314
GatewayHTTPGlobalRate = '500rps:500'

‎pkg/settings/cresettings/settings.go‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,25 @@ var Default = Schema{
5858
GatewayVaultManagementEnabled: Bool(true),
5959
VaultJWTAuthEnabled: Bool(false),
6060
// Deprecated: retained for backwards compatibility; workflow owner identifies secret ownership.
61-
VaultOrgIdAsSecretOwnerEnabled: Bool(false),
62-
PropagateOrgIDInRequestMetadata: Bool(false),
63-
VaultBase64EncodingEnabled: Bool(false),
64-
VaultForceEmptyOCRRounds: Bool(false),
65-
VaultOptimizationsEnabled: Bool(false),
66-
VaultOwnerAddressCanonicalizationEnabled: Bool(false),
67-
VaultSignedResponseRequestIDEnabled: Bool(false),
68-
GatewayHTTPGlobalRate: Rate(rate.Limit(500), 500),
69-
GatewayHTTPPerNodeRate: Rate(rate.Limit(100), 100),
70-
GatewayConfidentialRelayGlobalRate: Rate(rate.Limit(50), 10),
71-
GatewayConfidentialRelayPerNodeRate: Rate(rate.Limit(10), 10),
72-
GatewayHTTPActionMtlsRequestRate: Rate(rate.Every(30*time.Second), 0),
73-
GatewayHTTPActionMtlsConcurrencyLimit: Int(50),
74-
TriggerRegistrationStatusUpdateTimeout: Duration(0 * time.Second),
75-
BaseTriggerRetryInterval: Duration(30 * time.Second),
76-
BaseTriggerMaxRetries: Int(20),
77-
BaseTriggerPruneAge: Duration(24 * time.Hour),
78-
BaseTriggerMaxSendsPerTick: Int(20),
61+
VaultOrgIdAsSecretOwnerEnabled: Bool(false),
62+
PropagateOrgIDInRequestMetadata: Bool(false),
63+
VaultBase64EncodingEnabled: Bool(false),
64+
VaultForceEmptyOCRRounds: Bool(false),
65+
VaultOptimizationsEnabled: Bool(false),
66+
VaultGetSecretsShareAggregationIncludesPublicKeys: Bool(false),
67+
VaultOwnerAddressCanonicalizationEnabled: Bool(false),
68+
VaultSignedResponseRequestIDEnabled: Bool(false),
69+
GatewayHTTPGlobalRate: Rate(rate.Limit(500), 500),
70+
GatewayHTTPPerNodeRate: Rate(rate.Limit(100), 100),
71+
GatewayConfidentialRelayGlobalRate: Rate(rate.Limit(50), 10),
72+
GatewayConfidentialRelayPerNodeRate: Rate(rate.Limit(10), 10),
73+
GatewayHTTPActionMtlsRequestRate: Rate(rate.Every(30*time.Second), 0),
74+
GatewayHTTPActionMtlsConcurrencyLimit: Int(50),
75+
TriggerRegistrationStatusUpdateTimeout: Duration(0 * time.Second),
76+
BaseTriggerRetryInterval: Duration(30 * time.Second),
77+
BaseTriggerMaxRetries: Int(20),
78+
BaseTriggerPruneAge: Duration(24 * time.Hour),
79+
BaseTriggerMaxSendsPerTick: Int(20),
7980

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

275276
type Schema struct {
276-
WorkflowLimit Setting[int] `unit:"{workflow}"`
277-
WorkflowExecutionConcurrencyLimit Setting[int] `unit:"{workflow}"`
278-
GatewayIncomingPayloadSizeLimit Setting[config.Size]
279-
GatewayVaultManagementEnabled Setting[bool]
280-
VaultJWTAuthEnabled Setting[bool]
281-
VaultOrgIdAsSecretOwnerEnabled Setting[bool] // Deprecated
282-
PropagateOrgIDInRequestMetadata Setting[bool]
283-
VaultBase64EncodingEnabled Setting[bool]
284-
VaultForceEmptyOCRRounds Setting[bool]
285-
VaultOptimizationsEnabled Setting[bool]
286-
VaultOwnerAddressCanonicalizationEnabled Setting[bool]
287-
VaultSignedResponseRequestIDEnabled Setting[bool]
288-
GatewayHTTPGlobalRate Setting[config.Rate]
289-
GatewayHTTPPerNodeRate Setting[config.Rate]
290-
GatewayConfidentialRelayGlobalRate Setting[config.Rate]
291-
GatewayConfidentialRelayPerNodeRate Setting[config.Rate]
292-
GatewayHTTPActionMtlsRequestRate Setting[config.Rate]
293-
GatewayHTTPActionMtlsConcurrencyLimit Setting[int] `unit:"{request}"`
294-
TriggerRegistrationStatusUpdateTimeout Setting[time.Duration]
277+
WorkflowLimit Setting[int] `unit:"{workflow}"`
278+
WorkflowExecutionConcurrencyLimit Setting[int] `unit:"{workflow}"`
279+
GatewayIncomingPayloadSizeLimit Setting[config.Size]
280+
GatewayVaultManagementEnabled Setting[bool]
281+
VaultJWTAuthEnabled Setting[bool]
282+
VaultOrgIdAsSecretOwnerEnabled Setting[bool] // Deprecated
283+
PropagateOrgIDInRequestMetadata Setting[bool]
284+
VaultBase64EncodingEnabled Setting[bool]
285+
VaultForceEmptyOCRRounds Setting[bool]
286+
VaultOptimizationsEnabled Setting[bool]
287+
VaultGetSecretsShareAggregationIncludesPublicKeys Setting[bool]
288+
VaultOwnerAddressCanonicalizationEnabled Setting[bool]
289+
VaultSignedResponseRequestIDEnabled Setting[bool]
290+
GatewayHTTPGlobalRate Setting[config.Rate]
291+
GatewayHTTPPerNodeRate Setting[config.Rate]
292+
GatewayConfidentialRelayGlobalRate Setting[config.Rate]
293+
GatewayConfidentialRelayPerNodeRate Setting[config.Rate]
294+
GatewayHTTPActionMtlsRequestRate Setting[config.Rate]
295+
GatewayHTTPActionMtlsConcurrencyLimit Setting[int] `unit:"{request}"`
296+
TriggerRegistrationStatusUpdateTimeout Setting[time.Duration]
295297

296298
BaseTriggerRetryInterval Setting[time.Duration]
297299
BaseTriggerMaxRetries Setting[int] `unit:"{attempt}"`
@@ -384,12 +386,12 @@ type Workflows struct {
384386
Secrets secrets
385387
DONTime donTime
386388

387-
FeatureMultiTriggerExecutionIDsActiveAt Setting[config.Timestamp] // Deprecated
388-
FeatureMultiTriggerExecutionIDsActivePeriod Setting[Range[config.Timestamp]]
389+
FeatureMultiTriggerExecutionIDsActiveAt Setting[config.Timestamp] // Deprecated
390+
FeatureMultiTriggerExecutionIDsActivePeriod Setting[Range[config.Timestamp]]
389391
FeatureUseSingleDONTimeProviderPerExecutionActivePeriod Setting[Range[config.Timestamp]]
390-
FeatureChainCapabilityHashBasedOCRActivePeriod Setting[Range[config.Timestamp]]
391-
FeatureEVMWriteReportL1FeeActivePeriod Setting[Range[config.Timestamp]]
392-
FeatureAptosWriteReportBlockTimestampActivePeriod Setting[Range[config.Timestamp]]
392+
FeatureChainCapabilityHashBasedOCRActivePeriod Setting[Range[config.Timestamp]]
393+
FeatureEVMWriteReportL1FeeActivePeriod Setting[Range[config.Timestamp]]
394+
FeatureAptosWriteReportBlockTimestampActivePeriod Setting[Range[config.Timestamp]]
393395
}
394396

395397
type cronTrigger struct {

‎pkg/settings/cresettings/settings_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ func TestSchema_Unmarshal(t *testing.T) {
135135
assert.False(t, cfg.VaultBase64EncodingEnabled.DefaultValue)
136136
assert.False(t, cfg.VaultForceEmptyOCRRounds.DefaultValue)
137137
assert.False(t, cfg.VaultOptimizationsEnabled.DefaultValue)
138+
assert.False(t, cfg.VaultGetSecretsShareAggregationIncludesPublicKeys.DefaultValue)
138139
assert.False(t, cfg.VaultOwnerAddressCanonicalizationEnabled.DefaultValue)
139140
assert.False(t, cfg.VaultSignedResponseRequestIDEnabled.DefaultValue)
140141
assert.Equal(t, config.Rate{Limit: rate.Limit(20), Burst: 7}, cfg.GatewayConfidentialRelayGlobalRate.DefaultValue)

0 commit comments

Comments
 (0)