Prodcre 421 integration tests

http_trigger/trigger/connector_handler.go

@@ -308,7 +308,7 @@ func (h *connectorHandler) processTrigger(ctx context.Context, gatewayID string,
 		return // Error already sent in the method
 	}
 
-	err = h.triggerWorkflow(ctx, workflowID, req.ID, gatewayID, input, triggerReq.Key)
+	err = h.triggerWorkflow(ctx, workflowID, req.ID, gatewayID, workflowExecutionID, input, triggerReq.Key)
 	if err != nil {
 		l.Errorw("Failed to trigger workflow", "error", err)
 		return
@@ -417,15 +417,15 @@ func (h *connectorHandler) prepareAndCacheResponse(ctx context.Context, gatewayI
 	return resp, nil
 }
 
-func (h *connectorHandler) triggerWorkflow(ctx context.Context, workflowID string, reqID string, gatewayID string, input *structpb.Struct, key gateway_common.AuthorizedKey) error {
+func (h *connectorHandler) triggerWorkflow(ctx context.Context, workflowID string, reqID string, gatewayID string, executionID string, input *structpb.Struct, key gateway_common.AuthorizedKey) error {
 	workflow, ok := h.workflowStore.getWorkflowByID(workflowID)
 	if !ok {
 		h.sendErrorResponse(ctx, gatewayID, reqID, jsonrpc.ErrInvalidRequest, "Workflow not registered")
 		return fmt.Errorf("workflowID %s not registered", workflowID)
 	}
 	err := workflow.trigger(ctx, capabilities.TriggerAndId[*http.Payload]{
 		// workflow engine does not process the request if the ID has already been used
-		Id: reqID,
+		Id: executionID,
 		Trigger: &http.Payload{
 			Input: input,
 			Key: &http.AuthorizedKey{

http_trigger/trigger/trigger.go

@@ -71,11 +71,11 @@ func (s *service) Initialise(
 	workflowStore := newWorkflowStore(s.lggr)
 	metadataPublisher := NewGatewayMetadataPublisher(s.lggr, gc, outgoingRateLimiter, workflowStore, s.cfg)
 	requestCache := newRequestCache(s.lggr, kvstore, time.Duration(s.cfg.RequestCacheTTL)*time.Second)
-	s.connectorHandler, err = NewConnectorHandler(s.lggr, gc, s.cfg, outgoingRateLimiter, incomingRateLimiter, workflowStore, metadataPublisher, requestCache, s.metrics)
+	s.metrics, err = NewMetrics()
 	if err != nil {
 		return err
 	}
-	s.metrics, err = NewMetrics()
+	s.connectorHandler, err = NewConnectorHandler(s.lggr, gc, s.cfg, outgoingRateLimiter, incomingRateLimiter, workflowStore, metadataPublisher, requestCache, s.metrics)
 	if err != nil {
 		return err
 	}

integration_tests/go.mod

@@ -6,6 +6,8 @@ replace github.com/smartcontractkit/capabilities/loadtestwritetarget => ../loadt
 
 replace github.com/smartcontractkit/capabilities/http_action => ../http_action
 
+replace github.com/smartcontractkit/capabilities/http_trigger => ../http_trigger
+
 replace github.com/smartcontractkit/capabilities/chain_capabilities/evm => ../chain_capabilities/evm
 
 replace github.com/fbsobreira/gotron-sdk => github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d
@@ -19,14 +21,15 @@ require (
 	github.com/pelletier/go-toml v1.9.5
 	github.com/smartcontractkit/capabilities/chain_capabilities/evm v0.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/capabilities/http_action v0.0.0-00010101000000-000000000000
+	github.com/smartcontractkit/capabilities/http_trigger v0.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/capabilities/loadtestwritetarget v0.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/chain-selectors v1.0.67
 	github.com/smartcontractkit/chainlink-common v0.9.1-0.20250814111752-91ec077f29f5
 	github.com/smartcontractkit/chainlink-common/pkg/values v0.0.0-20250806152407-159881c7589c
 	github.com/smartcontractkit/chainlink-evm v0.3.1
 	github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250808121824-2c3544aab8f3
 	github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20250722225531-876fd6b94976
-	github.com/smartcontractkit/chainlink/v2 v2.23.2-por-beta.1.0.20250815172930-d2c56f4161f3
+	github.com/smartcontractkit/chainlink/v2 v2.23.2-por-beta.1.0.20250816034529-0dfaccaa1b11
 	github.com/smartcontractkit/cre-sdk-go v0.3.0
 	github.com/smartcontractkit/cre-sdk-go/capabilities/blockchain/evm v0.3.0
 	github.com/smartcontractkit/cre-sdk-go/capabilities/scheduler/cron v0.2.1-0.20250729191525-ac1867f3ff34

integration_tests/go.sum

@@ -1132,8 +1132,8 @@ github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250805160549-9c22
 github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250805160549-9c2255ee818e/go.mod h1:ZnAaAWtczhBbsmb6GafTmAi6ncsj6dpZwHEaBePWQeQ=
 github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d h1:qLmSOOtB/Ogn79eIDkuujOu8M5Jd747V1H7Brk/nTvo=
 github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d/go.mod h1:4WhGgCA0smBbBud5mK+jnDb2wwndMvoqaWBJ3OV/7Bw=
-github.com/smartcontractkit/chainlink/v2 v2.23.2-por-beta.1.0.20250815172930-d2c56f4161f3 h1:9E3NOob2Kbd8jjUSsEKbcHh1KjpUgH+hsyk+Yik4yhc=
-github.com/smartcontractkit/chainlink/v2 v2.23.2-por-beta.1.0.20250815172930-d2c56f4161f3/go.mod h1:e0O1rxgaKFc0yDYp9xWmXFWA7wF0y+WkuRKvMTOTSiA=
+github.com/smartcontractkit/chainlink/v2 v2.23.2-por-beta.1.0.20250816034529-0dfaccaa1b11 h1:FuK75DOBdMf8O71Ku11QW10IcmnVJQHAwCBtkGdpms8=
+github.com/smartcontractkit/chainlink/v2 v2.23.2-por-beta.1.0.20250816034529-0dfaccaa1b11/go.mod h1:e0O1rxgaKFc0yDYp9xWmXFWA7wF0y+WkuRKvMTOTSiA=
 github.com/smartcontractkit/cre-sdk-go v0.3.0 h1:7btZvnEsFkzlF09ZXO7rfGcQ+nFdrYp0LlahqntrTWw=
 github.com/smartcontractkit/cre-sdk-go v0.3.0/go.mod h1:HqCmnnjRZ0B3uAMify4/Wahaz6kvwoZ6SvD1989M9QQ=
 github.com/smartcontractkit/cre-sdk-go/capabilities/blockchain/evm v0.3.0 h1:+T4wQFRHdXAPGlN8ekBr/ZrO6xRx6thmVONAb9rnY6U=

integration_tests/http/http_test.go

@@ -1,4 +1,4 @@
-package http_test
+package http
 
 import (
 	"context"
@@ -18,15 +18,15 @@ import (
 	"github.com/jonboulle/clockwork"
 	"github.com/stretchr/testify/require"
 
-	httpcap "github.com/smartcontractkit/capabilities/http_action/action"
-
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/config"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/connector"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/network"
 
+	httpcap "github.com/smartcontractkit/capabilities/http_action/action"
+
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/core"
 
@@ -80,22 +80,27 @@ const gatewayConfigTemplate = `
   "Dons": [
     {
       "DonId": "test_don",
-      "HandlerName": "http-capabilities",
-      "HandlerConfig": {
-        "MaxAllowedMessageAgeSec": 1000,
-        "NodeRateLimiter": {
-          "GlobalBurst": 10,
-          "GlobalRPS": 50,
-          "PerSenderBurst": 10,
-          "PerSenderRPS": 10
-        },
-		"UserRateLimiter": {
-		  "GlobalBurst": 10,
-          "GlobalRPS": 50,
-          "PerSenderBurst": 10,
-          "PerSenderRPS": 10	
+	  "F": 1,
+      "Handlers": [
+		{
+			"Name": "http-capabilities",
+			"ServiceName": "workflows",
+			"Config": {
+				"NodeRateLimiter": {
+					"GlobalBurst": 10,
+					"GlobalRPS": 50,
+					"PerSenderBurst": 10,
+					"PerSenderRPS": 10
+				},
+				"UserRateLimiter": {
+					"GlobalBurst": 10,
+					"GlobalRPS": 50,
+					"PerSenderBurst": 10,
+					"PerSenderRPS": 10	
+				}
+			}
 		}
-      },
+	  ],
       "Members": [
         {
           "Address": "%s",
@@ -156,6 +161,10 @@ func newTestNetworkClient(t *testing.T, addr *net.TCPAddr, lggr logger.Logger) n
 
 func newTestGateway(t *testing.T, publicKey string, c network.HTTPClient, lggr logger.Logger) gateway.Gateway {
 	gatewayConfigStr := fmt.Sprintf(gatewayConfigTemplate, publicKey)
+	return newTestGatewayFromConfig(t, gatewayConfigStr, c, lggr)
+}
+
+func newTestGatewayFromConfig(t *testing.T, gatewayConfigStr string, c network.HTTPClient, lggr logger.Logger) gateway.Gateway {
 	var gatewayConfig *config.GatewayConfig
 	err := json.Unmarshal([]byte(gatewayConfigStr), &gatewayConfig)
 	require.NoError(t, err)
@@ -219,7 +228,7 @@ func (*client) Close() error {
 
 func TestHTTPActionCapability(t *testing.T) {
 	ctx := t.Context()
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 
 	mux := http.NewServeMux()
 	mux.HandleFunc("/test", func(w http.ResponseWriter, r *http.Request) {