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

Revert Disable detekt and force choose snakeyml 1.32 #528

Merged
merged 4 commits into from
Sep 30, 2022

Conversation

deshsidd
Copy link
Contributor

@deshsidd deshsidd commented Sep 30, 2022

Signed-off-by: Siddhant Deshmukh [email protected]

Issue #493

Description of changes:

CheckList:

  • 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: Siddhant Deshmukh <[email protected]>
Signed-off-by: Siddhant Deshmukh <[email protected]>
@deshsidd deshsidd requested a review from a team September 30, 2022 01:16
Signed-off-by: Siddhant Deshmukh <[email protected]>
@deshsidd deshsidd changed the title Revert Disable detekt and remove force choosing snakeyml 1.31 Revert Disable detekt and force choose snakeyml 1.32 Sep 30, 2022
@codecov-commenter
Copy link

codecov-commenter commented Sep 30, 2022

Codecov Report

Merging #528 (6964f3e) into main (fadc553) will decrease coverage by 0.07%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main     #528      +/-   ##
============================================
- Coverage     75.85%   75.78%   -0.08%     
+ Complexity     2482     2480       -2     
============================================
  Files           315      315              
  Lines         14511    14511              
  Branches       2245     2245              
============================================
- Hits          11008    10997      -11     
- Misses         2247     2267      +20     
+ Partials       1256     1247       -9     
Impacted Files Coverage Δ
...nt/indexstatemanagement/model/destination/Chime.kt 55.55% <0.00%> (-22.23%) ⬇️
...ensearch/indexmanagement/util/JobSchedulerUtils.kt 73.91% <0.00%> (-8.70%) ⬇️
.../action/explain/TransportExplainTransformAction.kt 70.78% <0.00%> (-2.25%) ⬇️
...ent/indexstatemanagement/util/ManagedIndexUtils.kt 76.10% <0.00%> (-1.77%) ⬇️
.../rollup/action/start/TransportStartRollupAction.kt 71.76% <0.00%> (-1.18%) ⬇️
...nt/rollup/action/stop/TransportStopRollupAction.kt 76.47% <0.00%> (-1.18%) ⬇️
...nt/indexstatemanagement/ManagedIndexCoordinator.kt 68.71% <0.00%> (-0.59%) ⬇️
...arch/indexmanagement/rollup/RollupSearchService.kt 61.11% <0.00%> (ø)
...earch/indexmanagement/transform/model/Transform.kt 85.89% <0.00%> (+0.42%) ⬆️
.../opensearch/indexmanagement/rollup/model/Rollup.kt 86.04% <0.00%> (+0.46%) ⬆️
... and 1 more

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

Signed-off-by: Siddhant Deshmukh <[email protected]>
@deshsidd
Copy link
Contributor Author

deshsidd commented Sep 30, 2022

Don't have permissions to add labels yet, can someone add the required backport label? @Angie-Zhang

@bowenlan-amzn bowenlan-amzn merged commit 943c32b into opensearch-project:main Sep 30, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 30, 2022
* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>
(cherry picked from commit 943c32b)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 30, 2022
* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>
(cherry picked from commit 943c32b)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x 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-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-528-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 943c32bef2fcfc40ee812c1548b1a3ae8577113a
# Push it to GitHub
git push --set-upstream origin backport/backport-528-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 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-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-528-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 943c32bef2fcfc40ee812c1548b1a3ae8577113a
# Push it to GitHub
git push --set-upstream origin backport/backport-528-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x 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-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-528-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 943c32bef2fcfc40ee812c1548b1a3ae8577113a
# Push it to GitHub
git push --set-upstream origin backport/backport-528-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 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-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-528-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 943c32bef2fcfc40ee812c1548b1a3ae8577113a
# Push it to GitHub
git push --set-upstream origin backport/backport-528-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

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

deshsidd added a commit that referenced this pull request Oct 3, 2022
* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>
(cherry picked from commit 943c32b)
deshsidd added a commit that referenced this pull request Oct 3, 2022
* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>
(cherry picked from commit 943c32b)

Signed-off-by: Siddhant Deshmukh <[email protected]>
deshsidd added a commit that referenced this pull request Oct 3, 2022
* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>
(cherry picked from commit 943c32b)
Angie-Zhang pushed a commit to Angie-Zhang/index-management that referenced this pull request Oct 3, 2022
…ect#528)

* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>
(cherry picked from commit 943c32b)
Angie-Zhang pushed a commit that referenced this pull request Oct 4, 2022
* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>
(cherry picked from commit 943c32b)

Co-authored-by: Siddhant Deshmukh <[email protected]>
Angie-Zhang pushed a commit that referenced this pull request Oct 4, 2022
* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>
(cherry picked from commit 943c32b)

Co-authored-by: Siddhant Deshmukh <[email protected]>
@bowenlan-amzn bowenlan-amzn mentioned this pull request Oct 13, 2022
Angie-Zhang added a commit that referenced this pull request Oct 14, 2022
* initial framework

Signed-off-by: Joanne Wang <[email protected]>

