Skip to content

Commit

Permalink
bump loader-utils to 1.4.1 to address vulnerability alert, specify OS…
Browse files Browse the repository at this point in the history
…D 2.4.0 (#381) (#387)

* Change alignment of Snapshot Management panels in pages/Main/Main.tsx

Signed-off-by: Chris Hesterman <[email protected]>

* Unify vertical button alignment across panels, ContentPanel.tsx

Signed-off-by: Chris Hesterman <[email protected]>

* Update jest snapshots, add ROUTE_STYLE variable

Signed-off-by: Chris Hesterman <[email protected]>

* Add placeholder restore button to Snapshots panel

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

* Starting adaptation/use of existing code for Restore functionality

Signed-off-by: Chris Hesterman <[email protected]>

* Adapt Snapshots.tsx to include RestoreSnapshotFlyout

Signed-off-by: Chris Hesterman <[email protected]>

* Add restoreSnapshot method to SMservice,RestoreSnapshotResponse int

Signed-off-by: Chris Hesterman <[email protected]>

* Implement RestoreSnapshotFlyout open/close

Signed-off-by: Chris Hesterman <[email protected]>

* Make Snapshot name appear on RestoreSnapshotFlyout

Signed-off-by: Chris Hesterman <[email protected]>

* Add/adapt restoreSnapshot to server/SnapshotManagementService

Signed-off-by: Chris Hesterman <[email protected]>

* Add route for restoreSnapshot in server/routes.ts

Signed-off-by: Chris Hesterman <[email protected]>

* Rudimentary restore from snapshot functionality reached, buggy

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

* Remove console.logs, commented out code

Signed-off-by: Chris Hesterman <[email protected]>

* Create Advanced options accordion for Snapshot restore.

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

* Resolve radio button events not firing

Signed-off-by: Chris Hesterman <[email protected]>

Split radio buttons into SnapshotRestoreOption and SnapshotRenameOptions

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

Set default rename option to 'add prefix'

Signed-off-by: Chris Hesterman <[email protected]>

* Add AddPrefixInput, remove unused component RestoreSnapshotInitialOptions

Signed-off-by: Chris Hesterman <[email protected]>

* Fix issues with restore specific indices

Signed-off-by: Chris Hesterman <[email protected]>

Implement first 4 Advanced restore options functionality

Signed-off-by: Chris Hesterman <[email protected]>

* Begin cypress testing for snapshots

Signed-off-by: Chris Hesterman <[email protected]>

Passing tests for create repo and create snapshot

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

* Implement add_prefix functionality for snapshot restore

Signed-off-by: Chris Hesterman <[email protected]>

* Implement rename indices option for restore snapshot

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

* Add increment to 2.3.0

Signed-off-by: Chris Hesterman <[email protected]>

* Version bump 2.3.0 to 2.3 1

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

* Remove 2.3.1 bump

Signed-off-by: Chris Hesterman <[email protected]>

* Change 2.4 to 2.4.0 opensearch_dashboards.json

Signed-off-by: Chris Hesterman <[email protected]>

* Update package.json, opensearch-dashboards.json

Signed-off-by: Chris Hesterman <[email protected]>

* Update package.json, opensearch_dashboards.json

Signed-off-by: Chris Hesterman <[email protected]>

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

Signed-off-by: Chris Hesterman <[email protected]>

* Update loader-utils to 1.4.1

Signed-off-by: Chris Hesterman <[email protected]>

* Roll back to 2.4.0 OSD

Signed-off-by: Chris Hesterman <[email protected]>

Signed-off-by: Chris Hesterman <[email protected]>
(cherry picked from commit d7e6849)

Co-authored-by: Chris Hesterman <[email protected]>
  • Loading branch information
opensearch-trigger-bot[bot] and phestecAMZN authored Nov 29, 2022
1 parent 20bc787 commit f6de138
Show file tree
Hide file tree
Showing 5 changed files with 416 additions and 1,296 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches:
- "*"
env:
OPENSEARCH_DASHBOARDS_VERSION: '2.4'
OPENSEARCH_DASHBOARDS_VERSION: '2.4.0'
OPENSEARCH_VERSION: '2.4.0-SNAPSHOT'
jobs:
tests:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches:
- "*"
env:
OPENSEARCH_DASHBOARDS_VERSION: '2.4'
OPENSEARCH_DASHBOARDS_VERSION: '2.4.0'
jobs:
tests:
name: Run unit tests
Expand Down
10 changes: 3 additions & 7 deletions opensearch_dashboards.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@
"id": "indexManagementDashboards",
"version": "2.4.0.0",
"opensearchDashboardsVersion": "2.4.0",
"configPath": [
"opensearch_index_management"
],
"requiredPlugins": [
"navigation"
],
"configPath": ["opensearch_index_management"],
"requiredPlugins": ["navigation"],
"server": true,
"ui": true
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"glob-parent": "^5.1.2",
"ssri": "^6.0.2",
"lodash": "^4.17.21",
"loader-utils": "^1.4.1",
"hosted-git-info": "^2.8.9",
"json-schema": "^0.4.0",
"ansi-regex": "^5.0.1",
Expand Down
Loading

0 comments on commit f6de138

Please sign in to comment.