Merge branch 'main' into main

Author: wntmddus

.github/workflows/add-untriaged.yml

@@ -4,11 +4,14 @@ on:
   issues:
     types: [opened, reopened, transferred]
 
+permissions:
+  issues: write
+
 jobs:
   apply-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           script: |
             github.rest.issues.addLabels({

MAINTAINERS.md

@@ -12,7 +12,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Vikas Bansal          | [vikasvb90](https://github.com/vikasvb90)                    | Amazon      |
 | Zhou Su               | [SuZhou-Joe](https://github.com/SuZhou-Joe)                  | Amazon      |
 | Kshitij Tandon | [tandonks](https://github.com/tandonks) | Amazon |
-| Shivansh Arora | [shiv0408](https://github.com/shiv0408) | Amazon |
+| Shivansh Arora | [shiv0408](https://github.com/shiv0408) | Apple |
 | Sooraj Sinha | [soosinha](https://github.com/soosinha) | Amazon |
 
 ## Emeritus

cypress/e2e/plugins/index-management-dashboards-plugin/managed_indices_spec.js

@@ -29,7 +29,7 @@ describe("Managed indexes", () => {
     // Common text to wait for to confirm page loaded, give up to 60 seconds for initial load
     cy.contains("Edit rollover alias", { timeout: 60000 });
 
-    cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
+    cy.dismissToast();
   });
 
   describe("can have policies removed", () => {
@@ -90,7 +90,7 @@ describe("Managed indexes", () => {
       // Wait up to 5 seconds for the managed index to execute
       // eslint-disable-next-line cypress/no-unnecessary-waiting
       cy.wait(5000).reload();
-      cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
+      cy.dismissToast();
 
       // Confirm managed index successfully initialized the policy
       cy.contains("Successfully initialized", { timeout: 20000 });
@@ -100,7 +100,7 @@ describe("Managed indexes", () => {
       // Wait up to 5 seconds for managed index to execute
       // eslint-disable-next-line cypress/no-unnecessary-waiting
       cy.wait(5000).reload();
-      cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
+      cy.dismissToast();
 
       // Confirm we have a Failed execution, wait up to 20 seconds as OSD takes a while to load
       cy.contains("Failed", { timeout: 20000 });
@@ -125,7 +125,7 @@ describe("Managed indexes", () => {
 
       // Reload the page
       cy.reload();
-      cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
+      cy.dismissToast();
 
       // Confirm we see managed index attempting to retry, give 20 seconds for OSD load
       cy.contains("Pending retry of failed managed index", { timeout: 20000 });
@@ -136,7 +136,7 @@ describe("Managed indexes", () => {
       // Wait up to 5 seconds for managed index to execute
       // eslint-disable-next-line cypress/no-unnecessary-waiting
       cy.wait(5000).reload();
-      cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
+      cy.dismissToast();
 
       // Confirm managed index successfully rolled over
       cy.contains("Successfully rolled over", { timeout: 20000 });

cypress/e2e/plugins/index-management-dashboards-plugin/policies_spec.js

@@ -73,6 +73,7 @@ describe("Policies", () => {
         add: ["alias1", "alias2"],
         remove: ["alias3", "alias5", "alias6"],
       };
+      const testIndexPattern = "test-index-pattern";
 
       // Route us to create policy page
       cy.contains("Create policy").click({ force: true });
@@ -89,6 +90,12 @@ describe("Policies", () => {
       // Type in the policy description
       cy.get(`[data-test-subj="create-policy-description"]`).type("{selectall}{backspace}" + sampleAliasPolicy.policy.description);
 
+      // Add an ISM template
+      cy.get("button").contains("Add template").click({ force: true });
+
+      // Enter an index pattern
+      cy.get(`[data-test-subj="comboBoxInput"]`).type(testIndexPattern);
+
       // Add a state
       cy.get("button").contains("Add state").click({ force: true });
 
@@ -114,7 +121,7 @@ describe("Policies", () => {
       cy.get(`[data-test-subj="remove-alias-toggle"]`).click({ force: true });
 
       // Enter aliases to remove
-      cy.get(`[data-test-subj="remove-alias-combo-box"]`).click({ force: true }).type(testInputs.remove.join("{enter}"));
+      cy.get(`[data-test-subj="remove-alias-combo-box"]`).click({ force: true }).type(testInputs.remove.join("{enter}").concat("{enter}"));
 
       // Click the 'Add action' button
       cy.get(`[data-test-subj="flyout-footer-action-button"]`).click({ force: true });

opensearch_dashboards.json

@@ -1,7 +1,7 @@
 {
   "id": "indexManagementDashboards",
-  "version": "3.3.0.0",
-  "opensearchDashboardsVersion": "3.3.0",
+  "version": "3.7.0.0",
+  "opensearchDashboardsVersion": "3.7.0",
   "configPath": [
     "opensearch_index_management"
   ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opensearch_index_management_dashboards",
-  "version": "3.3.0.0",
+  "version": "3.7.0.0",
   "description": "Opensearch Dashboards plugin for Index Management",
   "main": "index.js",
   "license": "Apache-2.0",
@@ -29,7 +29,7 @@
     }
   },
   "resolutions": {
-    "@types/react": "^16.9.8",
+    "@types/react": "^18.2.0",
     "semver": "^7.5.3",
     "@cypress/request": "^3.0.0",
     "**/ansi-regex": "^5.0.1",
@@ -45,19 +45,21 @@
     "pbkdf2": "^3.1.3",
     "form-data": "4.0.4",
     "cipher-base": "^1.0.7",
-    "sha.js": "^2.4.12"
+    "sha.js": "^2.4.12",
+    "qs": "^6.14.1",
+    "lodash": "^4.18.0",
+    "bn.js": "^4.12.3"
   },
   "devDependencies": {
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@elastic/elastic-eslint-config-kibana": "link:../../packages/opensearch-eslint-config-opensearch-dashboards",
     "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
     "@testing-library/dom": "^8.11.3",
-    "@testing-library/react-hooks": "^7.0.2",
     "@testing-library/user-event": "^14.4.3",
     "@types/diff": "^5.0.2",
     "@types/flat": "^5.0.2",
     "@types/json-schema": "^7.0.11",
-    "@types/react-dom": "^16.9.8",
+    "@types/react-dom": "^18.2.0",
     "@types/react-router-dom": "^5.3.2",
     "cypress": "^13.6.0",
     "diff": "^4.0.1",
@@ -72,4 +74,4 @@
   "engines": {
     "yarn": "^1.21.1"
   }
-}
+}

public/components/FormGenerator/FormGenerator.test.tsx

@@ -4,8 +4,7 @@
  */
 
 import React, { forwardRef, useRef } from "react";
-import { act, fireEvent, render, waitFor } from "@testing-library/react";
-import { renderHook } from "@testing-library/react-hooks";
+import { act, fireEvent, render, waitFor, renderHook } from "@testing-library/react";
 import userEventModule from "@testing-library/user-event";
 import { EuiButton } from "@elastic/eui";
 import FormGenerator, { IFormGeneratorProps, IFormGeneratorRef } from "./index";

public/components/IndexDetail/IndexDetail.test.tsx

@@ -4,8 +4,7 @@
  */
 
 import React, { useRef, forwardRef, useState } from "react";
-import { render, waitFor } from "@testing-library/react";
-import { renderHook } from "@testing-library/react-hooks";
+import { render, waitFor, renderHook } from "@testing-library/react";
 import IndexDetail, { IIndexDetailRef, IndexDetailProps } from "./IndexDetail";
 import userEventModule from "@testing-library/user-event";
 

public/components/IndexMapping/IndexMapping.test.tsx

@@ -4,11 +4,10 @@
  */
 
 import React, { forwardRef, Ref, useRef, useState } from "react";
-import { render, fireEvent, waitFor, act } from "@testing-library/react";
+import { render, fireEvent, waitFor, act, renderHook } from "@testing-library/react";
 import userEventModule from "@testing-library/user-event";
 import IndexMapping, { IIndexMappingsRef, IndexMappingProps, transformObjectToArray } from "./IndexMapping";
 import { MappingsProperties } from "../../../models/interfaces";
-import { renderHook } from "@testing-library/react-hooks";
 
 const IndexMappingOnChangeWrapper = forwardRef((props: Partial<IndexMappingProps>, ref: Ref<IIndexMappingsRef>) => {
   const [value, setValue] = useState(props.value as any);