* Removed recursion from Explain Action to avoid stackoverflow in some situations (#419)

Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Joanne Wang <[email protected]>

* enabled by default integrated

Signed-off-by: Joanne Wang <[email protected]>

* cleaned up comments and logs, created unit test and updated previous integration tests

Signed-off-by: Joanne Wang <[email protected]>

* added delete validation logic

Signed-off-by: Joanne Wang <[email protected]>

* fixed rollover validation unit tests

Signed-off-by: Joanne Wang <[email protected]>

* added validation info field to ManagedIndexMetaData

Signed-off-by: Joanne Wang <[email protected]>

* removed step context as input

Signed-off-by: Joanne Wang <[email protected]>

* added validationmetadata class

Signed-off-by: Joanne Wang <[email protected]>

* restored old integration tests and changed validation service output

Signed-off-by: Joanne Wang <[email protected]>

* before integrated validation meta data into managed index meta data

Signed-off-by: Joanne Wang <[email protected]>

* integrated validation meta data

Signed-off-by: Joanne Wang <[email protected]>

* working version

Signed-off-by: Joanne Wang <[email protected]>

* added validation mapping

Signed-off-by: Joanne Wang <[email protected]>

* fixed integ tests

Signed-off-by: Joanne Wang <[email protected]>

* renamed some values

Signed-off-by: Joanne Wang <[email protected]>

* before removing from managed index meta data

Signed-off-by: Joanne Wang <[email protected]>

* created validation result object in explain

Signed-off-by: Joanne Wang <[email protected]>

* testing

Signed-off-by: Joanne Wang <[email protected]>

* run fails

Signed-off-by: Joanne Wang <[email protected]>

* integration test for delete + added framework for force merge

Signed-off-by: Joanne Wang <[email protected]>

* removed step validation metadata and still testing explain results

Signed-off-by: Joanne Wang <[email protected]>

* before removing from managed index runner

Signed-off-by: Joanne Wang <[email protected]>

* removed from managed index runner

Signed-off-by: Joanne Wang <[email protected]>

* clean up and tests

Signed-off-by: Joanne Wang <[email protected]>

* all validation tests pass

Signed-off-by: Joanne Wang <[email protected]>

* removed validation result from all managed index meta data

Signed-off-by: Joanne Wang <[email protected]>

* restored old IT tests

Signed-off-by: Joanne Wang <[email protected]>

* fixed it tests, set explain validation to false

Signed-off-by: Joanne Wang <[email protected]>

* clean up

Signed-off-by: Joanne Wang <[email protected]>

* Change test page size to avoid index/search TimeInMillis < 1 issue. (#460)

* Change test page size to avoid indexTimeInMillis < 1 issue.

Signed-off-by: Angie Zhang <[email protected]>

* Change test page size to avoid indexTimeInMillis < 1 issue.

Signed-off-by: Angie Zhang <[email protected]>

Signed-off-by: Angie Zhang <[email protected]>

* Transform maxclauses fix (#477)

* transform maxClauses fix

Signed-off-by: Petar Dzepina <[email protected]>

* added bucket log to track processed buckets

Signed-off-by: Petar Dzepina <[email protected]>

* various renames/changes

Signed-off-by: Petar Dzepina <[email protected]>

* fixed detekt issues

Signed-off-by: Petar Dzepina <[email protected]>

* added comments to test

Signed-off-by: Petar Dzepina <[email protected]>

* removed debug logging

Signed-off-by: Petar Dzepina <[email protected]>

* empty commit to trigger checks

Signed-off-by: Petar Dzepina <[email protected]>

* reduced pageSize to 1 in few ITs to avoid flaky tests; fixed bug where pagesProcessed was calculated incorrectly

Signed-off-by: Petar Dzepina <[email protected]>

* reverted pagesProcessed change; fixed few ITs

Signed-off-by: Petar Dzepina <[email protected]>

Signed-off-by: Petar Dzepina <[email protected]>

* 483: Updated detekt plugin and snakeyaml dependency. Updated a code t… (#485)

* 483: Updated detekt plugin and snakeyaml dependency. Updated a code to reduce the number of issues after static analysis

Signed-off-by: Stevan Buzejic <[email protected]>

* 483: Updated snakeyaml version to use the latest

Signed-off-by: Stevan Buzejic <[email protected]>

Signed-off-by: Stevan Buzejic <[email protected]>

* Remove HOST_DENY_LIST usage as Notification plugin will own it (#471)

(#107)

Signed-off-by: Xuesong Luo <[email protected]>

Signed-off-by: Xuesong Luo <[email protected]>

* Disable detekt because of the CVE (#497)

Signed-off-by: bowenlan-amzn <[email protected]>

Signed-off-by: bowenlan-amzn <[email protected]>

* Deprecate Master nonmenclature (#501)

Signed-off-by: bowenlan-amzn <[email protected]>

Signed-off-by: bowenlan-amzn <[email protected]>

* [AUTO] Increment version to 2.3.0-SNAPSHOT (#484) (#503)

* fix#921-README-forum-link-index_mgmnt (#499)

Signed-off-by: cwillum <[email protected]>

Signed-off-by: cwillum <[email protected]>

* 64: Added rounding when using aggreagate script for avg metric. Added… (#490)

* 64: Added rounding when using aggreagate script for avg metric. Added unit tests for checking average aggregations against the target rollup index

Signed-off-by: Stevan Buzejic <[email protected]>

* 64: Rollup job renamed

Signed-off-by: Stevan Buzejic <[email protected]>

* 64: Removed unrelevant metrics for the avg calculation test

Signed-off-by: Stevan Buzejic <[email protected]>

Signed-off-by: Stevan Buzejic <[email protected]>

* Revert Disable detekt and force choose snakeyml 1.32 (#528)

* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Added 2.3 release note (#507) (#515) (#517)

* Update 2.3 release note

Signed-off-by: Angie Zhang <[email protected]>

* Update 2.3 release note

Signed-off-by: Angie Zhang <[email protected]>

* Update 2.3 release note

Signed-off-by: Angie Zhang <[email protected]>

* Update 2.3 release note

Signed-off-by: Angie Zhang <[email protected]>

* Update 2.3 release note

Signed-off-by: Angie Zhang <[email protected]>

Signed-off-by: Angie Zhang <[email protected]>
(cherry picked from commit d9793ac)
Signed-off-by: Angie Zhang <[email protected]>

Signed-off-by: Angie Zhang <[email protected]>
(cherry picked from commit 7217b5b)

Co-authored-by: Angie Zhang <[email protected]>

* Add 2.2 release note (#450) (#452) (#516)

* Add 2.2 release note

Signed-off-by: Angie Zhang <[email protected]>

* Add 2.2 release note

Signed-off-by: Angie Zhang <[email protected]>

Co-authored-by: Angie Zhang <[email protected]>
(cherry picked from commit 8eb5da6)
Signed-off-by: Angie Zhang <[email protected]>

Signed-off-by: Angie Zhang <[email protected]>
Co-authored-by: Ashish Agrawal <[email protected]>

* Adds plugin version sweep background job (#434)

* [207]: Added 5 min scheduled job for sweeping ISM plugin version in the case of version discrepancy

Signed-off-by: Stevan Buzejic <[email protected]>

* [207]: Created pluginVersionSweepCoordinator component responsible for scheduling the skip execution task. Annotated tests in order to prevent thread leak error during integrational tests

Signed-off-by: Stevan Buzejic <[email protected]>

* [207]: Increased retry period for background job that sets the skip flag up to 5 mins

Signed-off-by: Stevan Buzejic <[email protected]>

* Empty-Commit

Signed-off-by: Stevan Buzejic <[email protected]>

Signed-off-by: Stevan Buzejic <[email protected]>
Co-authored-by: Stevan Buzejic <[email protected]>

* flaky transform test fix attempt (#542)

* flaky transform test fix attempt

Signed-off-by: Petar Dzepina <[email protected]>

* accidental paste fix

Signed-off-by: Petar Dzepina <[email protected]>

Signed-off-by: Petar Dzepina <[email protected]>
Co-authored-by: Petar Dzepina <[email protected]>

Signed-off-by: Joanne Wang <[email protected]>
Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Angie Zhang <[email protected]>
Signed-off-by: Stevan Buzejic <[email protected]>
Signed-off-by: Xuesong Luo <[email protected]>
Signed-off-by: bowenlan-amzn <[email protected]>
Signed-off-by: cwillum <[email protected]>
Signed-off-by: Siddhant Deshmukh <[email protected]>
Signed-off-by: Petar Dzepina <[email protected]>
Co-authored-by: Petar <[email protected]>
Co-authored-by: Angie Zhang <[email protected]>
Co-authored-by: Stevan Buzejic <[email protected]>
Co-authored-by: xluo-aws <[email protected]>
Co-authored-by: bowenlan-amzn <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Chris Moore <[email protected]>
Co-authored-by: Siddhant Deshmukh <[email protected]>
Co-authored-by: Angie Zhang <[email protected]>
Co-authored-by: Ashish Agrawal <[email protected]>
Co-authored-by: Clay Downs <[email protected]>
Co-authored-by: Stevan Buzejic <[email protected]>
Co-authored-by: Petar Dzepina <[email protected]>
wuychn pushed a commit to ochprince/index-management that referenced this pull request Mar 16, 2023
…ect#528) (opensearch-project#529)

* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>
(cherry picked from commit 943c32b)

Co-authored-by: Siddhant Deshmukh <[email protected]>
ronnaksaxena pushed a commit to ronnaksaxena/index-management that referenced this pull request Jul 19, 2023
…ect#528) (opensearch-project#529)

* Revert Disable detekt: 50ac1e9

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Remove force choosing snakeyml 1.31

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Force snakeyaml 1.32

Signed-off-by: Siddhant Deshmukh <[email protected]>

* Empty commit

Signed-off-by: Siddhant Deshmukh <[email protected]>

Signed-off-by: Siddhant Deshmukh <[email protected]>
(cherry picked from commit 943c32b)

Co-authored-by: Siddhant Deshmukh <[email protected]>
Signed-off-by: Ronnak Saxena <[email protected]>
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