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

Handle NPE in isRollupIndex #855

Merged
merged 4 commits into from
Jul 22, 2023
Merged

Conversation

blampe
Copy link
Contributor

@blampe blampe commented Jul 17, 2023

Issue #, if available:

opensearch-project/OpenSearch#8418

Description of changes:

metadata.index() can return null (link), so handle that case by returning false.

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.

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
bowenlan-amzn
bowenlan-amzn previously approved these changes Jul 19, 2023
Copy link
Member

@bowenlan-amzn bowenlan-amzn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your time to fix this!

@codecov
Copy link

codecov bot commented Jul 19, 2023

Codecov Report

Merging #855 (5122498) into main (281457e) will increase coverage by 0.07%.
The diff coverage is 80.00%.

@@             Coverage Diff              @@
##               main     #855      +/-   ##
============================================
+ Coverage     75.72%   75.80%   +0.07%     
+ Complexity     2852     2851       -1     
============================================
  Files           364      364              
  Lines         16181    16184       +3     
  Branches       2328     2329       +1     
============================================
+ Hits          12253    12268      +15     
+ Misses         2585     2576       -9     
+ Partials       1343     1340       -3     
Impacted Files Coverage Δ
...nsearch/indexmanagement/rollup/util/RollupUtils.kt 82.00% <80.00%> (+0.21%) ⬆️

... and 8 files with indirect coverage changes

@eirsep
Copy link
Member

eirsep commented Jul 19, 2023

thanks for fixing this.
can we add a integ test to verify this scenario?

eirsep
eirsep previously approved these changes Jul 19, 2023
@blampe blampe dismissed stale reviews from eirsep and bowenlan-amzn via 0a8a999 July 19, 2023 21:25
@blampe
Copy link
Contributor Author

blampe commented Jul 19, 2023

thanks for fixing this.
can we add a integ test to verify this scenario?

@eirsep sure, I've added a unit test. I was unable to confirm it works locally because I wasn't able to get past the project's build errors. See discussion on opensearch-project/OpenSearch#8418 re: integration testing.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
@bowenlan-amzn bowenlan-amzn merged commit 05bc0d5 into opensearch-project:main Jul 22, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 22, 2023
* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

* unit test

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

