diff --git a/core/services/workflows/syncer/fetcher.go b/core/services/workflows/syncer/fetcher.go index c1ddd3530da..ed815a240ba 100644 --- a/core/services/workflows/syncer/fetcher.go +++ b/core/services/workflows/syncer/fetcher.go @@ -7,7 +7,6 @@ import ( "net/http" "strings" - "github.com/smartcontractkit/chainlink/v2/core/capabilities/validation" "github.com/smartcontractkit/chainlink/v2/core/capabilities/webapi" "github.com/smartcontractkit/chainlink/v2/core/logger" ghcapabilities "github.com/smartcontractkit/chainlink/v2/core/services/gateway/handlers/capabilities" @@ -16,24 +15,8 @@ import ( func NewFetcherFunc( ctx context.Context, lggr logger.Logger, - och *webapi.OutgoingConnectorHandler, - workflowID, workflowExecutionID string, - idGenerator func() string) FetcherFunc { + och *webapi.OutgoingConnectorHandler) FetcherFunc { return func(ctx context.Context, url string) ([]byte, error) { - if err := validation.ValidateWorkflowOrExecutionID(workflowID); err != nil { - return nil, fmt.Errorf("workflow ID %q is invalid: %w", workflowID, err) - } - if err := validation.ValidateWorkflowOrExecutionID(workflowExecutionID); err != nil { - return nil, fmt.Errorf("workflow execution ID %q is invalid: %w", workflowExecutionID, err) - } - - messageID := strings.Join([]string{ - workflowID, - workflowExecutionID, - ghcapabilities.MethodWorkflowSyncer, - idGenerator(), - }, "/") - payloadBytes, err := json.Marshal(ghcapabilities.Request{ URL: url, Method: http.MethodGet, @@ -42,6 +25,7 @@ func NewFetcherFunc( return nil, fmt.Errorf("failed to marshal fetch request: %w", err) } + messageID := strings.Join([]string{ghcapabilities.MethodWorkflowSyncer, url}, "/") resp, err := och.HandleSingleNodeRequest(ctx, messageID, payloadBytes) if err != nil { return nil, err diff --git a/core/services/workflows/syncer/fetcher_test.go b/core/services/workflows/syncer/fetcher_test.go index 55997a96fb7..846a9186b5a 100644 --- a/core/services/workflows/syncer/fetcher_test.go +++ b/core/services/workflows/syncer/fetcher_test.go @@ -34,17 +34,9 @@ func TestNewFetcherFunc(t *testing.T) { och, err := webapi.NewOutgoingConnectorHandler(connector, config, ghcapabilities.MethodComputeAction, lggr) require.NoError(t, err) - workflowID := "15c631d295ef5e32deb99a10ee6804bc4af13855687559d7ff6552ac6dbb2ce0" - workflowExecutionID := "25c631d295ef5e32deb99a10ee6804bc4af13855687559d7ff6552ac6dbb2ce1" - idGenerator := func() string { return "uniqueID" } url := "http://example.com" - msgID := strings.Join([]string{ - workflowID, - workflowExecutionID, - ghcapabilities.MethodWorkflowSyncer, - idGenerator(), - }, "/") + msgID := strings.Join([]string{ghcapabilities.MethodWorkflowSyncer, url}, "/") t.Run("OK-valid_request", func(t *testing.T) { gatewayResp := gatewayResponse(t, msgID) @@ -54,7 +46,7 @@ func TestNewFetcherFunc(t *testing.T) { connector.EXPECT().DonID().Return("don-id") connector.EXPECT().GatewayIDs().Return([]string{"gateway1", "gateway2"}) - fetcher := NewFetcherFunc(ctx, lggr, och, workflowID, workflowExecutionID, idGenerator) + fetcher := NewFetcherFunc(ctx, lggr, och) payload, err := fetcher(ctx, url) require.NoError(t, err) @@ -62,24 +54,6 @@ func TestNewFetcherFunc(t *testing.T) { expectedPayload := []byte("response body") require.Equal(t, expectedPayload, payload) }) - - t.Run("NOK-invalid_workflow_id", func(t *testing.T) { - invalidWorkflowID := "invalidWorkflowID" - fetcher := NewFetcherFunc(ctx, lggr, och, invalidWorkflowID, workflowExecutionID, idGenerator) - - _, err := fetcher(ctx, url) - require.Error(t, err) - require.Contains(t, err.Error(), "workflow ID") - }) - - t.Run("NOK-invalid_workflow_execution_id", func(t *testing.T) { - invalidWorkflowExecutionID := "invalidWorkflowExecutionID" - fetcher := NewFetcherFunc(ctx, lggr, och, workflowID, invalidWorkflowExecutionID, idGenerator) - - _, err := fetcher(ctx, url) - require.Error(t, err) - require.Contains(t, err.Error(), "workflow execution ID") - }) } func gatewayResponse(t *testing.T, msgID string) *api.Message {