From 4d7acf9e9953dce1c9c55448881dc2a4abbc4756 Mon Sep 17 00:00:00 2001 From: David Cui Date: Wed, 5 May 2021 15:49:45 -0700 Subject: [PATCH] Fix case-sensitivity for chromium in workflow and osd version header in context menu (#35) Signed-off-by: David Cui --- .../dashboards-reports-test-and-build-workflow.yml | 14 +++++++------- .../public/components/context_menu/context_menu.js | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index bbbb24cd..ec13dc13 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -57,29 +57,29 @@ jobs: yarn build cd build - mkdir -p ./{linux-x64,linux-arm64,windows-x64}/OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} + mkdir -p ./{linux-x64,linux-arm64,windows-x64}/opensearch-dashboards/${{ env.PLUGIN_NAME }} cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip cd linux-x64 wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip - unzip chromium-linux-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards + unzip chromium-linux-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} + zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./opensearch-dashboards mv ./${{ env.PLUGIN_NAME }}-*.zip .. cd .. cd linux-arm64 wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-arm64.zip - unzip chromium-linux-arm64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards + unzip chromium-linux-arm64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} + zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./opensearch-dashboards mv ./${{ env.PLUGIN_NAME }}-*.zip .. cd .. cd windows-x64 wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip - unzip chromium-windows-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards + unzip chromium-windows-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} + zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./opensearch-dashboards mv ./${{ env.PLUGIN_NAME }}-*.zip .. cd .. diff --git a/dashboards-reports/public/components/context_menu/context_menu.js b/dashboards-reports/public/components/context_menu/context_menu.js index 32c7d37f..9465a6b2 100644 --- a/dashboards-reports/public/components/context_menu/context_menu.js +++ b/dashboards-reports/public/components/context_menu/context_menu.js @@ -126,7 +126,7 @@ const generateInContextReport = async ( { headers: { 'Content-Type': 'application/json', - 'osd-version': '1.0.0', + 'osd-version': '1.0.0-beta1', accept: '*/*', 'accept-language': 'en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7,zh-TW;q=0.6', pragma: 'no-cache', @@ -340,7 +340,7 @@ async function getTenantInfoIfExists() { const res = await fetch(`../api/v1/multitenancy/tenant`, { headers: { 'Content-Type': 'application/json', - 'osd-version': '1.0.0', + 'osd-version': '1.0.0-beta1', accept: '*/*', 'accept-language': 'en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7,zh-TW;q=0.6', pragma: 'no-cache',