This is an automated email from the ASF dual-hosted git repository. skperez pushed a commit to branch SDAP-371 in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 80bb6e34d8c24f40fe4ff8a86a3a2810cefadca4 Merge: f683f28 cd58f7b Author: skorper <[email protected]> AuthorDate: Thu Jul 7 16:33:29 2022 -0700 Merge branch 'master' of github.com:apache/incubator-sdap-nexus into SDAP-371 CHANGELOG.md | 3 + analysis/README.md | 22 +++- analysis/conda-requirements.txt | 5 +- analysis/setup.py | 2 +- analysis/tests/redirect/__init__.py | 0 analysis/tests/redirect/collections-config.yaml | 20 ++++ analysis/tests/webapp_test.py | 14 +++ analysis/webservice/algorithms/DataSeriesList.py | 19 ++- .../algorithms/doms/DomsInitialization.py | 42 ++++--- analysis/webservice/algorithms_spark/Matchup.py | 2 +- .../app_builders/HandlerArgsBuilder.py | 43 +++++++ .../nexus_tornado/app_builders/NexusAppBuilder.py | 75 ++++++++++++ .../app_builders/RedirectAppBuilder.py | 16 +++ .../app_builders/SparkContextBuilder.py | 17 +++ .../nexus_tornado/app_builders/__init__.py | 2 + analysis/webservice/redirect/RedirectHandler.py | 34 ++++++ .../webservice/redirect/RemoteCollectionMatcher.py | 38 ++++++ analysis/webservice/redirect/__init__.py | 2 + analysis/webservice/webapp.py | 132 +++++++-------------- data-access/nexustiles/dao/CassandraProxy.py | 15 ++- data-access/nexustiles/dao/SolrProxy.py | 2 + docker/nexus-webapp/Dockerfile | 2 +- helm/README.md | 31 +++++ helm/templates/ingress.yml | 54 ++++++--- helm/templates/webapp.yml | 10 +- helm/values.yaml | 9 +- 26 files changed, 468 insertions(+), 143 deletions(-) diff --cc CHANGELOG.md index 5c130c8,9b0642c..9d0bb20 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -9,11 -10,11 +10,13 @@@ and this project adheres to [Semantic V - SDAP-372: Updated matchup algorithm to point to AWS insitu API endpoint - SDAP-372: Added new matchup endpoint `match_spark_doms` that points to DOMS insitu endpoint - SDAP-372: Updated `match_spark_doms` to interface with samos_cdms endpoint + - SDAP-393: Included `insitu` in ingress based on the value of `insituAPI.enabled` in `values.yaml` +- SDAP-371: Renamed `/domssubset` endpoint to `/cdmssubset` ### Changed ### Deprecated ### Removed ### Fixed - Fix failing test_matchup unit test + - Fixed null value for count in matchup response +- SDAP-371: Fixed DOMS subset endpoint ### Security
