test(core): Isolate restore binary data ID in execution lifecycle hooks (no-changelog) (#7953)
## Summary Move guard into restore function, move tests into own suite, add tests for guard. ... #### How to test the change: 1. ... ## Issues fixed Include links to Github issue or Community forum post or **Linear ticket**: > Important in order to close automatically and provide context to reviewers ... ## Review / Merge checklist - [ ] PR title and summary are descriptive. **Remember, the title automatically goes into the changelog. Use `(no-changelog)` otherwise.** ([conventions](https://github.com/n8n-io/n8n/blob/master/.github/pull_request_title_conventions.md)) - [ ] [Docs updated](https://github.com/n8n-io/n8n-docs) or follow-up ticket created. - [ ] Tests included. > A bug is not considered fixed, unless a test is added to prevent it from happening again. A feature is not complete without tests. > > *(internal)* You can use Slack commands to trigger [e2e tests](https://www.notion.so/n8n/How-to-use-Test-Instances-d65f49dfc51f441ea44367fb6f67eb0a?pvs=4#a39f9e5ba64a48b58a71d81c837e8227) or [deploy test instance](https://www.notion.so/n8n/How-to-use-Test-Instances-d65f49dfc51f441ea44367fb6f67eb0a?pvs=4#f6a177d32bde4b57ae2da0b8e454bfce) or [deploy early access version on Cloud](https://www.notion.so/n8n/Cloudbot-3dbe779836004972b7057bc989526998?pvs=4#fef2d36ab02247e1a0f65a74f6fb534e).
This commit is contained in:
@@ -1,13 +1,17 @@
|
||||
import Container from 'typedi';
|
||||
import { BinaryDataService } from 'n8n-core';
|
||||
import type { IRun } from 'n8n-workflow';
|
||||
import type { IRun, WorkflowExecuteMode } from 'n8n-workflow';
|
||||
import type { BinaryData } from 'n8n-core';
|
||||
import config from '@/config';
|
||||
|
||||
/**
|
||||
* Whenever the execution ID is not available to the binary data service at the
|
||||
* time of writing a binary data file, its name is missing the execution ID.
|
||||
* This function restores the ID in the file name and run data reference.
|
||||
*
|
||||
* This edge case can happen only for a Webhook node that accepts binary data,
|
||||
* when the binary data manager is set to persist this binary data.
|
||||
*
|
||||
* ```txt
|
||||
* filesystem-v2:workflows/123/executions/temp/binary_data/69055-83c4-4493-876a-9092c4708b9b ->
|
||||
* filesystem-v2:workflows/123/executions/390/binary_data/69055-83c4-4493-876a-9092c4708b9b
|
||||
@@ -16,7 +20,18 @@ import type { BinaryData } from 'n8n-core';
|
||||
* s3:workflows/123/executions/390/binary_data/69055-83c4-4493-876a-9092c4708b9b
|
||||
* ```
|
||||
*/
|
||||
export async function restoreBinaryDataId(run: IRun, executionId: string) {
|
||||
export async function restoreBinaryDataId(
|
||||
run: IRun,
|
||||
executionId: string,
|
||||
workflowExecutionMode: WorkflowExecuteMode,
|
||||
) {
|
||||
if (
|
||||
workflowExecutionMode !== 'webhook' ||
|
||||
config.getEnv('binaryDataManager.mode') === 'default'
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
const { runData } = run.data.resultData;
|
||||
|
||||
const promises = Object.keys(runData).map(async (nodeName) => {
|
||||
|
||||
Reference in New Issue
Block a user