Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumping main to 2.2, address dependabot alert, enable test workflows on all PRs, fix snapshot tests. #227

Merged
merged 5 commits into from
Aug 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/cypress-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/unit-tests-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions opensearch_dashboards.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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))
12 changes: 6 additions & 6 deletions test/setup.jest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: () => {
Expand All @@ -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
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down