refactor(core): Move instanceType to InstanceSettings (no-changelog)
#10640
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
netroy
commented
Sep 2, 2024
packages/cli/src/services/orchestration/webhook/handle-command-message-webhook.ts
Show resolved
Hide resolved
n8n-assistant
bot
added
core
tomi
previously approved these changes
Sep 3, 2024
| @@ -66,6 +68,13 @@ export class InstanceSettings { | |||
| this.instanceRole = 'follower'; | |||
| } | |||
|
|
|||
| // TODO: read from process.env instead, and make it readonly | |||
| instanceType?: InstanceType; | |||
There was a problem hiding this comment.
Could we also have getters for the instanceType like we have for instanceRole? I.e. isMain(Instance), isWebhook(Instance) & isWorker(Instance). Would make the comparisons simpler
| @@ -60,7 +60,7 @@ export abstract class AbstractServer { | |||
|
|
|||
| readonly uniqueInstanceId: string; | |||
|
|
|||
| constructor(instanceType: N8nInstanceType = 'main') { | |||
| constructor(instanceType: Exclude<InstanceType, 'worker'>) { | |||
There was a problem hiding this comment.
Nice 👍 Much better documented now
| @@ -630,5 +630,3 @@ export abstract class SecretsProvider { | |||
| abstract hasSecret(name: string): boolean; | |||
| abstract getSecretNames(): string[]; | |||
| } | |||
|
|
|||
| export type N8nInstanceType = 'main' | 'webhook' | 'worker'; | |||
|
|
netroy
force-pushed
the
generic.instanceType
branch
from
c571348 to
1c54691
Compare
tomi
approved these changes
Sep 16, 2024
n8n
|
||||||||||||||||||||||||||||
| Project |
n8n
|
| Branch Review |
generic.instanceType
|
| Run status |
|
| Run duration | 04m 43s |
| Commit |
|
| Committer | कारतोफ्फेलस्क्रिप्ट™ |
| View all properties for this run ↗︎ | |
| Test results | |
|---|---|
Failures
|
0
|
Flaky
|
0
|
Pending
|
0
|
Skipped
|
0
|
Passing
|
429
|
| View all changes introduced in this branch ↗︎ | |
|
✅ All Cypress E2E specs passed |
Agreed. We can do this in a separate PR 🙏🏽 |
MiloradFilipovic
added a commit
that referenced
this pull request
Sep 17, 2024
* master: refactor(core): Set up worker server (#10814) fix(Google Vertex Chat Model Node): Clean service account private key (#10770) test(core): Mock filesystem in tests (#10823) test(core): Fix license mock in worker test (#10824) ci: Ignore certain paths for e2e tests for PRs (no-changelog) (#10533) fix(editor): Render image binary-data using img tags (#10829) refactor(core): Move `instanceType` to `InstanceSettings` (no-changelog) (#10640) ci(benchmark): Always perform az login before teardown (#10827) fix: Prevent copying workflow when copying outside of canvas (#10813) fix: Fix telemetry causing console error (#10828) refactor: Remove unused disable directives from `nodes-base` (#10825) refactor(core): Remove unused disable directives from backend packages (#10826) chore: Upgrade to TypeScript 5.6 (#10822) fix(editor): Prevent clipboard XSS injection (#10805) refactor(core): Simplify createDeferredPromise, and add tests (no-changelog) (#10811) fix(HTTP Request Tool Node): Fix subsequent tool calls reusung the same options (#10808) fix(editor): Make expression edit modal read-only in executions view (#10806) refactor(core): Move push message types to a new shared package (no-changelog) (#10742) fix(editor): Make schema view search copy more clear (#10807)
4 tasks
|
Got released with |
riascho
pushed a commit
that referenced
this pull request
Sep 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Context
Review / Merge checklist