Merge branch 'main' into cre-1320

Author: mchain0

.github/workflows/golangci_lint.yml

@@ -1,14 +1,18 @@
 name: Golangci-lint
 
-on: [pull_request]
+on: [pull_request, merge_group]
 
 jobs:
   golangci-lint:
+    # Avoid running in merge queue since we run in PR's and have an optional
+    # label to skip lint issues on a PR which would be ignored in the merge queue.
+    if: ${{ github.event_name != 'merge_group' }}
     runs-on: ubuntu-latest
     permissions:
       id-token: write
       contents: read
       actions: read
+      pull-requests: read
     steps:
       - name: Checkout code
         uses: actions/checkout@v5

.github/workflows/keystore.yml

@@ -2,7 +2,7 @@ name: Keystore Checks
 permissions:
   contents: read
 
-on: push
+on: [push, merge_group]
 
 jobs:
   changes:

.github/workflows/pkg.yml

@@ -1,6 +1,6 @@
 name: PKG Build and Test
 
-on: [push]
+on: [push, merge_group]
 
 jobs:
   build-test:

observability-lib/grafana/overrides.go

@@ -163,6 +163,13 @@ func NewMinWidthProperty(value float64) *Property {
 	}
 }
 
+func NewLineWidthProperty(value float64) *Property {
+	return &Property{
+		ID:    "custom.lineWidth",
+		Value: value,
+	}
+}
+
 type CellOptionsMode string
 
 const (

pkg/http/http.go

@@ -10,6 +10,18 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 )
 
+type noOpResponseWriter struct{}
+
+func (w *noOpResponseWriter) Header() http.Header {
+	return http.Header{}
+}
+
+func (w *noOpResponseWriter) Write(b []byte) (int, error) {
+	return len(b), nil
+}
+
+func (w *noOpResponseWriter) WriteHeader(statusCode int) {}
+
 type clientConfig interface {
 	URL() url.URL // DatabaseURL
 }
@@ -72,7 +84,10 @@ func (h *Request) SendRequestReader() (responseBody io.ReadCloser, statusCode in
 	elapsed := time.Since(start)
 	logger.Sugared(h.Logger).Tracew(fmt.Sprintf("http adapter got %v in %s", statusCode, elapsed), "statusCode", statusCode, "timeElapsedSeconds", elapsed)
 
-	source := http.MaxBytesReader(nil, r.Body, h.Config.SizeLimit)
+	var source io.ReadCloser = r.Body
+	if h.Config.SizeLimit > 0 {
+		source = http.MaxBytesReader(&noOpResponseWriter{}, r.Body, h.Config.SizeLimit)
+	}
 
 	return source, statusCode, r.Header, nil
 }

pkg/http/http_test.go

@@ -55,3 +55,31 @@ func (t *mockTransport) RoundTrip(req *netHttp.Request) (*netHttp.Response, erro
 	response.Body = io.NopCloser(strings.NewReader(responseBody))
 	return response, nil
 }
+
+func TestSendRequestReader_WithSizeLimit(t *testing.T) {
+	t.Parallel()
+
+	client := NewUnrestrictedClient()
+	client.Transport = newMockTransport()
+
+	netReq, err := netHttp.NewRequestWithContext(t.Context(), "GET", "http://localhost", bytes.NewReader([]byte{}))
+	assert.NoError(t, err)
+
+	req := &Request{
+		Client:  client,
+		Request: netReq,
+		Config:  RequestConfig{SizeLimit: 100},
+		Logger:  logger.Nop(),
+	}
+
+	reader, statusCode, headers, err := req.SendRequestReader()
+	assert.NoError(t, err)
+	assert.Equal(t, 200, statusCode)
+	assert.Equal(t, "application/json", headers.Get("Content-Type"))
+
+	// Verify reader works
+	body, err := io.ReadAll(reader)
+	assert.NoError(t, err)
+	assert.Equal(t, `{"foo":123}`, string(body))
+	assert.NoError(t, reader.Close())
+}

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)
+
+}