Bumping main to 2.2, address dependabot alert, enable test workflows …

…on all PRs, fix snapshot tests. (#227) * Bumping 2.x branch from version 2.1 to 2.2. (#218) * Bumping 2.x branch from version 2.1 to 2.2. Bumped terser version to 4.8.1 to address CVE. Signed-off-by: AWSHurneyt <[email protected]> * Drafted `2.2` release notes. Signed-off-by: AWSHurneyt <[email protected]> * Drafted `2.2` release notes. Signed-off-by: AWSHurneyt <[email protected]> * Amended 2.2 release notes. (#222) Signed-off-by: AWSHurneyt <[email protected]> * Adjusted version of OSD used by unit and cypress tests to align with OSD branching strategy. Enabled unit and cypress test workflows on all branches. Signed-off-by: AWSHurneyt <[email protected]> * Updated link that was broken when ODFE was deprecated. Signed-off-by: AWSHurneyt <[email protected]> * Adjusted path for dependency used by unit tests to align with migration from EUI to OUI. Signed-off-by: AWSHurneyt <[email protected]> Signed-off-by: AWSHurneyt <[email protected]>
opensearch-project · Aug 18, 2022 · 8cc7431 · 8cc7431
1 parent 4821889
commit 8cc7431
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 24 deletions.
diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml
@@ -2,14 +2,13 @@ name: E2E tests workflow
 on:
   pull_request:
     branches:
-      - main
+      - "*"
   push:
     branches:
-      - main
-      - development-*
+      - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.x'
-  OPENSEARCH_VERSION: '2.1.0-SNAPSHOT'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.2'
+  OPENSEARCH_VERSION: '2.2.0-SNAPSHOT'
 jobs:
   tests:
     name: Run Cypress E2E tests

diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml
@@ -2,13 +2,12 @@ name: Unit tests workflow
 on:
   pull_request:
     branches:
-      - main
+      - "*"
   push:
     branches:
-      - main
-      - development-*
+      - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.x'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.2'
 jobs:
   tests:
     name: Run unit tests

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![Integration tests](https://github.com/opensearch-project/index-management-dashboards-plugin/workflows/E2E%20tests%20workflow/badge.svg)](https://github.com/opensearch-project/index-management-dashboards-plugin/actions?query=workflow%3A%22E2E+tests+workflow%22)
 [![codecov](https://codecov.io/gh/opensearch-project/index-management-dashboards-plugin/branch/main/graph/badge.svg)](https://codecov.io/gh/opensearch-project/index-management-dashboards-plugin)
 [![Documentation](https://img.shields.io/badge/doc-reference-blue)](https://opensearch.org/docs/im-plugin/index/)
-[![Forum](https://img.shields.io/badge/chat-on%20forums-blue)](https://discuss.opendistrocommunity.dev/c/Use-this-category-for-all-questions-around-machine-learning-plugins)
+[![Forum](https://img.shields.io/badge/chat-on%20forums-blue)](https://forum.opensearch.org/c/plugins/index-management)
 ![PRs welcome!](https://img.shields.io/badge/PRs-welcome!-success)
 
 <img src="https://opensearch.org/assets/img/opensearch-logo-themed.svg" height="64px">

diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "indexManagementDashboards",
-  "version": "2.1.0.0",
-  "opensearchDashboardsVersion": "2.1.0",
+  "version": "2.2.0.0",
+  "opensearchDashboardsVersion": "2.2.0",
   "configPath": ["opensearch_index_management"],
   "requiredPlugins": ["navigation"],
   "server": true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opensearch_index_management_dashboards",
-  "version": "2.1.0.0",
+  "version": "2.2.0.0",
   "description": "Opensearch Dashboards plugin for Index Management",
   "main": "index.js",
   "license": "Apache-2.0",
@@ -44,7 +44,8 @@
     "ansi-regex": "^5.0.1",
     "minimist": "^1.2.6",
     "moment": "^2.29.2",
-    "async": "^3.2.3"
+    "async": "^3.2.3",
+    "terser": "^4.8.1"
   },
   "devDependencies": {
     "@elastic/elastic-eslint-config-kibana": "link:../../packages/opensearch-eslint-config-opensearch-dashboards",

diff --git a/...se-notes/opensearch-index-management-dashboards-plugin.release-notes-2.2.0.0.md b/...se-notes/opensearch-index-management-dashboards-plugin.release-notes-2.2.0.0.md
@@ -0,0 +1,10 @@
+## Version 2.2.0.0 2022-08-04
+
+Compatible with OpenSearch 2.2.0
+
+### Maintenance
+* Bumping 2.x branch from version 2.1 to 2.2. ([#218](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/218))
+
+### Documentation
+* Updated rollup help text. ([#220](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/220))
+* Added to 2.2 release notes. ([#222](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/222))
diff --git a/test/setup.jest.ts b/test/setup.jest.ts
@@ -9,7 +9,7 @@ import { configure } from "@testing-library/react";
 
 configure({ testIdAttribute: "data-test-subj" });
 
-jest.mock("@elastic/eui/lib/components/form/form_row/make_id", () => () => "some_make_id");
+jest.mock("@elastic/eui/lib/eui_components/form/form_row/make_id", () => () => "some_make_id");
 
 jest.mock("@elastic/eui/lib/services/accessibility/html_id_generator", () => ({
   htmlIdGenerator: () => {
@@ -32,13 +32,13 @@ window.URL = {
 };
 
 // https://github.com/elastic/eui/issues/2530
-jest.mock("@elastic/eui/lib/components/icon", () => ({
+jest.mock("@elastic/eui/lib/eui_components/icon", () => ({
   EuiIcon: () => "EuiIconMock",
   __esModule: true,
-  IconPropType: require("@elastic/eui/lib/components/icon/icon").IconPropType,
-  ICON_TYPES: require("@elastic/eui/lib/components/icon/icon").TYPES,
-  ICON_SIZES: require("@elastic/eui/lib/components/icon/icon").SIZES,
-  ICON_COLORS: require("@elastic/eui/lib/components/icon/icon").COLORS,
+  IconPropType: require("@elastic/eui/lib/eui_components/icon/icon").IconPropType,
+  ICON_TYPES: require("@elastic/eui/lib/eui_components/icon/icon").TYPES,
+  ICON_SIZES: require("@elastic/eui/lib/eui_components/icon/icon").SIZES,
+  ICON_COLORS: require("@elastic/eui/lib/eui_components/icon/icon").COLORS,
 }));
 
 jest.setTimeout(10000); // in milliseconds
diff --git a/yarn.lock b/yarn.lock
@@ -4115,10 +4115,10 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@^4.1.2:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+terser@^4.1.2, terser@^4.8.1:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
+  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"