---------

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
(cherry picked from commit 05bc0d5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AWSHurneyt pushed a commit that referenced this pull request Jul 28, 2023
* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.



* unit test



---------



(cherry picked from commit 05bc0d5)

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
tanqiuliu pushed a commit to tanqiuliu/index-management that referenced this pull request Sep 25, 2023
* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

* unit test

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

---------

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
bowenlan-amzn added a commit that referenced this pull request Oct 11, 2023
* Initial impl

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix style

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* end to end functional

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* ISM transform unit tests & integ tests

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix after core #8157 (#857)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Upgrade the backport workflow (#862)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.9 release notes. (#851)

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Handle NPE in isRollupIndex (#855)

* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

* unit test

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

---------

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix core XcontentType refactor (#873)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix for max & min aggregations when no metric property exist (#870)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (#884)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* update backport branch name (#885)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (#887)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix breaking change by core refactor (#888)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix core breaking (#906)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Support copy alias in rollover (#907)

* Support copy alias in rollover

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* 2.10

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Set preference to _primary when searching control-center index (#911)

* Set preference to _primary when searching control-center index

Signed-off-by: gaobinlong <gbinlong@amazon.com>

* Use _primary_first instead

Signed-off-by: gaobinlong <gbinlong@amazon.com>

---------

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Add primary first preference to all search requests (#912)

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix intelliJ IDEA gradle sync error (#916)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* make control center index as system index (#919)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Updates demo certs used in integ tests (#921)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.10 release notes (#925)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Bump bwc version (#930)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix integ tests; upgrade mappings versions

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix DCO

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed pr comments; Add integ test case for re-execute the same transform action

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed detekt error

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added ISMTransform writeable test

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed comments; Moved updateTransformStartTime to IndexManagementRestTestCase

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

---------

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
bowenlan-amzn added a commit to bowenlan-amzn/index-management that referenced this pull request Oct 11, 2023
* Initial impl

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix style

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* end to end functional

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* ISM transform unit tests & integ tests

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix after core #8157 (opensearch-project#857)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Upgrade the backport workflow (opensearch-project#862)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.9 release notes. (opensearch-project#851)

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Handle NPE in isRollupIndex (opensearch-project#855)

* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

* unit test

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

---------

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix core XcontentType refactor (opensearch-project#873)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix for max & min aggregations when no metric property exist (opensearch-project#870)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (opensearch-project#884)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* update backport branch name (opensearch-project#885)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (opensearch-project#887)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix breaking change by core refactor (opensearch-project#888)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix core breaking (opensearch-project#906)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Support copy alias in rollover (opensearch-project#907)

* Support copy alias in rollover

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* 2.10

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Set preference to _primary when searching control-center index (opensearch-project#911)

* Set preference to _primary when searching control-center index

Signed-off-by: gaobinlong <gbinlong@amazon.com>

* Use _primary_first instead

Signed-off-by: gaobinlong <gbinlong@amazon.com>

---------

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Add primary first preference to all search requests (opensearch-project#912)

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix intelliJ IDEA gradle sync error (opensearch-project#916)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* make control center index as system index (opensearch-project#919)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Updates demo certs used in integ tests (opensearch-project#921)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.10 release notes (opensearch-project#925)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Bump bwc version (opensearch-project#930)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix integ tests; upgrade mappings versions

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix DCO

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed pr comments; Add integ test case for re-execute the same transform action

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed detekt error

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added ISMTransform writeable test

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed comments; Moved updateTransformStartTime to IndexManagementRestTestCase

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

---------

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
bowenlan-amzn added a commit that referenced this pull request Oct 12, 2023
* [Feature] Support Transform as an ISM action (#760)

* Initial impl

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix style

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* end to end functional

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* ISM transform unit tests & integ tests

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix after core #8157 (#857)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Upgrade the backport workflow (#862)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.9 release notes. (#851)

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Handle NPE in isRollupIndex (#855)

* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

* unit test

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

---------

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix core XcontentType refactor (#873)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix for max & min aggregations when no metric property exist (#870)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (#884)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* update backport branch name (#885)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (#887)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix breaking change by core refactor (#888)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix core breaking (#906)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Support copy alias in rollover (#907)

* Support copy alias in rollover

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* 2.10

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Set preference to _primary when searching control-center index (#911)

* Set preference to _primary when searching control-center index

Signed-off-by: gaobinlong <gbinlong@amazon.com>

* Use _primary_first instead

Signed-off-by: gaobinlong <gbinlong@amazon.com>

---------

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Add primary first preference to all search requests (#912)

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix intelliJ IDEA gradle sync error (#916)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* make control center index as system index (#919)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Updates demo certs used in integ tests (#921)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.10 release notes (#925)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Bump bwc version (#930)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix integ tests; upgrade mappings versions

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix DCO

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed pr comments; Add integ test case for re-execute the same transform action

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed detekt error

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added ISMTransform writeable test

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed comments; Moved updateTransformStartTime to IndexManagementRestTestCase

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

---------

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>

* [Test] increase the wait time after transform job triggered (#999)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: Tanqiu Liu <liutanqiu@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Joshua152 pushed a commit to Joshua152/index-management that referenced this pull request Dec 12, 2023
* Initial impl

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix style

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* end to end functional

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* ISM transform unit tests & integ tests

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix after core #8157 (opensearch-project#857)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Upgrade the backport workflow (opensearch-project#862)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.9 release notes. (opensearch-project#851)

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Handle NPE in isRollupIndex (opensearch-project#855)

* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

* unit test

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

---------

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix core XcontentType refactor (opensearch-project#873)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix for max & min aggregations when no metric property exist (opensearch-project#870)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (opensearch-project#884)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* update backport branch name (opensearch-project#885)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (opensearch-project#887)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix breaking change by core refactor (opensearch-project#888)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix core breaking (opensearch-project#906)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Support copy alias in rollover (opensearch-project#907)

* Support copy alias in rollover

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* 2.10

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Set preference to _primary when searching control-center index (opensearch-project#911)

* Set preference to _primary when searching control-center index

Signed-off-by: gaobinlong <gbinlong@amazon.com>

* Use _primary_first instead

Signed-off-by: gaobinlong <gbinlong@amazon.com>

---------

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Add primary first preference to all search requests (opensearch-project#912)

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix intelliJ IDEA gradle sync error (opensearch-project#916)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* make control center index as system index (opensearch-project#919)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Updates demo certs used in integ tests (opensearch-project#921)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.10 release notes (opensearch-project#925)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Bump bwc version (opensearch-project#930)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix integ tests; upgrade mappings versions

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix DCO

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed pr comments; Add integ test case for re-execute the same transform action

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed detekt error

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added ISMTransform writeable test

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed comments; Moved updateTransformStartTime to IndexManagementRestTestCase

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

---------

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>
bowenlan-amzn added a commit that referenced this pull request Dec 12, 2023
* Added minimum timeout for transforms search of 10 minutes

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Extracted cancel minimum code to function

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Fixed transform code to use cluster setting

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Removed log statements

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Changed timeout logic

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Switched to basing off seconds

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* [Feature] Support Transform as an ISM action (#760)

* Initial impl

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix style

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* end to end functional

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* ISM transform unit tests & integ tests

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix after core #8157 (#857)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Upgrade the backport workflow (#862)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.9 release notes. (#851)

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Handle NPE in isRollupIndex (#855)

* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

* unit test

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

---------

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix core XcontentType refactor (#873)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix for max & min aggregations when no metric property exist (#870)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (#884)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* update backport branch name (#885)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (#887)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix breaking change by core refactor (#888)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix core breaking (#906)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Support copy alias in rollover (#907)

* Support copy alias in rollover

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* 2.10

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Set preference to _primary when searching control-center index (#911)

* Set preference to _primary when searching control-center index

Signed-off-by: gaobinlong <gbinlong@amazon.com>

* Use _primary_first instead

Signed-off-by: gaobinlong <gbinlong@amazon.com>

---------

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Add primary first preference to all search requests (#912)

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix intelliJ IDEA gradle sync error (#916)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* make control center index as system index (#919)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Updates demo certs used in integ tests (#921)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.10 release notes (#925)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Bump bwc version (#930)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix integ tests; upgrade mappings versions

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix DCO

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed pr comments; Add integ test case for re-execute the same transform action

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed detekt error

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added ISMTransform writeable test

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed comments; Moved updateTransformStartTime to IndexManagementRestTestCase

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

---------

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* [Test] increase the wait time after transform job triggered (#999)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Drafted 2.11 release notes. (#1004)

* Drafted 2.11 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Drafted 2.11 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Refactor change policy API and the policy in managed index to be non-null (#967)

* Refactor the policy to be non null in managed index config

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* fix bug

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Add more error notification at fail points (#1000)

* Add more error notification at fail points

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Handle exception gracefully

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* small fix

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* fix the race condition in test reset action start time (#1007)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Bump bwc version after 2.11 release (#1015)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* added type check for pipeline aggregator types in Transform initialization (#1014)

Signed-off-by: n-dohrmann <noah@dohrmann.org>
Co-authored-by: Joanne Wang <109310487+jowg-amazon@users.noreply.github.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Improve security plugin enabling check (#1017)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Onboard jenkins prod docker images to github actions (#1025)

* Onboard jenkins prod docker images to github actions

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Support switch aliases in shrink action. (#987)

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Co-authored-by: ikibo <oleg.kravchuk@logz.io>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Transform pipeline aggr test (#1027)

* tester code: pipeline aggr. transform job

Signed-off-by: n-dohrmann <noah@dohrmann.org>

* made test case for pipeline aggregator in transform job

Signed-off-by: n-dohrmann <noah@dohrmann.org>

* removed unnec. test lines

Signed-off-by: n-dohrmann <noah@dohrmann.org>

* re-added method call on Transform obj

Signed-off-by: n-dohrmann <noah@dohrmann.org>

---------

Signed-off-by: n-dohrmann <noah@dohrmann.org>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added unit test for switchAliases method. (#1035)

* Added unit test for switchAliases method.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* Added unit test for switchAliases method checking the flow when switchAliases is disabled.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

---------

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Interval schedule should take start time from the request, should not set it to the current time of request execution. (#1036)

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added minimum for search.cancel_after_time_interval setting for rollups (#1026)

* Added minimum for search.cancel_after_time_interval setting for rollups

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added constant for cancel_after_time_interval for rollup search

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Handled case of default value for cancel interval

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added comment explanation for default rollup cancel after time interval

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Fixed github workflow checks

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

---------

Signed-off-by: Joshua Au <joshuahyau@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Update 2.11.1 release note (#1042)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Interval schedule should take start time from the request, should not… (#1040)

* Interval schedule should take start time from the request, should not set it to the current time of request execution.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* Changed the "delayed continuous execution test" to be more expressive about what it should test.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* fixed the NPE if schedule.startTime is NULL

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* fixed the NPE if schedule.startTime is NULL

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* fixed styling

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* - removed null checks from RollUp and Transforms
- fixed comments in the "delayed execution" test

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

---------

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Removed unused imports

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

---------

Signed-off-by: Joshua Au <joshuahyau@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: n-dohrmann <noah@dohrmann.org>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Co-authored-by: Tanqiu Liu <liutanqiu@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Co-authored-by: n-dohrmann <87952011+n-dohrmann@users.noreply.github.com>
Co-authored-by: Joanne Wang <109310487+jowg-amazon@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Co-authored-by: ikibo <oleg.kravchuk@logz.io>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Dec 12, 2023
* Added minimum timeout for transforms search of 10 minutes

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Extracted cancel minimum code to function

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Fixed transform code to use cluster setting

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Removed log statements

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Changed timeout logic

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Switched to basing off seconds

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* [Feature] Support Transform as an ISM action (#760)

* Initial impl

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix style

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* end to end functional

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* ISM transform unit tests & integ tests

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix after core #8157 (#857)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Upgrade the backport workflow (#862)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.9 release notes. (#851)

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Handle NPE in isRollupIndex (#855)

* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

* unit test

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

---------

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix core XcontentType refactor (#873)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix for max & min aggregations when no metric property exist (#870)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (#884)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* update backport branch name (#885)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (#887)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix breaking change by core refactor (#888)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix core breaking (#906)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Support copy alias in rollover (#907)

* Support copy alias in rollover

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* 2.10

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Set preference to _primary when searching control-center index (#911)

* Set preference to _primary when searching control-center index

Signed-off-by: gaobinlong <gbinlong@amazon.com>

* Use _primary_first instead

Signed-off-by: gaobinlong <gbinlong@amazon.com>

---------

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Add primary first preference to all search requests (#912)

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix intelliJ IDEA gradle sync error (#916)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* make control center index as system index (#919)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Updates demo certs used in integ tests (#921)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.10 release notes (#925)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Bump bwc version (#930)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix integ tests; upgrade mappings versions

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix DCO

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed pr comments; Add integ test case for re-execute the same transform action

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed detekt error

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added ISMTransform writeable test

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed comments; Moved updateTransformStartTime to IndexManagementRestTestCase

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

---------

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* [Test] increase the wait time after transform job triggered (#999)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Drafted 2.11 release notes. (#1004)

* Drafted 2.11 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Drafted 2.11 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Refactor change policy API and the policy in managed index to be non-null (#967)

* Refactor the policy to be non null in managed index config

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* fix bug

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Add more error notification at fail points (#1000)

* Add more error notification at fail points

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Handle exception gracefully

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* small fix

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* fix the race condition in test reset action start time (#1007)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Bump bwc version after 2.11 release (#1015)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* added type check for pipeline aggregator types in Transform initialization (#1014)

Signed-off-by: n-dohrmann <noah@dohrmann.org>
Co-authored-by: Joanne Wang <109310487+jowg-amazon@users.noreply.github.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Improve security plugin enabling check (#1017)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Onboard jenkins prod docker images to github actions (#1025)

* Onboard jenkins prod docker images to github actions

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Support switch aliases in shrink action. (#987)

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Co-authored-by: ikibo <oleg.kravchuk@logz.io>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Transform pipeline aggr test (#1027)

* tester code: pipeline aggr. transform job

Signed-off-by: n-dohrmann <noah@dohrmann.org>

* made test case for pipeline aggregator in transform job

Signed-off-by: n-dohrmann <noah@dohrmann.org>

* removed unnec. test lines

Signed-off-by: n-dohrmann <noah@dohrmann.org>

* re-added method call on Transform obj

Signed-off-by: n-dohrmann <noah@dohrmann.org>

---------

Signed-off-by: n-dohrmann <noah@dohrmann.org>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added unit test for switchAliases method. (#1035)

* Added unit test for switchAliases method.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* Added unit test for switchAliases method checking the flow when switchAliases is disabled.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

---------

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Interval schedule should take start time from the request, should not set it to the current time of request execution. (#1036)

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added minimum for search.cancel_after_time_interval setting for rollups (#1026)

* Added minimum for search.cancel_after_time_interval setting for rollups

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added constant for cancel_after_time_interval for rollup search

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Handled case of default value for cancel interval

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added comment explanation for default rollup cancel after time interval

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Fixed github workflow checks

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

---------

Signed-off-by: Joshua Au <joshuahyau@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Update 2.11.1 release note (#1042)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Interval schedule should take start time from the request, should not… (#1040)

* Interval schedule should take start time from the request, should not set it to the current time of request execution.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* Changed the "delayed continuous execution test" to be more expressive about what it should test.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* fixed the NPE if schedule.startTime is NULL

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* fixed the NPE if schedule.startTime is NULL

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* fixed styling

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* - removed null checks from RollUp and Transforms
- fixed comments in the "delayed execution" test

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

---------

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Removed unused imports

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

---------

Signed-off-by: Joshua Au <joshuahyau@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: n-dohrmann <noah@dohrmann.org>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Co-authored-by: Tanqiu Liu <liutanqiu@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Co-authored-by: n-dohrmann <87952011+n-dohrmann@users.noreply.github.com>
Co-authored-by: Joanne Wang <109310487+jowg-amazon@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Co-authored-by: ikibo <oleg.kravchuk@logz.io>
(cherry picked from commit 60a8513)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
jowg-amazon added a commit that referenced this pull request Dec 12, 2023
)

* Added minimum timeout for transforms search of 10 minutes



* Extracted cancel minimum code to function



* Fixed transform code to use cluster setting



* Removed log statements



* Changed timeout logic



* Switched to basing off seconds



* [Feature] Support Transform as an ISM action (#760)

* Initial impl



* fix style



* end to end functional



* ISM transform unit tests & integ tests



* Fix after core #8157 (#857)



* Upgrade the backport workflow (#862)




* Added 2.9 release notes. (#851)

* Added 2.9 release notes.



* Added 2.9 release notes.



* Added 2.9 release notes.



---------




* Handle NPE in isRollupIndex (#855)

* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.



* unit test



---------





* Fix core XcontentType refactor (#873)




* fix for max & min aggregations when no metric property exist (#870)




* core refactor change (#884)




* update backport branch name (#885)




* core refactor change (#887)




* Fix breaking change by core refactor (#888)




* fix core breaking (#906)




* Support copy alias in rollover (#907)

* Support copy alias in rollover



* 2.10



---------




* Set preference to _primary when searching control-center index (#911)

* Set preference to _primary when searching control-center index



* Use _primary_first instead



---------




* Add primary first preference to all search requests (#912)



* fix intelliJ IDEA gradle sync error (#916)




* make control center index as system index (#919)




* Updates demo certs used in integ tests (#921)




* Added 2.10 release notes (#925)




* Bump bwc version (#930)




* fix integ tests; upgrade mappings versions



* Fix DCO



* Addressed pr comments; Add integ test case for re-execute the same transform action



* Addressed detekt error



* Added ISMTransform writeable test



* Addressed comments; Moved updateTransformStartTime to IndexManagementRestTestCase



---------




















* [Test] increase the wait time after transform job triggered (#999)




* Drafted 2.11 release notes. (#1004)

* Drafted 2.11 release notes.



* Drafted 2.11 release notes.



---------




* Refactor change policy API and the policy in managed index to be non-null (#967)

* Refactor the policy to be non null in managed index config



* Update



* fix bug



---------




* Add more error notification at fail points (#1000)

* Add more error notification at fail points



* Handle exception gracefully



* small fix



---------




* fix the race condition in test reset action start time (#1007)




* Bump bwc version after 2.11 release (#1015)




* added type check for pipeline aggregator types in Transform initialization (#1014)





* Improve security plugin enabling check (#1017)




* Onboard jenkins prod docker images to github actions (#1025)

* Onboard jenkins prod docker images to github actions



* Add more



* Add more



---------




* Support switch aliases in shrink action. (#987)





* Transform pipeline aggr test (#1027)

* tester code: pipeline aggr. transform job



* made test case for pipeline aggregator in transform job



* removed unnec. test lines



* re-added method call on Transform obj



---------




* Added unit test for switchAliases method. (#1035)

* Added unit test for switchAliases method.



* Added unit test for switchAliases method checking the flow when switchAliases is disabled.



---------




* Interval schedule should take start time from the request, should not set it to the current time of request execution. (#1036)




* Added minimum for search.cancel_after_time_interval setting for rollups (#1026)

* Added minimum for search.cancel_after_time_interval setting for rollups



* Added constant for cancel_after_time_interval for rollup search



* Handled case of default value for cancel interval



* Added comment explanation for default rollup cancel after time interval



* Fixed github workflow checks



---------





* Update 2.11.1 release note (#1042)




* Interval schedule should take start time from the request, should not… (#1040)

* Interval schedule should take start time from the request, should not set it to the current time of request execution.



* Changed the "delayed continuous execution test" to be more expressive about what it should test.



* fixed the NPE if schedule.startTime is NULL



* fixed the NPE if schedule.startTime is NULL



* fixed styling



* - removed null checks from RollUp and Transforms
- fixed comments in the "delayed execution" test



---------




* Removed unused imports



---------




























(cherry picked from commit 60a8513)

Signed-off-by: Joshua Au <joshuahyau@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: n-dohrmann <noah@dohrmann.org>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tanqiu Liu <liutanqiu@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Co-authored-by: n-dohrmann <87952011+n-dohrmann@users.noreply.github.com>
Co-authored-by: Joanne Wang <109310487+jowg-amazon@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Co-authored-by: ikibo <oleg.kravchuk@logz.io>
Joshua152 pushed a commit to Joshua152/index-management that referenced this pull request Dec 22, 2023
* Initial impl

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix style

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* end to end functional

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* ISM transform unit tests & integ tests

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix after core #8157 (opensearch-project#857)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Upgrade the backport workflow (opensearch-project#862)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.9 release notes. (opensearch-project#851)

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Handle NPE in isRollupIndex (opensearch-project#855)

* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

* unit test

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

---------

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix core XcontentType refactor (opensearch-project#873)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix for max & min aggregations when no metric property exist (opensearch-project#870)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (opensearch-project#884)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* update backport branch name (opensearch-project#885)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (opensearch-project#887)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix breaking change by core refactor (opensearch-project#888)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix core breaking (opensearch-project#906)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Support copy alias in rollover (opensearch-project#907)

* Support copy alias in rollover

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* 2.10

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Set preference to _primary when searching control-center index (opensearch-project#911)

* Set preference to _primary when searching control-center index

Signed-off-by: gaobinlong <gbinlong@amazon.com>

* Use _primary_first instead

Signed-off-by: gaobinlong <gbinlong@amazon.com>

---------

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Add primary first preference to all search requests (opensearch-project#912)

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix intelliJ IDEA gradle sync error (opensearch-project#916)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* make control center index as system index (opensearch-project#919)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Updates demo certs used in integ tests (opensearch-project#921)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.10 release notes (opensearch-project#925)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Bump bwc version (opensearch-project#930)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix integ tests; upgrade mappings versions

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix DCO

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed pr comments; Add integ test case for re-execute the same transform action

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed detekt error

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added ISMTransform writeable test

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed comments; Moved updateTransformStartTime to IndexManagementRestTestCase

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

---------

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Joshua152 added a commit to Joshua152/index-management that referenced this pull request Dec 22, 2023
…-project#1033)

* Added minimum timeout for transforms search of 10 minutes

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Extracted cancel minimum code to function

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Fixed transform code to use cluster setting

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Removed log statements

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Changed timeout logic

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Switched to basing off seconds

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* [Feature] Support Transform as an ISM action (opensearch-project#760)

* Initial impl

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix style

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* end to end functional

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* ISM transform unit tests & integ tests

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix after core #8157 (opensearch-project#857)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Upgrade the backport workflow (opensearch-project#862)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.9 release notes. (opensearch-project#851)

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.9 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Handle NPE in isRollupIndex (opensearch-project#855)

* Handle NPE in isRollupIndex

`metadata.index()` can return `null`, so handle that case by returning
`false`.

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

* unit test

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>

---------

Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix core XcontentType refactor (opensearch-project#873)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix for max & min aggregations when no metric property exist (opensearch-project#870)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (opensearch-project#884)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* update backport branch name (opensearch-project#885)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* core refactor change (opensearch-project#887)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix breaking change by core refactor (opensearch-project#888)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix core breaking (opensearch-project#906)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Support copy alias in rollover (opensearch-project#907)

* Support copy alias in rollover

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* 2.10

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Set preference to _primary when searching control-center index (opensearch-project#911)

* Set preference to _primary when searching control-center index

Signed-off-by: gaobinlong <gbinlong@amazon.com>

* Use _primary_first instead

Signed-off-by: gaobinlong <gbinlong@amazon.com>

---------

Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Add primary first preference to all search requests (opensearch-project#912)

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix intelliJ IDEA gradle sync error (opensearch-project#916)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* make control center index as system index (opensearch-project#919)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Updates demo certs used in integ tests (opensearch-project#921)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added 2.10 release notes (opensearch-project#925)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Bump bwc version (opensearch-project#930)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* fix integ tests; upgrade mappings versions

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Fix DCO

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed pr comments; Add integ test case for re-execute the same transform action

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed detekt error

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Added ISMTransform writeable test

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

* Addressed comments; Moved updateTransformStartTime to IndexManagementRestTestCase

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>

---------

Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* [Test] increase the wait time after transform job triggered (opensearch-project#999)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Drafted 2.11 release notes. (opensearch-project#1004)

* Drafted 2.11 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Drafted 2.11 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Refactor change policy API and the policy in managed index to be non-null (opensearch-project#967)

* Refactor the policy to be non null in managed index config

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* fix bug

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Add more error notification at fail points (opensearch-project#1000)

* Add more error notification at fail points

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Handle exception gracefully

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* small fix

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* fix the race condition in test reset action start time (opensearch-project#1007)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Bump bwc version after 2.11 release (opensearch-project#1015)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* added type check for pipeline aggregator types in Transform initialization (opensearch-project#1014)

Signed-off-by: n-dohrmann <noah@dohrmann.org>
Co-authored-by: Joanne Wang <109310487+jowg-amazon@users.noreply.github.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Improve security plugin enabling check (opensearch-project#1017)

Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Onboard jenkins prod docker images to github actions (opensearch-project#1025)

* Onboard jenkins prod docker images to github actions

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Support switch aliases in shrink action. (opensearch-project#987)

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Co-authored-by: ikibo <oleg.kravchuk@logz.io>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Transform pipeline aggr test (opensearch-project#1027)

* tester code: pipeline aggr. transform job

Signed-off-by: n-dohrmann <noah@dohrmann.org>

* made test case for pipeline aggregator in transform job

Signed-off-by: n-dohrmann <noah@dohrmann.org>

* removed unnec. test lines

Signed-off-by: n-dohrmann <noah@dohrmann.org>

* re-added method call on Transform obj

Signed-off-by: n-dohrmann <noah@dohrmann.org>

---------

Signed-off-by: n-dohrmann <noah@dohrmann.org>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added unit test for switchAliases method. (opensearch-project#1035)

* Added unit test for switchAliases method.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* Added unit test for switchAliases method checking the flow when switchAliases is disabled.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

---------

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Interval schedule should take start time from the request, should not set it to the current time of request execution. (opensearch-project#1036)

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added minimum for search.cancel_after_time_interval setting for rollups (opensearch-project#1026)

* Added minimum for search.cancel_after_time_interval setting for rollups

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added constant for cancel_after_time_interval for rollup search

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Handled case of default value for cancel interval

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Added comment explanation for default rollup cancel after time interval

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Fixed github workflow checks

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

---------

Signed-off-by: Joshua Au <joshuahyau@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Update 2.11.1 release note (opensearch-project#1042)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Interval schedule should take start time from the request, should not… (opensearch-project#1040)

* Interval schedule should take start time from the request, should not set it to the current time of request execution.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* Changed the "delayed continuous execution test" to be more expressive about what it should test.

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* fixed the NPE if schedule.startTime is NULL

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* fixed the NPE if schedule.startTime is NULL

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* fixed styling

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

* - removed null checks from RollUp and Transforms
- fixed comments in the "delayed execution" test

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>

---------

Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Signed-off-by: Joshua Au <joshuahyau@gmail.com>

* Removed unused imports

Signed-off-by: Joshua Au <joshuahyau@gmail.com>

---------

Signed-off-by: Joshua Au <joshuahyau@gmail.com>
Signed-off-by: Tanqiu Liu <liutanqiu@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Bryce Lampe <brycelampe@gmail.com>
Signed-off-by: Hailong Cui <ihailong@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: n-dohrmann <noah@dohrmann.org>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Co-authored-by: Tanqiu Liu <liutanqiu@gmail.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Bryce Lampe <brycelampe@gmail.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: gaobinlong <gbl_long@163.com>
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Co-authored-by: n-dohrmann <87952011+n-dohrmann@users.noreply.github.com>
Co-authored-by: Joanne Wang <109310487+jowg-amazon@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Oleg Kravchuk <oleg.ikibo@gmail.com>
Co-authored-by: ikibo <oleg.kravchuk@logz.io>
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.

3 participants