Merge pull request #8 from eyaljoyous/dev

Dev -> Master
eyaljoyous · Jun 2, 2023 · 23495a6 · 23495a6
2 parents ee18fc1 + 0c76e46
commit 23495a6
Show file tree

Hide file tree

Showing 33 changed files with 404 additions and 250 deletions.
diff --git a/.github/workflows/check-documentation-urls.yml b/.github/workflows/check-documentation-urls.yml
@@ -20,7 +20,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
           cache: 'pnpm'
 
       - name: Install dependencies

diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
           cache: 'pnpm'
 
       - name: Install dependencies

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [16.x, 18.x]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/ci-postgres-mysql.yml b/.github/workflows/ci-postgres-mysql.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
           cache: 'pnpm'
 
       - name: Install dependencies

diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml
@@ -14,10 +14,10 @@ jobs:
 
       - uses: pnpm/[email protected]
 
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
           cache: pnpm
 
       - name: Install dependencies
@@ -34,7 +34,7 @@ jobs:
             /github/home/.pnpm-store
             ./node_modules
             ./packages
-          key: ${{ github.sha }}-base:16.18.1-test-lint
+          key: ${{ github.sha }}-base:18-test-lint
 
   unit-test:
     name: Unit tests
@@ -54,14 +54,14 @@ jobs:
             /github/home/.pnpm-store
             ./node_modules
             ./packages
-          key: ${{ github.sha }}-base:16.18.1-test-lint
+          key: ${{ github.sha }}-base:18-test-lint
 
       - uses: pnpm/[email protected]
 
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
           cache: pnpm
 
       - name: Test
@@ -90,14 +90,14 @@ jobs:
             /github/home/.pnpm-store
             ./node_modules
             ./packages
-          key: ${{ github.sha }}-base:16.18.1-test-lint
+          key: ${{ github.sha }}-base:18-test-lint
 
       - uses: pnpm/[email protected]
 
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
           cache: pnpm
 
       - name: Fetch base branch for `git diff`
@@ -109,13 +109,12 @@ jobs:
         run: pnpm lint
 
   smoke-test:
-    name: E2E [Electron/Node 16]
+    name: E2E [Electron/Node 18]
     uses: ./.github/workflows/e2e-reusable.yml
     with:
       branch: ${{ github.event.pull_request.base.ref }}
       user: ${{ github.event.inputs.user || 'PR User' }}
       spec: ${{ github.event.inputs.spec || 'e2e/0-smoke.cy.ts' }}
-      run-env: browsers:node16.18.0-chrome107-ff106-edge
       record: false
       parallel: false
       pr_number: ${{ github.event.number }}

diff --git a/.github/workflows/docker-base-image.yml b/.github/workflows/docker-base-image.yml
@@ -5,9 +5,12 @@ on:
     inputs:
       node_version:
         description: 'Node.js version to build this image with.'
-        type: string
+        type: choice
         required: true
         default: '16'
+        options:
+          - '16'
+          - '18'
 
 jobs:
   build:

diff --git a/.github/workflows/docker-image-v1-rc.yml b/.github/workflows/docker-image-v1-rc.yml
@@ -12,11 +12,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          ref: release-v1
 
       - uses: pnpm/[email protected]
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - run: npm install --prefix=.github/scripts --no-package-lock
 
       - name: Bump package versions to 1.0.0

diff --git a/.github/workflows/e2e-reusable.yml b/.github/workflows/e2e-reusable.yml
@@ -20,7 +20,7 @@ on:
       run-env:
         description: 'Node env version to run tests with.'
         required: false
-        default: 'browsers:node16.18.0-chrome90-ff88'
+        default: 'browsers:node18.12.0-chrome107'
         type: string
       cache-key:
         description: 'Cache key for modules and build artifacts.'
@@ -55,7 +55,6 @@ on:
         description: 'True if all E2E tests passed, otherwise false'
         value: ${{ jobs.check_testing_matrix.outputs.all_tests_passed }}
 
-
 jobs:
   # single job that generates and outputs a common id
   prepare:
