[Bug Fix] Fix the bootstrap failure on the fresh run (#270)

* Update the yarn.lock and remove the retries for plugins bootstrap in CIs Signed-off-by: Ryan Liang <[email protected]> * Update the snapshots Signed-off-by: Ryan Liang <[email protected]> --------- Signed-off-by: Ryan Liang <[email protected]>
opensearch-project · Jan 9, 2024 · 09cb4c1 · 09cb4c1
1 parent cdaa926
commit 09cb4c1
Show file tree

Hide file tree

Showing 9 changed files with 1,071 additions and 1,662 deletions.
diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml
@@ -115,22 +115,10 @@ jobs:
  working-directory: OpenSearch-Dashboards
  shell: bash
 
- - name: OpenSearch Dashboards Plugin Bootstrap
+ - name: Boodstrap Opensearch Dashboards
  run: |
- max_retries=3
- count=0
- until yarn osd bootstrap; do
- exit_code=$?
- count=$(($count + 1))
- echo "Attempt $count/$max_retries failed with exit code $exit_code, retrying..."
- if [ $count -ge $max_retries ]; then
- echo "Reached maximum retry attempts, stopping..."
- exit $exit_code
- fi
- sleep 5 # Wait for 5 seconds before retrying
- done
+ yarn osd bootstrap
  working-directory: OpenSearch-Dashboards
- shell: bash
 
  - name: Run Opensearch Dashboards with Dashboards Reporting Plugin Installed
  run: |

diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml
@@ -115,22 +115,10 @@ jobs:
  working-directory: OpenSearch-Dashboards
  shell: bash
 
- - name: OpenSearch Dashboards Plugin Bootstrap
+ - name: Boodstrap Opensearch Dashboards
  run: |
- max_retries=3
- count=0
- until yarn osd bootstrap; do
- exit_code=$?
- count=$(($count + 1))
- echo "Attempt $count/$max_retries failed with exit code $exit_code, retrying..."
- if [ $count -ge $max_retries ]; then
- echo "Reached maximum retry attempts, stopping..."
- exit $exit_code
- fi
- sleep 5 # Wait for 5 seconds before retrying
- done
+ yarn osd bootstrap
  working-directory: OpenSearch-Dashboards
- shell: bash
 
  - name: Run Opensearch Dashboards with Dashboards Reporting Plugin Installed
  run: |

diff --git a/public/components/main/__tests__/__snapshots__/main.test.tsx.snap b/public/components/main/__tests__/__snapshots__/main.test.tsx.snap
@@ -44,7 +44,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiButton__text"
  >
@@ -92,7 +96,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  </span>
  </div>
  </div>
@@ -127,7 +135,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiButtonEmpty__text"
  >
@@ -166,7 +178,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiButtonEmpty__text"
  >
@@ -229,7 +245,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiButtonEmpty__text"
  >
@@ -431,7 +451,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <svg
  aria-hidden="true"
  aria-label="External link"
@@ -442,7 +466,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiScreenReaderOnly"
  >
@@ -509,7 +537,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiButton__text"
  >
@@ -577,7 +609,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  </span>
  </div>
  </div>
@@ -635,7 +671,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiButtonEmpty__text"
  >
@@ -837,7 +877,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <svg
  aria-hidden="true"
  aria-label="External link"
@@ -848,7 +892,11 @@ exports[`<Main /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiScreenReaderOnly"
  >
@@ -1866,7 +1914,11 @@ exports[`<Main /> panel render component after create success 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiToastHeader__title"
  >
@@ -1888,7 +1940,11 @@ exports[`<Main /> panel render component after create success 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  </button>
  </div>
  </div>

diff --git a/public/components/main/__tests__/__snapshots__/report_definitions_table.test.tsx.snap b/public/components/main/__tests__/__snapshots__/report_definitions_table.test.tsx.snap
@@ -37,7 +37,11 @@ exports[`<ReportDefinitions /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  </span>
  </div>
  </div>
@@ -95,7 +99,11 @@ exports[`<ReportDefinitions /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiButtonEmpty__text"
  >
@@ -502,7 +510,11 @@ exports[`<ReportDefinitions /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiButtonEmpty__text"
  >
@@ -537,7 +549,11 @@ exports[`<ReportDefinitions /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  </button>
  <ul
  class="euiPagination__list"
@@ -582,7 +598,11 @@ exports[`<ReportDefinitions /> panel render component 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  </button>
  </nav>
  </div>
@@ -899,7 +919,11 @@ exports[`<ReportDefinitions /> panel render empty table 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <svg
  aria-hidden="true"
  aria-label="External link"
@@ -910,7 +934,11 @@ exports[`<ReportDefinitions /> panel render empty table 1`] = `
  viewBox="0 0 16 16"
  width="16"
  xmlns="http://www.w3.org/2000/svg"
- />
+ >
+ <path
+ d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+ />
+ </svg>
  <span
  class="euiScreenReaderOnly"
  >