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

Update backport CI, add PR merged condition #111

Merged
merged 1 commit into from
Aug 10, 2023
Merged

Conversation

ps48
Copy link
Member

@ps48 ps48 commented Aug 10, 2023

Description

Update backport CI, add PR merged condition

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
@codecov
Copy link

codecov bot commented Aug 10, 2023

Codecov Report

Merging #111 (0a57ae7) into main (f01e532) will not change coverage.
Report is 1 commits behind head on main.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #111   +/-   ##
=======================================
  Coverage   62.76%   62.76%           
=======================================
  Files          10       10           
  Lines         658      658           
  Branches      119      119           
=======================================
  Hits          413      413           
  Misses        192      192           
  Partials       53       53           
Flag Coverage Δ
dashboards-query-workbench 62.76% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@ps48 ps48 merged commit 8583b8d into opensearch-project:main Aug 10, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-query-workbench/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-query-workbench/backport-2.x
# Create a new branch
git switch --create backport/backport-111-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8583b8db1ebb125800c9b826e8b47c39ca283950
# Push it to GitHub
git push --set-upstream origin backport/backport-111-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-query-workbench/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-111-to-2.x.

ps48 added a commit to ps48/dashboards-query-workbench that referenced this pull request Oct 5, 2023
* Updated MAINTAINERS.md to match recommended opensearch-project format. (opensearch-project#18)

Signed-off-by: dblock <dblock@amazon.com>

Signed-off-by: dblock <dblock@amazon.com>

* Add .whitesource configuration file (#1)

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

* Bump json5 from 2.2.1 to 2.2.3 (opensearch-project#20)

Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v2.2.1...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* adding release notes (opensearch-project#28) (opensearch-project#30)

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 5dde647)

Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>

* Rename plugin_helpers to plugin-helpers (opensearch-project#31)

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Add resolution for ansi-regex (opensearch-project#38)

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Upgrade hapi-latest to fix CVE-2023-25166 (opensearch-project#39)

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Created untriaged issue workflow. (opensearch-project#42)

Signed-off-by: dblock <dblock@amazon.com>

* Fix Node.js and Yarn installation in CI (opensearch-project#44)

Signed-off-by: Miki <miki@amazon.com>

* add release notes for 2.6 query workbench (opensearch-project#48) (opensearch-project#50)

* add release notes for 2.6 query workbench

Signed-off-by: Derek Ho <dxho@amazon.com>

* add CI item in infra

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
(cherry picked from commit 5cecd8d)

Co-authored-by: Derek Ho <dxho@amazon.com>

* baseline repo groups (opensearch-project#52)

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add 2.7 release note (opensearch-project#57)

Signed-off-by: Chen Dai <daichen@amazon.com>

* Add fix for CVE-2023-2251 (opensearch-project#60)

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* update maintainers and code owners (opensearch-project#64)

* update maintainers and code owners

Signed-off-by: Derek Ho <dxho@amazon.com>

* add ani to codeowners

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add release notes for 2.8 (opensearch-project#75)

* Add release notes for 2.8

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Update release notes

Signed-off-by: Joshua Li <joshuali925@gmail.com>

---------

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Use valid json for mock data in unit tests (opensearch-project#76)

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Update default query. (opensearch-project#81)

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Update CI. (opensearch-project#82)

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Increment version to 3.0.0.0 (opensearch-project#66)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* Upgrade tough-cookie and semver (opensearch-project#90)

* Upgrade tough-cookie to fix CVE-2023-26136

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Add semver resolution to patch CVE-2022-25883

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

---------

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Add release notes for 2.9.0 (opensearch-project#93)

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Bump word-wrap from 1.2.3 to 1.2.4 (opensearch-project#99)

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update fail backport (opensearch-project#104)

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update backport CI, add PR merged condition (opensearch-project#111)

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Update searchbar snapshots according to upstream changes (opensearch-project#115)

Signed-off-by: Derek Ho <dxho@amazon.com>

* add release notes for 2.10.0 (opensearch-project#117)

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Upgrade cypress/request (opensearch-project#120)

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add table acceleration flyout (opensearch-project#128)

* Add table acceleration flyout

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* comment on hardcoded elements

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* additional comment on hardcoded

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove console logs

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* review fixes

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* revert version changes, inline type declare

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Increment version to 3.0.0.0 (opensearch-project#121)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* Add materialized view visual builder and query builders (opensearch-project#129)

* add materialized view visual builder and query builders

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* organize header and PR comments

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Define tables (opensearch-project#126)

* added changes for sidebar

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* added side bar with tables indexed

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* added dynamic element for tree view, addressed pr comments

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* made a few design and panel changes, addressed pr comments

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* changed the constants file

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* added changes for search bar removal, pr comments

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* readded console.log

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* updated test suites, removed search field

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* added changes for Data connection and combo box

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* updated mock for http query

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* updated mock template name in tests

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* addressed pr comments

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* addressed more comments

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* added error message for sidebar

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* updated snapshots

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

---------

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* update packages and tsconfig (opensearch-project#130)

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Update form validations and tests for acceleration  (opensearch-project#133)

* update form validaitons

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update snapshots, add skipping validator

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update sqlpage snapshot

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* add tests for acceleration create

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update acceleration builder tests

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update PR comments

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* adding fix for windows snapshots

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update snapshot files

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* implementing async query support with polling (opensearch-project#131)

* successfully getting async post requests

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* get query with hardcoded job id working

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* working spark query after constant time wait

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* added polling with some hardcoded values

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* ability to switch between sources implemented

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* implemented basic spinner

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* small pr asks and cancellation implemented

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* fixing small clear state issues

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* reduce route name redundancy

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* remove multiple query implementation for async

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* needed to modify the endpoint

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* default data source being Opensearch and updated snapshots

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

---------

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* added the skipping index queries, covering index queries,updates the … (opensearch-project#134)

* added the skipping index queries, covering index queries,updates the data picker

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* added the skipping index queries, covering index queries,updates the data picker

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* reverted updates to yarn

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* updated tests, snapshots

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

---------

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* Acceleration related changes and minor fixes (opensearch-project#135)

* add acc index flyout

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove [if not exists] from acc creation

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* merge tableview from main

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* adding acc index flyout

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* add hash router

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* hide materialized view index type

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update snapshots

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* loading combo boxes for acc flyout

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* adding acceleration backend integ

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update jest tests for acc flyout

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* add redirection support for home page

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* fix primary shards count and replica validation

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove the caution callout for acc flyout

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* support acc flyout redirection from data sources

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* disable buttons while running async query (opensearch-project#136)

* disable most buttons

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* code editor read only

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* disabled accelerate button

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

---------

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* Design changes for the sidebar and update to create button (opensearch-project#138)

* added changes for loading, create button

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* removed comments, updated snapshots

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* addressed pr comments

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* addressed pr comments

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* addressed pr comments

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* updated snapshots, constant for skipping index

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

---------

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* Load table fields for acceleration index flyout (opensearch-project#137)

* load table fields after table is selected

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* simplify the map function

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Adding minor updates and bug fixes (opensearch-project#140)

* adding minor updates to acceleration ui

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* edits to acceleration index flyout

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* adding minor edits to table view

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update snapshots

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove console log

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* minor fixes to namings and tableview

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update tableview clear db

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: dblock <dblock@amazon.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Chen Dai <daichen@amazon.com>
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
Signed-off-by: Paul Sebastian <paulstn@amazon.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@dblock.org>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Rupal Mahajan <maharup@amazon.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Miki <amoo_miki@yahoo.com>
Co-authored-by: Derek Ho <dxho@amazon.com>
Co-authored-by: Chen Dai <daichen@amazon.com>
Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Simeon Widdis <sawiddis@gmail.com>
Co-authored-by: sumukhswamy <sumukhhs@amazon.com>
Co-authored-by: Paul Sebastian <paul_sebastian@live.com>
Co-authored-by: Paul Sebastian <paulstn@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants