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

Bump to 2.0 alpha1 and gradle 7 #325

Merged
merged 17 commits into from
Apr 4, 2022
Merged

Bump to 2.0 alpha1 and gradle 7 #325

merged 17 commits into from
Apr 4, 2022

Conversation

davidcui1225
Copy link
Contributor

@davidcui1225 davidcui1225 commented Mar 29, 2022

Signed-off-by: David Cui davidcui@amazon.com

Description

  • Bump OS version to 2.0.0-alpha1 and use gradle 7
  • Replace job-scheduler dependency zip
  • Add jdk 17 to CI workflow matrix
  • Remove mapping type from CreateIndexRequest

Issues Resolved

[List any issues this PR will resolve]

Check List

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

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

Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
@codecov-commenter
Copy link

codecov-commenter commented Mar 31, 2022

Codecov Report

Merging #325 (fde42b2) into main (a3adae8) will increase coverage by 1.58%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main     #325      +/-   ##
============================================
+ Coverage     72.64%   74.23%   +1.58%     
- Complexity      373      383      +10     
============================================
  Files            94       94              
  Lines          3963     3966       +3     
  Branches        644      639       -5     
============================================
+ Hits           2879     2944      +65     
+ Misses          909      888      -21     
+ Partials        175      134      -41     
Flag Coverage Δ
dashboards-reports 76.79% <ø> (+0.10%) ⬆️
reports-scheduler 71.85% <100.00%> (+2.95%) ⬆️

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

Impacted Files Coverage Δ
...h/reportsscheduler/index/ReportDefinitionsIndex.kt 63.44% <100.00%> (-7.22%) ⬇️
...rch/reportsscheduler/index/ReportInstancesIndex.kt 52.52% <100.00%> (-6.48%) ⬇️
...search/reportsscheduler/settings/PluginSettings.kt 78.33% <100.00%> (-0.36%) ⬇️
...duler/resthandler/ReportInstanceListRestHandler.kt 66.66% <0.00%> (-4.77%) ⬇️
...ler/resthandler/ReportDefinitionListRestHandler.kt 66.66% <0.00%> (-4.77%) ⬇️
...rch/reportsscheduler/security/UserAccessManager.kt 9.30% <0.00%> (-4.34%) ⬇️
...tsscheduler/scheduler/ReportDefinitionJobRunner.kt 8.69% <0.00%> (-3.81%) ⬇️
...search/reportsscheduler/action/PluginBaseAction.kt 31.34% <0.00%> (-2.00%) ⬇️
... and 45 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a3adae8...fde42b2. Read the comment docs.

Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
@davidcui1225 davidcui1225 marked this pull request as ready for review April 1, 2022 21:53
@davidcui1225 davidcui1225 requested a review from a team as a code owner April 1, 2022 21:53
Copy link
Collaborator

@kavithacm kavithacm left a comment

Choose a reason for hiding this comment

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

build seems to be failing, can you upgrade the following
enzyme-adapter-react-16
^1.15.5 => opensearch-dashboards
^1.15.2 => reports-dashboards

Signed-off-by: David Cui <davidcui@amazon.com>
// 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT
opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
opensearch_build = opensearch_version.replaceAll(/(\.\d(?!\.\d))/, '$1.0')
Copy link
Member

Choose a reason for hiding this comment

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

opensearch_build = opensearch_version.replaceAll(/([\d.]*.\d+(?!.\d))/, '$1.0')
Please replace this to handle multiple digits.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Was common-utils 2.0.0 alpha1 deprecated? backend build is failing immediately because it can't resolve the reference

Signed-off-by: David Cui <davidcui@amazon.com>
joshuali925
joshuali925 previously approved these changes Apr 2, 2022
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
Copy link
Member

@vamsi-amazon vamsi-amazon left a comment

Choose a reason for hiding this comment

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

LGTM

@davidcui1225 davidcui1225 merged commit b86c19e into opensearch-project:main Apr 4, 2022
@davidcui1225 davidcui1225 deleted the gradle-2-bump branch April 4, 2022 18:07
kavilla pushed a commit to kavilla/dashboards-reports that referenced this pull request Jul 12, 2023
Bumping gradle 7, reporting to 2.0 and removed mapping types

Signed-off-by: David Cui <davidcui@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants