feat: group workflow limits on a top-level field

smartcontractkit · Feb 10, 2025 · 5dd51d6 · 5dd51d6
1 parent 8a03a29
commit 5dd51d6
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 15 deletions.
diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml
@@ -469,6 +469,8 @@ MaxBinarySize = '20.00mb' # Default
 MaxEncryptedSecretsSize = '26.40kb' # Default
 # MaxConfigSize is the maximum size of a config that can be fetched from the given config url.
 MaxConfigSize = '50.00kb' # Default
+
+[Capabilities.WorkflowRegistry.Limits]
 # WorkflowsGlobalLimit is the maximum number of workflows that can be registered globally.
 WorkflowsGlobalLimit = 50 # Default
 # WorkflowsPerOwnerLimit is the maximum number of workflows that can be registered per owner.

diff --git a/core/config/toml/types.go b/core/config/toml/types.go
@@ -1487,15 +1487,29 @@ func (r *ExternalRegistry) setFrom(f *ExternalRegistry) {
 	}
 }
 
+type WorkflowLimits struct {
+	WorkflowsGlobalLimit   *int32
+	WorkflowsPerOwnerLimit *int32
+}
+
+func (r *WorkflowLimits) setFrom(f *WorkflowLimits) {
+	if f.WorkflowsGlobalLimit != nil {
+		r.WorkflowsGlobalLimit = f.WorkflowsGlobalLimit
+	}
+
+	if f.WorkflowsPerOwnerLimit != nil {
+		r.WorkflowsPerOwnerLimit = f.WorkflowsPerOwnerLimit
+	}
+}
+
 type WorkflowRegistry struct {
 	Address                 *string
 	NetworkID               *string
 	ChainID                 *string
 	MaxBinarySize           *utils.FileSize
 	MaxEncryptedSecretsSize *utils.FileSize
 	MaxConfigSize           *utils.FileSize
-	WorkflowsGlobalLimit    *int32
-	WorkflowsPerOwnerLimit  *int32
+	Limits                  WorkflowLimits
 }
 
 func (r *WorkflowRegistry) setFrom(f *WorkflowRegistry) {
@@ -1523,13 +1537,7 @@ func (r *WorkflowRegistry) setFrom(f *WorkflowRegistry) {
 		r.MaxConfigSize = f.MaxConfigSize
 	}
 
-	if f.WorkflowsGlobalLimit != nil {
-		r.WorkflowsGlobalLimit = f.WorkflowsGlobalLimit
-	}
-
-	if f.WorkflowsPerOwnerLimit != nil {
-		r.WorkflowsPerOwnerLimit = f.WorkflowsPerOwnerLimit
-	}
+	r.Limits.setFrom(&f.Limits)
 }
 
 type Dispatcher struct {

diff --git a/core/services/chainlink/config_capabilities.go b/core/services/chainlink/config_capabilities.go
@@ -154,11 +154,11 @@ func (c *capabilitiesWorkflowRegistry) MaxConfigSize() utils.FileSize {
 }
 
 func (c *capabilitiesWorkflowRegistry) WorkflowsGlobalLimit() int32 {
-	return *c.c.WorkflowsGlobalLimit
+	return *c.c.Limits.WorkflowsGlobalLimit
 }
 
 func (c *capabilitiesWorkflowRegistry) WorkflowsPerOwnerLimit() int32 {
-	return *c.c.WorkflowsPerOwnerLimit
+	return *c.c.Limits.WorkflowsPerOwnerLimit
 }
 
 type gatewayConnector struct {

diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go
@@ -478,8 +478,10 @@ func TestConfig_Marshal(t *testing.T) {
 			MaxBinarySize:           ptr(utils.FileSize(20 * utils.MB)),
 			MaxEncryptedSecretsSize: ptr(utils.FileSize(26.4 * utils.KB)),
 			MaxConfigSize:           ptr(utils.FileSize(50 * utils.KB)),
-			WorkflowsGlobalLimit:    ptr(int32(50)),
-			WorkflowsPerOwnerLimit:  ptr(int32(5)),
+			Limits: toml.WorkflowLimits{
+				WorkflowsGlobalLimit:   ptr(int32(50)),
+				WorkflowsPerOwnerLimit: ptr(int32(5)),
+			},
 		},
 		Dispatcher: toml.Dispatcher{
 			SupportedVersion:   ptr(1),

diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml
@@ -286,6 +286,8 @@ ChainID = '1'
 MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
+
+[Capabilities.WorkflowRegistry.Limits]
 WorkflowsGlobalLimit = 50
 WorkflowsPerOwnerLimit = 5
 

diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml
@@ -296,6 +296,8 @@ ChainID = '1'
 MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
+
+[Capabilities.WorkflowRegistry.Limits]
 WorkflowsGlobalLimit = 50
 WorkflowsPerOwnerLimit = 5
 

diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml
@@ -286,6 +286,8 @@ ChainID = '1'
 MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
+
+[Capabilities.WorkflowRegistry.Limits]
 WorkflowsGlobalLimit = 50
 WorkflowsPerOwnerLimit = 5
 

diff --git a/docs/CONFIG.md b/docs/CONFIG.md
@@ -1263,8 +1263,6 @@ ChainID = '1' # Default
 MaxBinarySize = '20.00mb' # Default
 MaxEncryptedSecretsSize = '26.40kb' # Default
 MaxConfigSize = '50.00kb' # Default
-WorkflowsGlobalLimit = 50 # Default
-WorkflowsPerOwnerLimit = 5 # Default
 ```
 
 
@@ -1304,6 +1302,14 @@ MaxConfigSize = '50.00kb' # Default
 ```
 MaxConfigSize is the maximum size of a config that can be fetched from the given config url.
 
+## Capabilities.WorkflowRegistry.Limits
+```toml
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50 # Default
+WorkflowsPerOwnerLimit = 5 # Default
+```
+
+
 ### WorkflowsGlobalLimit
 ```toml
 WorkflowsGlobalLimit = 50 # Default