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 <[email protected]> * Update snapshot for unit test Signed-off-by: Kawika Avilla <[email protected]> * Add link for integration to lycheeexlude Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Miki <[email protected]> Signed-off-by: Kawika Avilla <[email protected]> Co-authored-by: Kawika Avilla <[email protected]> (cherry picked from commit 43fe5d5) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md
opensearch-project · Sep 7, 2023 · af251d0 · af251d0
1 parent d1400d6
commit af251d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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/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
@@ -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": <absolute path>/plugins/.plugin.installing,