@@ -163,9 +162,10 @@ jobs:
           # We have to provide custom ci-build-id key to make sure that this workflow could be run multiple times
           # in the same parent workflow
           ci-build-id: ${{ needs.prepare.outputs.uuid }}
-          spec: "/__w/n8n/n8n/cypress/${{ inputs.spec }}"
+          spec: '/__w/n8n/n8n/cypress/${{ inputs.spec }}'
           config-file: /__w/n8n/n8n/cypress.config.js
         env:
+          NODE_OPTIONS: --dns-result-order=ipv4first
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           E2E_TESTS: true

diff --git a/.github/workflows/e2e-tests-pr.yml b/.github/workflows/e2e-tests-pr.yml
@@ -8,20 +8,19 @@ on:
 
 jobs:
   run-e2e-tests:
-    name: E2E [Electron/Node 16]
+    name: E2E [Electron/Node 18]
     uses: ./.github/workflows/e2e-reusable.yml
     if: ${{ github.event.review.state == 'approved' && !contains(github.event.pull_request.labels.*.name, 'community') }}
     with:
       branch: ${{ github.event.pull_request.head.ref }}
       user: ${{ github.event.pull_request.user.login || 'PR User' }}
       spec: 'e2e/*'
-      run-env: base:16.18.1
     secrets:
       CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
 
   post-e2e-tests:
     runs-on: ubuntu-latest
-    name: E2E [Electron/Node 16] - Checks
+    name: E2E [Electron/Node 18] - Checks
     needs: [run-e2e-tests]
     if: always()
     steps:

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -40,13 +40,12 @@ jobs:
         shell: bash
 
   run-e2e-tests:
-    name: E2E [Electron/Node 16]
+    name: E2E [Electron/Node 18]
     uses: ./.github/workflows/e2e-reusable.yml
     with:
       branch: ${{ github.event.inputs.branch || 'master' }}
       user: ${{ github.event.inputs.user || 'PR User' }}
       spec: ${{ github.event.inputs.spec || 'e2e/*' }}
-      run-env: base:16.18.1
     secrets:
       CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
 

diff --git a/.github/workflows/release-create-pr.yml b/.github/workflows/release-create-pr.yml
@@ -16,6 +16,7 @@ on:
         options:
           - patch
           - minor
+          - major
 
 jobs:
   create-release-pr:
@@ -42,7 +43,7 @@ jobs:
       - uses: pnpm/[email protected]
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - run: npm install --prefix=.github/scripts --no-package-lock
 
       - name: Bump package versions

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: pnpm/[email protected]
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
           cache: 'pnpm'
       - run: pnpm install --frozen-lockfile
 
@@ -55,12 +55,12 @@ jobs:
         continue-on-error: true
         run: curl -u docsWorkflows:${{ secrets.N8N_WEBHOOK_DOCS_PASSWORD }} --request GET 'https://internal.users.n8n.cloud/webhook/trigger-release-note' --header 'Content-Type:application/json' --data '{"version":"${{env.RELEASE}}"}'
 
-      - name: Merge Release into 'master'
-        run: |
-          git fetch origin
-          git checkout --track origin/master
-          git config user.name "Jan Oberhauser"
-          git config user.email [email protected]
-          git merge --ff n8n@${{env.RELEASE}}
-          git push origin master
-          git push origin :${{github.event.pull_request.base.ref}}
+      # - name: Merge Release into 'master'
+      #   run: |
+      #     git fetch origin
+      #     git checkout --track origin/master
+      #     git config user.name "Jan Oberhauser"
+      #     git config user.email [email protected]
+      #     git merge --ff n8n@${{env.RELEASE}}
+      #     git push origin master
+      #     git push origin :${{github.event.pull_request.base.ref}}
diff --git a/.github/workflows/release-push-to-channel.yml b/.github/workflows/release-push-to-channel.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - run: |
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
           npm dist-tag add n8n@${{ github.event.inputs.version }} ${{ github.event.inputs.release-channel }}

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
@@ -11,9 +11,6 @@ jobs:
 
     timeout-minutes: 30
 
-    strategy:
-      matrix:
-        node-version: [16.x]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -30,10 +27,9 @@ jobs:
         with:
           version: 8.1.0
 
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 18.x
           cache: 'pnpm'
           cache-dependency-path: 'n8n/pnpm-lock.yaml'
 

diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=16
+ARG NODE_VERSION=18
 
 # 1. Create an image to build n8n
 FROM n8nio/base:${NODE_VERSION} as builder

diff --git a/package.json b/package.json
@@ -28,10 +28,10 @@
     "worker": "./packages/cli/bin/n8n worker",
     "cypress:install": "cypress install",
     "cypress:open": "CYPRESS_BASE_URL=http://localhost:8080 cypress open",
-    "test:e2e:ui": "cross-env E2E_TESTS=true start-server-and-test start http://localhost:5678/favicon.ico 'cypress open'",
-    "test:e2e:dev": "cross-env E2E_TESTS=true CYPRESS_BASE_URL=http://localhost:8080 start-server-and-test dev http://localhost:8080/favicon.ico 'cypress open'",
-    "test:e2e:smoke": "cross-env E2E_TESTS=true start-server-and-test start http://localhost:5678/favicon.ico 'cypress run --headless --spec \"cypress/e2e/0-smoke.cy.ts\"'",
-    "test:e2e:all": "cross-env E2E_TESTS=true start-server-and-test start http://localhost:5678/favicon.ico 'cypress run --headless'"
+    "test:e2e:ui": "cross-env E2E_TESTS=true NODE_OPTIONS=--dns-result-order=ipv4first start-server-and-test start http://localhost:5678/favicon.ico 'cypress open'",
+    "test:e2e:dev": "cross-env E2E_TESTS=true NODE_OPTIONS=--dns-result-order=ipv4first  CYPRESS_BASE_URL=http://localhost:8080 start-server-and-test dev http://localhost:8080/favicon.ico 'cypress open'",
+    "test:e2e:smoke": "cross-env E2E_TESTS=true NODE_OPTIONS=--dns-result-order=ipv4first  start-server-and-test start http://localhost:5678/favicon.ico 'cypress run --headless --spec \"cypress/e2e/0-smoke.cy.ts\"'",
+    "test:e2e:all": "cross-env E2E_TESTS=true NODE_OPTIONS=--dns-result-order=ipv4first  start-server-and-test start http://localhost:5678/favicon.ico 'cypress run --headless'"
   },
   "dependencies": {
     "n8n": "workspace:*"
@@ -75,7 +75,7 @@
       "vue-demi"
     ],
     "overrides": {
-      "@types/node": "^16.18.12",
+      "@types/node": "^18.16.16",
       "browserslist": "^4.21.4",
       "chokidar": "3.5.2",
       "decode-uri-component": "0.2.2",

diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,22 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 0.232.0
+
+### What changed?
+
+Due to Node.js/OpenSSL upgrade, the following crypto algorithms are not supported anymore.
+- RSA-MD4
+- RSA-MDC2
+- md4
+- md4WithRSAEncryption
+- mdc2
+- mdc2WithRSA
+
+### When is action necessary?
+
+If you're using any of the above mentioned crypto algorithms in Crypto node in any of your workflows, then please update the algorithm property in the node to one of the supported values.
+
 ## 0.226.0
 
 ### What changed?

diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
@@ -95,6 +95,12 @@ export abstract class BaseCommand extends Command {
 			);
 		}
 
+		if (process.env.N8N_USER_MANAGEMENT_DISABLED === 'true') {
+			LoggerProxy.warn(
+				`User Management will be mandatory in a future version of n8n. Please set up the instance owner. To learn more: ${USER_MANAGEMENT_DOCS_URL}`,
+			);
+		}
+
 		this.instanceId = this.userSettings.instanceId ?? '';
 		await Container.get(PostHogClient).init(this.instanceId);
 		await Container.get(InternalHooks).init(this.instanceId);

diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
@@ -729,7 +729,7 @@ export const schema = {
 
 	userManagement: {
 		disabled: {
-			doc: 'Disable user management and hide it completely.',
+			doc: '[DEPRECATED] Disable user management and hide it completely.',
 			format: Boolean,
 			default: false,
 			env: 'N8N_USER_MANAGEMENT_DISABLED',