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

Version bump 2.4.1 #430

Merged
merged 61 commits into from
Dec 3, 2022

Conversation

phestecAMZN
Copy link
Contributor

Description

bumps plugin version to 2.4.1 to avoid issues with CI and OSDB. other changes were made to enable a working system.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • 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.

phestecAMZN and others added 30 commits August 24, 2022 19:41
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>

Currently only visually functional. TODO - make it apply the options

Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>

Split radio buttons into SnapshotRestoreOption and SnapshotRenameOptions

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Move 'restore' button between 'delete' and 'take snapshot'

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Set default rename option to 'add prefix'

Signed-off-by: Chris Hesterman <phestech@amazon.com>
…ions

Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>

Implement first 4 Advanced restore options functionality

Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>

Passing tests for create repo and create snapshot

Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
…ards-plugin

Signed-off-by: Chris Hesterman <phestech@amazon.com>
…ards-plugin

Signed-off-by: Chris Hesterman <phestech@amazon.com>
…ards-plugin

Signed-off-by: Chris Hesterman <phestech@amazon.com>
…ards-plugin

Signed-off-by: Chris Hesterman <phestech@amazon.com>
…ards-plugin

Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
…ards-plugin

Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
…ards-plugin

Signed-off-by: Chris Hesterman <phestech@amazon.com>
…ards-plugin

Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>

This reverts commit f77922b.

Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
Signed-off-by: Chris Hesterman <phestech@amazon.com>
@phestecAMZN phestecAMZN requested a review from a team December 2, 2022 23:11
Signed-off-by: Chris Hesterman <phestech@amazon.com>
@codecov-commenter
Copy link

Codecov Report

Merging #430 (57b0da4) into main (02ccb96) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #430   +/-   ##
=======================================
  Coverage   49.79%   49.79%           
=======================================
  Files         193      193           
  Lines        6203     6203           
  Branches      975      975           
=======================================
  Hits         3089     3089           
  Misses       2891     2891           
  Partials      223      223           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@phestecAMZN phestecAMZN merged commit 2290ea5 into opensearch-project:main Dec 3, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.4 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.4 2.4
# Navigate to the new working tree
cd .worktrees/backport-2.4
# Create a new branch
git switch --create backport/backport-430-to-2.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2290ea5beba44a17147d5edbede0623ed47838ea
# Push it to GitHub
git push --set-upstream origin backport/backport-430-to-2.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.4

Then, create a pull request where the base branch is 2.4 and the compare/head branch is backport/backport-430-to-2.4.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Dec 3, 2022
* Change alignment of Snapshot Management panels in pages/Main/Main.tsx

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Unify vertical button alignment across panels, ContentPanel.tsx

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Update jest snapshots, add ROUTE_STYLE variable

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add placeholder restore button to Snapshots panel

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Comment out line 20 rollups_spec.js in cypress/integration/

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove unused code and comment cypress/integration/rollups_spec.js

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Starting adaptation/use of existing code for Restore functionality

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Adapt Snapshots.tsx to include RestoreSnapshotFlyout

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add restoreSnapshot method to SMservice,RestoreSnapshotResponse int

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Implement RestoreSnapshotFlyout open/close

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Make Snapshot name appear on RestoreSnapshotFlyout

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add/adapt restoreSnapshot to server/SnapshotManagementService

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add route for restoreSnapshot in server/routes.ts

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Rudimentary restore from snapshot functionality reached, buggy

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Fix index list-snapshot restore, restrict restore to single selection

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove console.logs, commented out code

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Create Advanced options accordion for Snapshot restore.

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Currently only visually functional. TODO - make it apply the options

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add initial restore/rename options to ui. Only visual functionality

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Resolve radio button events not firing

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Split radio buttons into SnapshotRestoreOption and SnapshotRenameOptions

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Move 'restore' button between 'delete' and 'take snapshot'

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Set default rename option to 'add prefix'

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add AddPrefixInput, remove unused component RestoreSnapshotInitialOptions

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Fix issues with restore specific indices

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Implement first 4 Advanced restore options functionality

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Begin cypress testing for snapshots

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Passing tests for create repo and create snapshot

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Begin cypress testing Snapshots. Create repo and Create snapshot done

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Implement add_prefix functionality for snapshot restore

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Implement rename indices option for restore snapshot

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove console.logs, unusted variables in SnapshotFlyout, SMservice

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add full stop to help text/errors, add RESTORE_OPTIONS enum

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add back line 20 in rollups_spec, required by changes in 2.3 release.

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove unused getRepos func, add repo prop, trim state in RestoreFlyout

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add increment to 2.3.0

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Version bump 2.3.0 to 2.3 1

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add version bump 2.3.1 for OS in cypress-workflow.yml

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove 2.3.1 bump

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Change 2.4 to 2.4.0 opensearch_dashboards.json

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Update package.json, opensearch-dashboards.json

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Update package.json, opensearch_dashboards.json

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Update OSD to 2.4.1, update loader-utils, ts-loader, webpack

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Backport to 1.x

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Revert "Backport to 1.x", backport failed

