From 43fe5d50bb9bb1d16dc98640eff2468c567c0bc2 Mon Sep 17 00:00:00 2001 From: Miki Date: Thu, 7 Sep 2023 16:29:45 -0700 Subject: [PATCH] Correct the generated path for downloading plugins by their names on Windows (#4953) * Correct the generated path for downloading plugins by their names on Windows Signed-off-by: Miki * Update snapshot for unit test Signed-off-by: Kawika Avilla * Add link for integration to lycheeexlude Signed-off-by: Kawika Avilla --------- Signed-off-by: Miki Signed-off-by: Kawika Avilla Co-authored-by: Kawika Avilla --- .lycheeexclude | 1 + CHANGELOG.md | 3 ++- src/cli_plugin/install/settings.js | 5 +++-- src/cli_plugin/install/settings.test.js | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.lycheeexclude b/.lycheeexclude index 5bb9c969dad1..67ed88344a25 100644 --- a/.lycheeexclude +++ b/.lycheeexclude @@ -124,3 +124,4 @@ http://helpmenow.com/problem2 https://sass-lang.com/* http://api.jquery.com/* http://brandonaaron.net +https://www.circl.lu/doc/misp/ diff --git a/CHANGELOG.md b/CHANGELOG.md index dd30b8220fc9..9998f316974c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,7 +47,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - [TSVB, Dashboards] Fix inconsistent dark mode code editor themes ([#4609](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4609)) - [Legacy Maps] Fix dark mode style overrides ([#4658](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4658)) - [BUG] Fix management overview page duplicate rendering ([#4636](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4636)) -- Fixes broken app when management is turned off ([#4891](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4891)) +- Fix broken app when management is turned off ([#4891](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4891)) +- Correct the generated path for downloading plugins by their names on Windows ([#4953](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4953)) ### 🚞 Infrastructure diff --git a/src/cli_plugin/install/settings.js b/src/cli_plugin/install/settings.js index 2b0c34bfcd37..cfd576f8ff5a 100644 --- a/src/cli_plugin/install/settings.js +++ b/src/cli_plugin/install/settings.js @@ -42,10 +42,11 @@ function generateUrls({ version, plugin }) { } function generatePluginUrl(version, plugin) { - const platform = process.platform === 'win32' ? 'windows' : process.platform; + const [platform, type] = + process.platform === 'win32' ? ['windows', 'zip'] : [process.platform, 'tar']; const arch = process.arch === 'arm64' ? 'arm64' : 'x64'; - return `${LATEST_PLUGIN_BASE_URL}/${version}/latest/${platform}/${arch}/tar/builds/opensearch-dashboards/plugins/${plugin}-${version}.zip`; + return `${LATEST_PLUGIN_BASE_URL}/${version}/latest/${platform}/${arch}/${type}/builds/opensearch-dashboards/plugins/${plugin}-${version}.zip`; } export function parseMilliseconds(val) { diff --git a/src/cli_plugin/install/settings.test.js b/src/cli_plugin/install/settings.test.js index ac7cf94e6761..60313e3fe9b8 100644 --- a/src/cli_plugin/install/settings.test.js +++ b/src/cli_plugin/install/settings.test.js @@ -157,7 +157,7 @@ describe('parse function', function () { "timeout": 0, "urls": Array [ "plugin name", - "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/1234/latest/windows/x64/tar/builds/opensearch-dashboards/plugins/plugin name-1234.zip", + "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/1234/latest/windows/x64/zip/builds/opensearch-dashboards/plugins/plugin name-1234.zip", ], "version": 1234, "workingPath": /plugins/.plugin.installing,