pkg/settings/cresettings: add CRONTrigger.FastestScheduleInterval

Author: jmank88

pkg/settings/cresettings/defaults.json

@@ -42,6 +42,7 @@
 		"LogLineLimit": "1kb",
 		"LogEventLimit": "1000",
 		"CRONTrigger": {
+			"FastestScheduleInterval": "30s",
 			"RateLimit": "every30s:1"
 		},
 		"HTTPTrigger": {

pkg/settings/cresettings/defaults.toml

@@ -43,6 +43,7 @@ LogLineLimit = '1kb'
 LogEventLimit = '1000'
 
 [PerWorkflow.CRONTrigger]
+FastestScheduleInterval = '30s'
 RateLimit = 'every30s:1'
 
 [PerWorkflow.HTTPTrigger]

pkg/settings/cresettings/settings.go

@@ -16,8 +16,14 @@ import (
 	. "github.com/smartcontractkit/chainlink-common/pkg/settings"
 )
 
-func init() {
-	if v, ok := os.LookupEnv("CL_CRE_SETTINGS_DEFAULT"); ok {
+const (
+	envNameSettings        = "CL_CRE_SETTINGS"
+	envNameSettingsDefault = "CL_CRE_SETTINGS_DEFAULT"
+)
+
+func init() { reinit() }
+func reinit() {
+	if v, ok := os.LookupEnv(envNameSettingsDefault); ok {
 		err := json.Unmarshal([]byte(v), &Default)
 		if err != nil {
 			log.Fatalf("failed to initialize defaults: %v", err)
@@ -29,7 +35,7 @@ func init() {
 	}
 	Config = Default
 
-	if v, ok := os.LookupEnv("CL_CRE_SETTINGS"); ok {
+	if v, ok := os.LookupEnv(envNameSettings); ok {
 		DefaultGetter, err = NewJSONGetter([]byte(v))
 		if err != nil {
 			log.Fatalf("failed to initialize settings: %v", err)
@@ -99,7 +105,8 @@ var Default = Schema{
 		LogEventLimit:                 Int(1_000),
 
 		CRONTrigger: cronTrigger{
-			RateLimit: Rate(rate.Every(30*time.Second), 1),
+			FastestScheduleInterval: Duration(30 * time.Second),
+			RateLimit:               Rate(rate.Every(30*time.Second), 1),
 		},
 		HTTPTrigger: httpTrigger{
 			RateLimit: Rate(rate.Every(30*time.Second), 3),
@@ -214,6 +221,7 @@ type Workflows struct {
 }
 
 type cronTrigger struct {
+	FastestScheduleInterval Setting[time.Duration]
 	// Deprecated: to be removed
 	RateLimit Setting[config.Rate]
 }

pkg/settings/cresettings/settings_test.go

@@ -15,6 +15,7 @@ import (
 	"golang.org/x/time/rate"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/config"
+	"github.com/smartcontractkit/chainlink-common/pkg/contexts"
 )
 
 var update = flag.Bool("update", false, "update the golden files of this test")
@@ -110,3 +111,50 @@ func TestSchema_Unmarshal(t *testing.T) {
 	assert.Equal(t, uint64(500000), cfg.PerWorkflow.ChainWrite.EVM.TransactionGasLimit.DefaultValue)
 	assert.Equal(t, 3, cfg.PerWorkflow.ChainRead.CallLimit.DefaultValue)
 }
+
+func TestDefaultGetter(t *testing.T) {
+	limit := Default.PerWorkflow.HTTPAction.CallLimit
+
+	ctx := contexts.WithCRE(t.Context(), contexts.CRE{Owner: "owner-id", Workflow: "foo"})
+	overrideCtx := contexts.WithCRE(t.Context(), contexts.CRE{Owner: "owner-id", Workflow: "test-wf-id"})
+
+	// Default 5
+	got, err := limit.GetOrDefault(ctx, DefaultGetter)
+	require.NoError(t, err)
+	require.Equal(t, 5, got)
+
+	// No override
+	got, err = limit.GetOrDefault(overrideCtx, DefaultGetter)
+	require.NoError(t, err)
+	require.Equal(t, 5, got)
+
+	t.Cleanup(reinit) // restore default vars
+	t.Setenv(envNameSettings, `{
+	"workflow": {
+		"test-wf-id": {
+			"PerWorkflow": {
+				"HTTPAction": {
+					"CallLimit": "20"
+				}
+			}
+		}
+	}
+}`)
+	reinit() // set default vars
+
+	_ = `
+[workflow.test-wf-id]
+PerWorkflow.HTTPAction.CallLimit = 20
+`
+
+	// Default unchanged
+	got, err = limit.GetOrDefault(ctx, DefaultGetter)
+	require.NoError(t, err)
+	require.Equal(t, 5, got)
+
+	// Override applied
+	got, err = limit.GetOrDefault(overrideCtx, DefaultGetter)
+	require.NoError(t, err)
+	require.Equal(t, 20, got)
+
+}

pkg/settings/toml.go

@@ -44,6 +44,7 @@ func CombineTOMLFiles(files fs.FS) ([]byte, error) {
 	tree.Set("workflow", workflows)
 	var b bytes.Buffer
 	e := toml.NewEncoder(&b).Indentation("")
+	e.Order(toml.OrderAlphabetical)
 	err = e.Encode(tree)
 	return b.Bytes(), err
 }