fix(core): Use owners file to export wf owners #6547

flipswitchingmonkey · 2023-06-27T06:25:13Z

No description provided.

github-actions · 2023-06-27T06:25:44Z

Great PR! Please pay attention to the following items before merging:

Files matching packages/**:

If fixing bug, added test to cover scenario.
If addressing forum or Github issue, added link to description.

Files matching packages/**/*.ts:

Added unit tests to cover new or updated functionality.

Make sure to check off this list before asking for review.

codecov · 2023-06-27T06:39:55Z

Codecov Report

Patch coverage: 0.88% and project coverage change: +0.04 🎉

Comparison is base (b66d151) 28.72% compared to head (80026aa) 28.76%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #6547      +/-   ##
==========================================
+ Coverage   28.72%   28.76%   +0.04%     
==========================================
  Files        3000     3032      +32     
  Lines      186293   187053     +760     
  Branches    20606    20705      +99     
==========================================
+ Hits        53509    53810     +301     
- Misses     131973   132407     +434     
- Partials      811      836      +25

Impacted Files	Coverage Δ
...ronments/sourceControl/sourceControl.service.ee.ts	`8.33% <0.00%> (-0.85%)`	⬇️
...ts/sourceControl/sourceControlExport.service.ee.ts	`11.42% <0.00%> (-0.52%)`	⬇️
...ts/sourceControl/sourceControlImport.service.ee.ts	`11.62% <0.00%> (-4.20%)`	⬇️
...es/cli/src/environments/sourceControl/constants.ts	`100.00% <100.00%> (ø)`

... and 49 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

krynble · 2023-06-27T15:49:16Z

packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts

@@ -326,6 +330,13 @@ export class SourceControlService {
 					id = workflow.id;
 					name = workflow.name;
 				}
+				const existingWorkflow = await Db.collections.Workflow.find({


Maybe premature optimisation, but pre-fetch all existing workflows and create a hashmap so we can have faster access. Not needed tho.

krynble · 2023-06-27T15:50:37Z

packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts

+			}
+		}
+
+		console.log(ownerRecords);


Suggested change

console.log(ownerRecords);

krynble · 2023-06-27T15:52:24Z

packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts

+
+		console.log(ownerRecords);
+
+		let importWorkflowsResult = new Array<{ id: string; name: string } | undefined>();
 		await Db.transaction(async (transactionManager) => {


I usually have a very bad experience with transactionManager as it tends to create database locks that cause running executions to fail.

Worth testing with own mode and see if this is the case (create a few workflows that run every second and attempt this process). If we get errors saying that cannot read or write due to locked database it might make sense to remove the migration, as bad as it may sound, I know.

removed transactions

krynble · 2023-06-28T07:22:58Z

packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts

+			// write list of owners to file
+			const ownersFileName = this.getOwnersPath();
+			const owners: Record<string, string> = {};
+			sharedWorkflows.forEach((e) => (owners[e.workflowId] = e.user.email));


One problem I see here is that we're always sending the full file, regardless of the workflows actually exported.

One problem I had is that I have over 100 workflows, but I exported a single one. My owners file contains all the 100 workflow owner names, even though my repo only contains a single workflow file.

I'm thinking that maybe we should read the file contents and append the rows that were added WDYT?

krynble

Other than the comment I left, it all looks fine.

cypress · 2023-06-28T08:52:13Z

1 flaky tests on run #1344 ↗︎

0	227	0	0	1

Details:

🌳 pay-571-use-owners-file-to-export-wf-owners 🖥️ browsers:node18.12.0-chrome10...
Project: n8n	Commit: `80026aaf3a`
Status: Passed	Duration: 07:19 💡
Started: Jun 28, 2023 8:44 AM	Ended: Jun 28, 2023 8:52 AM

cypress/e2e/18-user-management.cy.ts • 1 flaky test

View Output Video

Test		Artifacts
User Management > should change current user password		`Output` `Screenshots` `Video`

_{This comment has been generated by cypress-bot as a result of this
project's GitHub integration settings.}

github-actions · 2023-06-28T08:52:15Z

✅ All Cypress E2E specs passed

* master: fix(core): Use owners file to export wf owners (#6547) feat(Microsoft To Do Node): Add an option to set a reminder when creating a task (#5757) fix(Sendy Node): Fix issue with brand id not being sent (#6530) ci: Update release process to support `major` releases (no-changelog) (#6552)

janober · 2023-07-05T14:04:31Z

Got released with [email protected]

flipswitchingmonkey added 2 commits June 26, 2023 17:34

remove owner from exported workflow

f485787

use owners file to export wf owners

2546d2b

n8n-assistant bot added core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team labels Jun 27, 2023

update sharedworkflow owners

1c77d77

flipswitchingmonkey marked this pull request as ready for review June 27, 2023 10:35

flipswitchingmonkey marked this pull request as draft June 27, 2023 10:36

flipswitchingmonkey added 2 commits June 27, 2023 12:39

fix logic

6c83c30

further update logic

e37a9d3

flipswitchingmonkey marked this pull request as ready for review June 27, 2023 12:37

flipswitchingmonkey added 2 commits June 27, 2023 15:00

add updatetAt to local changes

d082a06

additional filter for cred export

6caf3ca

krynble reviewed Jun 27, 2023

View reviewed changes

krynble suggested changes Jun 27, 2023

View reviewed changes

flipswitchingmonkey added 2 commits June 27, 2023 19:30

optimize query

3e7498d

remove transactions and optimize query

c3f5d5f

flipswitchingmonkey requested a review from krynble June 27, 2023 17:40

reduce array size and add updated at to tags status

80026aa

krynble reviewed Jun 28, 2023

View reviewed changes

krynble suggested changes Jun 28, 2023

View reviewed changes

krynble approved these changes Jun 28, 2023

View reviewed changes

flipswitchingmonkey merged commit 4b755fb into master Jun 28, 2023

flipswitchingmonkey deleted the pay-571-use-owners-file-to-export-wf-owners branch June 28, 2023 09:06

This was referenced Jul 5, 2023

🚀 Release 0.235.0 #6601

Closed

🚀 Release 0.236.0 #6602

Merged

janober added the Released label Jul 5, 2023

github-actions bot mentioned this pull request Jul 26, 2023

🚀 Release 1.1.0 #6746

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(core): Use owners file to export wf owners #6547

fix(core): Use owners file to export wf owners #6547

flipswitchingmonkey commented Jun 27, 2023

github-actions bot commented Jun 27, 2023

codecov bot commented Jun 27, 2023 •

edited

Loading

krynble Jun 27, 2023

flipswitchingmonkey Jun 27, 2023

krynble Jun 27, 2023

krynble Jun 27, 2023

flipswitchingmonkey Jun 28, 2023

krynble Jun 28, 2023

krynble left a comment

cypress bot commented Jun 28, 2023

github-actions bot commented Jun 28, 2023

janober commented Jul 5, 2023

fix(core): Use owners file to export wf owners #6547

fix(core): Use owners file to export wf owners #6547

Conversation

flipswitchingmonkey commented Jun 27, 2023

github-actions bot commented Jun 27, 2023

codecov bot commented Jun 27, 2023 • edited Loading

Codecov Report

krynble Jun 27, 2023

Choose a reason for hiding this comment

flipswitchingmonkey Jun 27, 2023

Choose a reason for hiding this comment

krynble Jun 27, 2023

Choose a reason for hiding this comment

krynble Jun 27, 2023

Choose a reason for hiding this comment

flipswitchingmonkey Jun 28, 2023

Choose a reason for hiding this comment

krynble Jun 28, 2023

Choose a reason for hiding this comment

krynble left a comment

Choose a reason for hiding this comment

cypress bot commented Jun 28, 2023

1 flaky tests on run #1344 ↗︎

github-actions bot commented Jun 28, 2023

janober commented Jul 5, 2023

codecov bot commented Jun 27, 2023 •

edited

Loading