-
Notifications
You must be signed in to change notification settings - Fork 9.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ai-assistant-improvements
* master: (21 commits) feat: Add queue mode setup to benchmarks (no-changelog) (#10608) feat: Add n8n postgres setup to benchmarks (no-changelog) (#10604) fix(API): Update express-openapi-validator to resolve AIKIDO-2024-10229 (#10612) fix: Fix edge case in log in (no-changelog) (#10610) feat: Add local orchestration of benchmarks (no-changelog) (#10589) ci: Run nightly benchmark against nightly n8n image (no-changelog) (#10588) fix: Reduce variability in benchmarks (no-changelog) (#10606) docs: Add missing changelog entry (#10609) refactor(editor): Convert ResourceLocator to composition API (no-changelog) (#10526) feat(editor): Update new canvas node handle label rendering mechanism and design (no-changelog) (#10611) refactor(editor): Convert credential related components to composition API (no-changelog) (#10530) fix(HTTP Request Node): Sanitize authorization headers (#10607) refactor: Use `NodeConnectionType` consistently across the code base (no-changelog) (#10595) fix(editor): Hide execution buttons in readonly mode in new canvas (no-changelog) (#10603) fix(editor): Prevent keyboard shortcuts when ndv is open in new canvas (no-changelog) (#10601) fix(editor): Add confirmation toast when changing user role (#10592) feat(editor): Add support for changing sticky notes color in new canvas (no-changelog) (#10593) ci: Fix `forceConsistentCasingInFileNames` for aliased paths (no-changelog) (#10598) feat(editor): Allow sticky notes alongside fallback nodes in new canvas (no-changelog) (#10583) ci: Push nightly images to ghcr (no-changelog) (#10580) ...
- Loading branch information
Showing
826 changed files
with
5,860 additions
and
4,429 deletions.
There are no files selected for viewing
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
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
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
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
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
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
File renamed without changes.
45 changes: 45 additions & 0 deletions
45
packages/@n8n/benchmark/scripts/clients/dockerComposeClient.mjs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import { which } from 'zx'; | ||
|
|
||
| export class DockerComposeClient { | ||
| /** | ||
| * | ||
| * @param {{ $: Shell; verbose?: boolean }} opts | ||
| */ | ||
| constructor({ $ }) { | ||
| this.$$ = $; | ||
| } | ||
|
|
||
| async $(...args) { | ||
| await this.resolveExecutableIfNeeded(); | ||
|
|
||
| if (this.isCompose) { | ||
| return await this.$$`docker-compose ${args}`; | ||
| } else { | ||
| return await this.$$`docker compose ${args}`; | ||
| } | ||
| } | ||
|
|
||
| async resolveExecutableIfNeeded() { | ||
| if (this.isResolved) { | ||
| return; | ||
| } | ||
|
|
||
| // The VM deployment doesn't have `docker compose` available, | ||
| // so try to resolve the `docker-compose` first | ||
| const compose = await which('docker-compose', { nothrow: true }); | ||
| if (compose) { | ||
| this.isResolved = true; | ||
| this.isCompose = true; | ||
| return; | ||
| } | ||
|
|
||
| const docker = await which('docker', { nothrow: true }); | ||
| if (docker) { | ||
| this.isResolved = true; | ||
| this.isCompose = false; | ||
| return; | ||
| } | ||
|
|
||
| throw new Error('Could not resolve docker-compose or docker'); | ||
| } | ||
| } |
File renamed without changes.
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
29 changes: 29 additions & 0 deletions
29
packages/@n8n/benchmark/scripts/n8nSetups/postgres/docker-compose.yml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| services: | ||
| postgres: | ||
| image: postgres:16 | ||
| restart: always | ||
| environment: | ||
| - POSTGRES_DB=n8n | ||
| - POSTGRES_USER=postgres | ||
| - POSTGRES_PASSWORD=password | ||
| n8n: | ||
| image: ghcr.io/n8n-io/n8n:${N8N_VERSION:-latest} | ||
| environment: | ||
| - N8N_DIAGNOSTICS_ENABLED=false | ||
| - N8N_USER_FOLDER=/n8n | ||
| - DB_TYPE=postgresdb | ||
| - DB_POSTGRESDB_HOST=postgres | ||
| - DB_POSTGRESDB_PASSWORD=password | ||
| ports: | ||
| - 5678:5678 | ||
| volumes: | ||
| - ${RUN_DIR}:/n8n | ||
| depends_on: | ||
| - postgres | ||
| benchmark: | ||
| image: ghcr.io/n8n-io/n8n-benchmark:${N8N_BENCHMARK_VERSION:-latest} | ||
| depends_on: | ||
| - n8n | ||
| environment: | ||
| - N8N_BASE_URL=http://n8n:5678 | ||
| - K6_API_TOKEN=${K6_API_TOKEN} |
73 changes: 73 additions & 0 deletions
73
packages/@n8n/benchmark/scripts/n8nSetups/queue/docker-compose.yml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| services: | ||
| redis: | ||
| image: redis:6-alpine | ||
| ports: | ||
| - 6379:6379 | ||
| postgres: | ||
| image: postgres:16 | ||
| restart: always | ||
| environment: | ||
| - POSTGRES_DB=n8n | ||
| - POSTGRES_USER=postgres | ||
| - POSTGRES_PASSWORD=password | ||
| n8n_worker1: | ||
| image: ghcr.io/n8n-io/n8n:${N8N_VERSION:-latest} | ||
| environment: | ||
| - N8N_DIAGNOSTICS_ENABLED=false | ||
| - N8N_USER_FOLDER=/n8n/worker1 | ||
| - N8N_ENCRYPTION_KEY=very-secret-encryption-key | ||
| - EXECUTIONS_MODE=queue | ||
| - QUEUE_BULL_REDIS_HOST=redis | ||
| - DB_TYPE=postgresdb | ||
| - DB_POSTGRESDB_HOST=postgres | ||
| - DB_POSTGRESDB_PASSWORD=password | ||
| command: worker | ||
| volumes: | ||
| - ${RUN_DIR}:/n8n | ||
| depends_on: | ||
| - postgres | ||
| - redis | ||
| n8n_worker2: | ||
| image: ghcr.io/n8n-io/n8n:${N8N_VERSION:-latest} | ||
| environment: | ||
| - N8N_DIAGNOSTICS_ENABLED=false | ||
| - N8N_USER_FOLDER=/n8n/worker2 | ||
| - N8N_ENCRYPTION_KEY=very-secret-encryption-key | ||
| - EXECUTIONS_MODE=queue | ||
| - QUEUE_BULL_REDIS_HOST=redis | ||
| - DB_TYPE=postgresdb | ||
| - DB_POSTGRESDB_HOST=postgres | ||
| - DB_POSTGRESDB_PASSWORD=password | ||
| command: worker | ||
| volumes: | ||
| - ${RUN_DIR}:/n8n | ||
| depends_on: | ||
| - postgres | ||
| - redis | ||
| n8n: | ||
| image: ghcr.io/n8n-io/n8n:${N8N_VERSION:-latest} | ||
| environment: | ||
| - N8N_DIAGNOSTICS_ENABLED=false | ||
| - N8N_USER_FOLDER=/n8n/main | ||
| - N8N_ENCRYPTION_KEY=very-secret-encryption-key | ||
| - EXECUTIONS_MODE=queue | ||
| - QUEUE_BULL_REDIS_HOST=redis | ||
| - DB_TYPE=postgresdb | ||
| - DB_POSTGRESDB_HOST=postgres | ||
| - DB_POSTGRESDB_PASSWORD=password | ||
| ports: | ||
| - 5678:5678 | ||
| volumes: | ||
| - ${RUN_DIR}:/n8n | ||
| depends_on: | ||
| - postgres | ||
| - redis | ||
| - n8n_worker1 | ||
| - n8n_worker2 | ||
| benchmark: | ||
| image: ghcr.io/n8n-io/n8n-benchmark:${N8N_BENCHMARK_VERSION:-latest} | ||
| depends_on: | ||
| - n8n | ||
| environment: | ||
| - N8N_BASE_URL=http://n8n:5678 | ||
| - K6_API_TOKEN=${K6_API_TOKEN} |
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
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
Oops, something went wrong.