Signed-off-by: Chris Hesterman <phestech@amazon.com>

This reverts commit f77922b.

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Implement check for singleIndex/datastream to address alias requirement

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Run version sync, adj. OSDB versions in workflows

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Set OSDB version to 2.4 in workflows

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Version bump to 2.4.1 to keep it working

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove unintended dependency bumps

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Fresh bootstrap, update yarn lock

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Signed-off-by: Chris Hesterman <phestech@amazon.com>
(cherry picked from commit 2290ea5)
phestecAMZN added a commit that referenced this pull request Dec 3, 2022
* Change alignment of Snapshot Management panels in pages/Main/Main.tsx

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Unify vertical button alignment across panels, ContentPanel.tsx

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Update jest snapshots, add ROUTE_STYLE variable

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add placeholder restore button to Snapshots panel

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Comment out line 20 rollups_spec.js in cypress/integration/

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove unused code and comment cypress/integration/rollups_spec.js

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Starting adaptation/use of existing code for Restore functionality

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Adapt Snapshots.tsx to include RestoreSnapshotFlyout

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add restoreSnapshot method to SMservice,RestoreSnapshotResponse int

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Implement RestoreSnapshotFlyout open/close

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Make Snapshot name appear on RestoreSnapshotFlyout

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add/adapt restoreSnapshot to server/SnapshotManagementService

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add route for restoreSnapshot in server/routes.ts

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Rudimentary restore from snapshot functionality reached, buggy

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Fix index list-snapshot restore, restrict restore to single selection

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove console.logs, commented out code

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Create Advanced options accordion for Snapshot restore.

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Currently only visually functional. TODO - make it apply the options

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add initial restore/rename options to ui. Only visual functionality

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Resolve radio button events not firing

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Split radio buttons into SnapshotRestoreOption and SnapshotRenameOptions

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Move 'restore' button between 'delete' and 'take snapshot'

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Set default rename option to 'add prefix'

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add AddPrefixInput, remove unused component RestoreSnapshotInitialOptions

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Fix issues with restore specific indices

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Implement first 4 Advanced restore options functionality

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Begin cypress testing for snapshots

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Passing tests for create repo and create snapshot

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Begin cypress testing Snapshots. Create repo and Create snapshot done

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Implement add_prefix functionality for snapshot restore

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Implement rename indices option for restore snapshot

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove console.logs, unusted variables in SnapshotFlyout, SMservice

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add full stop to help text/errors, add RESTORE_OPTIONS enum

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add back line 20 in rollups_spec, required by changes in 2.3 release.

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove unused getRepos func, add repo prop, trim state in RestoreFlyout

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add increment to 2.3.0

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Version bump 2.3.0 to 2.3 1

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Add version bump 2.3.1 for OS in cypress-workflow.yml

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove 2.3.1 bump

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Change 2.4 to 2.4.0 opensearch_dashboards.json

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Update package.json, opensearch-dashboards.json

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Update package.json, opensearch_dashboards.json

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Update OSD to 2.4.1, update loader-utils, ts-loader, webpack

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Backport to 1.x

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Revert "Backport to 1.x", backport failed

Signed-off-by: Chris Hesterman <phestech@amazon.com>

This reverts commit f77922b.

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Implement check for singleIndex/datastream to address alias requirement

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Run version sync, adj. OSDB versions in workflows

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Set OSDB version to 2.4 in workflows

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Version bump to 2.4.1 to keep it working

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Remove unintended dependency bumps

Signed-off-by: Chris Hesterman <phestech@amazon.com>

* Fresh bootstrap, update yarn lock

Signed-off-by: Chris Hesterman <phestech@amazon.com>

Signed-off-by: Chris Hesterman <phestech@amazon.com>
(cherry picked from commit 2290ea5)

Co-authored-by: Chris Hesterman <phestech@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.

4 participants