Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): Fix orchestration flow with expired license #12444

Merged
merged 3 commits into from
Jan 9, 2025
Merged

Conversation

ivov
Copy link
Contributor

@ivov ivov commented Jan 3, 2025

Summary

Simpler solution to the dependency cycle in #12427

  1. When multi-main is enabled, make it temporarily licensed
  2. Init orchestration to set instance role
  3. Init license using instance role, overriding temporary value
  4. Do multi-main license check

No changes to SDK needed

Related Linear tickets, Github issues, and Community forum posts

https://linear.app/n8n/issue/PAY-2416
https://linear.app/n8n/issue/PAY-2396

Review / Merge checklist

  • PR title and summary are descriptive. (conventions)
  • Docs updated or follow-up ticket created.
  • Tests included.
  • PR Labeled with release/backport (if the PR is an urgent fix that needs to be backported)

Copy link

codecov bot commented Jan 3, 2025

Codecov Report

Attention: Patch coverage is 41.66667% with 7 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
packages/cli/src/commands/start.ts 0.00% 6 Missing ⚠️
packages/cli/src/license.ts 83.33% 1 Missing ⚠️

📢 Thoughts on this report? Let us know!

@n8n-assistant n8n-assistant bot added core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team labels Jan 3, 2025
Copy link
Contributor

@tomi tomi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

Copy link
Contributor

github-actions bot commented Jan 9, 2025

⚠️ Some Cypress E2E specs are failing, please fix them before merging

Copy link

cypress bot commented Jan 9, 2025

n8n    Run #8684

Run Properties:  status check passed Passed #8684  •  git commit 5d656fe557: 🌳 🖥️ browsers:node18.12.0-chrome107 🤖 ivov 🗃️ e2e/*
Project n8n
Branch Review pay-2416-v2
Run status status check passed Passed #8684
Run duration 04m 47s
Commit git commit 5d656fe557: 🌳 🖥️ browsers:node18.12.0-chrome107 🤖 ivov 🗃️ e2e/*
Committer Iván Ovejero
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 1
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 489
View all changes introduced in this branch ↗︎

Copy link
Contributor

github-actions bot commented Jan 9, 2025

⚠️ Some Cypress E2E specs are failing, please fix them before merging

@tomi tomi self-requested a review January 9, 2025 13:01
Copy link
Contributor

github-actions bot commented Jan 9, 2025

✅ All Cypress E2E specs passed

@ivov ivov merged commit ecff3b7 into master Jan 9, 2025
37 checks passed
@ivov ivov deleted the pay-2416-v2 branch January 9, 2025 13:37
@github-actions github-actions bot mentioned this pull request Jan 15, 2025
@janober
Copy link
Member

janober commented Jan 15, 2025

Got released with [email protected]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team Released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants