From 5012095c0f24879669cec810ec2c315810b0ff16 Mon Sep 17 00:00:00 2001 From: Ilona Shishov Date: Sun, 8 Oct 2023 10:58:13 +0300 Subject: [PATCH] chore: update to exhort-javascript-api version supporting RDHA_TOKEN and RHDA_SOURCE (#215) --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- src/server.ts | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index d8dd81fd..7067f75a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,14 +9,14 @@ "version": "0.7.1-ea.9", "license": "Apache-2.0", "dependencies": { - "@RHEcosystemAppEng/exhort-javascript-api": "^0.0.2-ea.29", + "@RHEcosystemAppEng/exhort-javascript-api": "^0.0.2-ea.32", "@xml-tools/ast": "^5.0.5", "@xml-tools/parser": "^1.0.11", "compare-versions": "^6.0.0-rc.1", "json-to-ast": "^2.1.0", "mkdirp": "^3.0.1", "vscode-languageserver": "^8.1.0", - "vscode-languageserver-textdocument": "^1.0.11" + "vscode-languageserver-textdocument": "^1.0.8" }, "bin": { "fabric8-analytics-lsp-server": "dist/server.js" @@ -946,9 +946,9 @@ } }, "node_modules/@RHEcosystemAppEng/exhort-javascript-api": { - "version": "0.0.2-ea.29", - "resolved": "https://npm.pkg.github.com/download/@RHEcosystemAppEng/exhort-javascript-api/0.0.2-ea.29/e5fab3bc2babc9bc363af7ff3e4745dabf428c5e", - "integrity": "sha512-9ZkDEYN63VTlYsUUkIpE/s/ltacGMhavnxQqgJbMwHMsZBkSTVbj3VVeerj3t8hhMHv2s4Lieca6C8BOz021xQ==", + "version": "0.0.2-ea.32", + "resolved": "https://npm.pkg.github.com/download/@RHEcosystemAppEng/exhort-javascript-api/0.0.2-ea.32/1f79abff8138c7bfb663b1aeb49e3328f731b0d1", + "integrity": "sha512-4Bc3oeZsu9JbE3+SN2NxtPcSudsCdQ+x8yUfIwW+s1U/6oviCkyWBUSreoPqa/fHt3uk9bHJy1FJ+NLmVlb2Rw==", "license": "Apache-2.0", "dependencies": { "@cyclonedx/cyclonedx-library": "^4.0.0", @@ -5407,9 +5407,9 @@ } }, "node_modules/vscode-languageserver-textdocument": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz", - "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==" + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz", + "integrity": "sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==" }, "node_modules/vscode-languageserver-types": { "version": "3.17.3", diff --git a/package.json b/package.json index 0fc9015f..03814a92 100644 --- a/package.json +++ b/package.json @@ -24,14 +24,14 @@ "dist" ], "dependencies": { - "@RHEcosystemAppEng/exhort-javascript-api": "^0.0.2-ea.29", + "@RHEcosystemAppEng/exhort-javascript-api": "^0.0.2-ea.32", "@xml-tools/ast": "^5.0.5", "@xml-tools/parser": "^1.0.11", "compare-versions": "^6.0.0-rc.1", "json-to-ast": "^2.1.0", "mkdirp": "^3.0.1", "vscode-languageserver": "^8.1.0", - "vscode-languageserver-textdocument": "^1.0.11" + "vscode-languageserver-textdocument": "^1.0.8" }, "devDependencies": { "@types/chai": "^4.3.5", diff --git a/src/server.ts b/src/server.ts index b484ea5d..dcade54e 100644 --- a/src/server.ts +++ b/src/server.ts @@ -197,7 +197,8 @@ const fetchVulnerabilities = async (fileType: string, reqData: any) => { 'EXHORT_NPM_PATH': globalSettings.npmExecutable, 'EXHORT_GO_PATH': globalSettings.goExecutable, 'EXHORT_DEV_MODE': config.exhort_dev_mode, - 'RHDA_TOKEN': config.telemetry_id + 'RHDA_TOKEN': config.telemetry_id, + 'RHDA_SOURCE': config.utm_source }; if (globalSettings.exhortSnykToken !== '') { options['EXHORT_SNYK_TOKEN'] = globalSettings.exhortSnykToken;