chore: prepare support for Node 18 [HEAD-497] (#4882)

* feat: add support for Node 18

* chore(gha): add workflow dispatch trigger

* feat: pkg tool uses Node 18

* feat: upadate Dockerfile Node version to 18

* chore: pkg uses Node version from .nvmrc file

* fix: use correct Node version for binary smoke test

* chore: adding additional log message to test setup

* fix: filter OPENSSL_CONF from child process

* revert: use Node 16 for build step

* revert: fix excluded Node version for smoke test

* refactor: concise log message when building Snyk binaries

---------

Co-authored-by: Peter Schäfer <[email protected]>

.github/workflows/smoke-tests.yml

@@ -7,6 +7,7 @@ on:
     types: [published]
   schedule:
     - cron: '0 23 * * *'
+  workflow_dispatch:
 
 jobs:
   smoke_test:
@@ -17,7 +18,7 @@ jobs:
       matrix:
         os: [ubuntu, macos, windows]
         snyk_install_method: [binary, npm, yarn, brew]
-        node_version: [14, 16]
+        node_version: [14, 16, 18]
         exclude:
           # Skip yarn for Windows, as it's a bit crazy to get it working in CI environment. Unless we see evidence we need it, I'd avoid it
           - snyk_install_method: yarn

.github/workflows/snyk-protect-production-smoke-tests.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos, windows]
-        node_version: [14, 16]
+        node_version: [14, 16, 18]
     runs-on: ${{ matrix.os }}-latest
     steps:
       # Avoid modifying line endings in fixtures.

Makefile

@@ -9,6 +9,7 @@
 export SHELL=/bin/bash
 WORKING_DIR = $(CURDIR)
 PKG := npx pkg ./ --compress Brotli
+PKG_NODE_VERSION := $(shell head -1 .nvmrc | cut -f1 -d '.')
 BINARY_WRAPPER_DIR = ts-binary-wrapper
 EXTENSIBLE_CLI_DIR = cliv2
 BINARY_RELEASES_FOLDER_TS_CLI = binary-releases
@@ -63,6 +64,7 @@ endif
 .INTERMEDIATE: prepack
 .SECONDARY: prepack
 prepack: $(BINARY_OUTPUT_FOLDER)/version
+	@echo 'Initiating build for Snyk binaries with Node version: node$(PKG_NODE_VERSION)'
 	@echo "'make prepack' was run. Run 'make clean-prepack' to rollback your package.json changes and this file." > prepack
 	npm version "$(shell cat $(BINARY_RELEASES_FOLDER_TS_CLI)/version)" --no-git-tag-version --workspaces --include-workspace-root
 	cd $(BINARY_WRAPPER_DIR); npm version "$(shell cat $(WORKING_DIR)/$(BINARY_RELEASES_FOLDER_TS_CLI)/version)" --no-git-tag-version --include-workspace-root
@@ -114,27 +116,27 @@ $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-protect.tgz: prepack | $(BINARY_RELEASES_F
 	mv $(shell npm pack --workspace '@snyk/protect') $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-protect.tgz
 
 $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-alpine: prepack | $(BINARY_RELEASES_FOLDER_TS_CLI)
-	$(PKG) -t node16-alpine-x64 -o $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-alpine
+	$(PKG) -t node$(PKG_NODE_VERSION)-alpine-x64 -o $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-alpine
 	$(MAKE) $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-alpine.sha256
 
 $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-linux: prepack | $(BINARY_RELEASES_FOLDER_TS_CLI)
-	$(PKG) -t node16-linux-x64 -o $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-linux
+	$(PKG) -t node$(PKG_NODE_VERSION)-linux-x64 -o $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-linux
 	$(MAKE) $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-linux.sha256
 
 # Why `--no-bytecode` for Linux/arm64:
 #   arm64 bytecode generation requires various build tools on an x64 build
 #   environment. So disabling until we can support it. It's an optimisation.
 #   https://github.com/vercel/pkg#targets
 $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-linux-arm64: prepack | $(BINARY_RELEASES_FOLDER_TS_CLI)
-	$(PKG) -t node16-linux-arm64 -o $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-linux-arm64 --no-bytecode
+	$(PKG) -t node$(PKG_NODE_VERSION)-linux-arm64 -o $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-linux-arm64 --no-bytecode
 	$(MAKE) $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-linux-arm64.sha256
 
 $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-macos: prepack | $(BINARY_RELEASES_FOLDER_TS_CLI)
-	$(PKG) -t node16-macos-x64 -o $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-macos
+	$(PKG) -t node$(PKG_NODE_VERSION)-macos-x64 -o $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-macos
 	$(MAKE) $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-macos.sha256
 
 $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-win.exe: prepack | $(BINARY_RELEASES_FOLDER_TS_CLI)
-	$(PKG) -t node16-win-x64 -o $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-win.exe
+	$(PKG) -t node$(PKG_NODE_VERSION)-win-x64 -o $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-win.exe
 	powershell $(WORKING_DIR)/cliv2/scripts/sign_windows.ps1 $(BINARY_RELEASES_FOLDER_TS_CLI) snyk-win.exe
 	$(MAKE) $(BINARY_RELEASES_FOLDER_TS_CLI)/snyk-win.exe.sha256
 

cliv2/internal/cliv2/cliv2.go

@@ -291,6 +291,7 @@ func PrepareV1EnvironmentVariables(
 			constants.SNYK_NPM_HTTP_PROXY_ENV,
 			constants.SNYK_NPM_PROXY_ENV,
 			constants.SNYK_NPM_ALL_PROXY,
+			constants.SNYK_OPENSSL_CONF,
 		}
 
 		for _, key := range blackList {

cliv2/internal/constants/constants.go

@@ -17,6 +17,7 @@ const SNYK_CA_CERTIFICATE_LOCATION_ENV = "NODE_EXTRA_CA_CERTS"
 const SNYK_INTERNAL_NO_PROXY = "localhost,127.0.0.1,::1"
 const SNYK_OAUTH_ACCESS_TOKEN_ENV = "SNYK_OAUTH_TOKEN"
 const SNYK_ANALYTICS_DISABLED_ENV = "SNYK_DISABLE_ANALYTICS"
+const SNYK_OPENSSL_CONF = "OPENSSL_CONF"
 
 const SNYK_HTTPS_PROXY_ENV_SYSTEM = "SNYK_SYSTEM_HTTPS_PROXY"
 const SNYK_HTTP_PROXY_ENV_SYSTEM = "SNYK_SYSTEM_HTTP_PROXY"

test/setup.js

@@ -55,4 +55,10 @@ module.exports = async function() {
   if (process.env.TEST_SNYK_TOKEN !== undefined) {
     await runSnykCLI(`config set api=${process.env.TEST_SNYK_TOKEN}`);
   }
+
+  console.error(
+    '\n------------------------------------------------------------' +
+      '\n Environment successfully setup! Starting to run tests now!' +
+      '\n------------------------------------------------------------',
+  );
 };

test/smoke/docker-root/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:18
 
 COPY ./smoke/ /snyk/smoke/
 COPY ./fixtures/ /snyk/fixtures/