Search merge requestshttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests2024-03-08T16:15:22Zhttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/630Aws upgrade aws lib2024-03-08T16:15:22ZDerek HudsonAws upgrade aws lib## Type of change
- [X] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [NO]
## Does this introduce a change in the cloud provi...## Type of change
- [X] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [NO]
## Does this introduce a change in the cloud provider implementation, if so which cloud?
- [X] AWS
- [ ] Azure
- [ ] Google Cloud
- [ ] IBM
## Does this introduce a breaking change?
- [NO]
## What is the current behavior?
## What is the new/expected behavior?
## Have you added/updated Unit Tests and Integration Tests?
## Any other useful informationM23 - Release 0.26Derek HudsonDerek Hudsonhttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/629The code coverage change got merged to the shared repo; revert to using that ...2024-03-05T22:19:08ZMark ChanceThe code coverage change got merged to the shared repo; revert to using that file instead of a local one.## Type of change
- [x] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- \[NO\]
## Does this introduce a change in the cloud prov...## Type of change
- [x] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- \[NO\]
## Does this introduce a change in the cloud provider implementation, if so which cloud?
- [ ] AWS
- [ ] Azure
- [ ] Google Cloud
- [ ] IBM
## Does this introduce a breaking change?
- \[YES/NO\]
## What is the current behavior?
## What is the new/expected behavior?
## Have you added/updated Unit Tests and Integration Tests?
## Any other useful informationhttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/608Use full URL instead of relative path2024-02-05T06:47:59ZLawrence ChanUse full URL instead of relative path## Type of change
- [ ] Bug Fix
- [X] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
NA
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the clou...## Type of change
- [ ] Bug Fix
- [X] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
NA
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud provider implementation, if so which cloud?
- [ ] AWS
- [ ] Azure
- [ ] Google Cloud
- [ ] IBM
## Does this introduce a breaking change?
- [YES/NO]
## What is the current behavior?
## What is the new/expected behavior?
## Have you added/updated Unit Tests and Integration Tests?
## Any other useful informationhttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/596Upgrading rest-high-level client to 7.17 to support Elasticsearch 8.2024-02-12T13:33:51ZHarshika DhootUpgrading rest-high-level client to 7.17 to support Elasticsearch 8.## Type of change
- [ ] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud p...## Type of change
- [ ] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud provider implementation, if so which cloud?
- [ ] AWS
- [ ] Azure
- [ ] Google Cloud
- [ ] IBM
## Does this introduce a breaking change?
- [YES/NO]
## What is the current behavior?
## What is the new/expected behavior?
## Have you added/updated Unit Tests and Integration Tests?
## Any other useful informationHarshika DhootHarshika Dhoothttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/561[GONRG-7826] - Added liveness health check2023-12-14T16:44:03ZAnatolii Hrychaniuk[GONRG-7826] - Added liveness health checkhttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/549Draft: Upgrade rest-high-level client to 7.17 to support Elasticsearch 8.2024-01-18T07:50:03ZRustam Lotsmanenko (EPAM)rustam_lotsmanenko@epam.comDraft: Upgrade rest-high-level client to 7.17 to support Elasticsearch 8.# Description:
Backward-compatible migration to Elastic 8 using client version 7.17.12: https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/java-rest-high-compatibility.html
No changes are required from the client bui...# Description:
Backward-compatible migration to Elastic 8 using client version 7.17.12: https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/java-rest-high-compatibility.html
No changes are required from the client builder, thanks to the provided `ELASTIC_CLIENT_APIVERSIONING=true` environment variable that determines whether to send the 7.x compatibility header.
With these changes, Search is able to work with both ElasticSearch v7.* and v8.*.
# How to test:
Functionality was tested via int tests simultaneously on both envs, with Elasticsearch 8 and Elasticsearch7.
Info endpoint example for two environments that run the same binaries, but different Elasticsearch versions:
~~~
curl --location 'https://community.gcp.gnrg-osdu.projects.epam.com/api/search/v2/info'
{
"groupId": "org.opengroup.osdu",
"artifactId": "search-gc",
"version": "0.24.0-SNAPSHOT",
"buildTime": "2023-08-31T14:14:08.894Z",
"branch": "trusted-elastic-8-migration",
"commitId": "e6e5b51e23a103c7b6a1b71a34b285a5d1362f6e",
"commitMessage": "fix merge conflicts",
"connectedOuterServices": [
{
"name": "Redis-RedisCacheBuilder$2",
"version": null
},
{
"name": "ElasticSearch-osdu",
"version": "8.9.1"
},
{
"name": "ElasticSearch-second",
"version": "8.9.1"
}
]
}
curl --location 'https://osdu.ref.gcp.gnrg-osdu.projects.epam.com/api/search/v2/info'
{
"groupId": "org.opengroup.osdu",
"artifactId": "search-gc",
"version": "0.24.0-SNAPSHOT",
"buildTime": "2023-08-31T14:14:08.894Z",
"branch": "trusted-elastic-8-migration",
"commitId": "e6e5b51e23a103c7b6a1b71a34b285a5d1362f6e",
"commitMessage": "fix merge conflicts",
"connectedOuterServices": [
{
"name": "Redis-RedisCacheBuilder$2",
"version": null
},
{
"name": "ElasticSearch-osdu",
"version": "7.17.12"
}
]
}
~~~
# Changes include:
- [ ] Refactor (a non-breaking change that improves code maintainability).
- [ ] Bugfix (a non-breaking change that solves an issue).
- [x] New feature (a non-breaking change that adds functionality).
- [ ] Breaking change (a change that is not backward-compatible and/or changes current functionality).
# Changes in:
- [x] GCP
- [x] Azure
- [x] AWS
- [x] IBM
- [x] Common code
# Dev Checklist:
- [ ] Added Unit Tests, wherever applicable.
- [x] Updated the Readme, if applicable.
- [x] Existing Tests pass
- [x] Verified functionality locally
- [x] Self Reviewed my code for formatting and complex business logic.
# Other comments:
The Azure module Geo Queries builders were not migrated due to previous changes that set them apart from similar components in other Cloud Service Providers: https://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/474
`mvn dependency:tree -Dincludes=*elastic*` output:
~~~
[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ search-core ---
[INFO] org.opengroup.osdu:search-core:jar:0.24.0-SNAPSHOT
[INFO] +- org.elasticsearch:elasticsearch:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-core:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-secure-sm:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-x-content:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-geo:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-lz4:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-cli:jar:7.17.12:compile
[INFO] | \- org.elasticsearch:elasticsearch-plugin-classloader:jar:7.17.12:runtime
[INFO] +- org.elasticsearch.client:elasticsearch-rest-client:jar:7.17.12:compile
[INFO] \- org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:mapper-extras-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:parent-join-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:aggs-matrix-stats-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:rank-eval-client:jar:7.17.12:compile
[INFO] \- org.elasticsearch.plugin:lang-mustache-client:jar:7.17.12:compile
[INFO]
[INFO] -------------------< org.opengroup.osdu:search-byoc >-------------------
[INFO] Building search-byoc 0.24.0-SNAPSHOT [3/7]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ search-byoc ---
[INFO] org.opengroup.osdu:search-byoc:jar:0.24.0-SNAPSHOT
[INFO] \- org.opengroup.osdu:search-core:jar:0.24.0-SNAPSHOT:compile
[INFO] +- org.elasticsearch:elasticsearch:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-core:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-secure-sm:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-x-content:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-geo:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-lz4:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-cli:jar:7.17.12:compile
[INFO] | \- org.elasticsearch:elasticsearch-plugin-classloader:jar:7.17.12:runtime
[INFO] +- org.elasticsearch.client:elasticsearch-rest-client:jar:7.17.9:compile
[INFO] \- org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:mapper-extras-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:parent-join-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:aggs-matrix-stats-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:rank-eval-client:jar:7.17.12:compile
[INFO] \- org.elasticsearch.plugin:lang-mustache-client:jar:7.17.12:compile
[INFO]
[INFO] --------------------< org.opengroup.osdu:search-gc >--------------------
[INFO] Building search-gc 0.24.0-SNAPSHOT [4/7]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ search-gc ---
[INFO] org.opengroup.osdu:search-gc:jar:0.24.0-SNAPSHOT
[INFO] \- org.opengroup.osdu:search-core:jar:0.24.0-SNAPSHOT:compile
[INFO] +- org.elasticsearch:elasticsearch:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-core:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-secure-sm:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-x-content:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-geo:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-lz4:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-cli:jar:7.17.12:compile
[INFO] | \- org.elasticsearch:elasticsearch-plugin-classloader:jar:7.17.12:runtime
[INFO] +- org.elasticsearch.client:elasticsearch-rest-client:jar:7.17.9:compile
[INFO] \- org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:mapper-extras-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:parent-join-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:aggs-matrix-stats-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:rank-eval-client:jar:7.17.12:compile
[INFO] \- org.elasticsearch.plugin:lang-mustache-client:jar:7.17.12:compile
[INFO]
[INFO] -------------------< org.opengroup.osdu:search-aws >--------------------
[INFO] Building search-aws 0.24.0-SNAPSHOT [5/7]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ search-aws ---
[INFO] org.opengroup.osdu:search-aws:jar:0.24.0-SNAPSHOT
[INFO] +- org.opengroup.osdu:search-core:jar:0.24.0-SNAPSHOT:compile
[INFO] | +- org.elasticsearch.client:elasticsearch-rest-client:jar:7.17.9:compile
[INFO] | \- org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:7.17.12:compile
[INFO] | +- org.elasticsearch.plugin:mapper-extras-client:jar:7.17.12:compile
[INFO] | +- org.elasticsearch.plugin:parent-join-client:jar:7.17.12:compile
[INFO] | +- org.elasticsearch.plugin:aggs-matrix-stats-client:jar:7.17.12:compile
[INFO] | +- org.elasticsearch.plugin:rank-eval-client:jar:7.17.12:compile
[INFO] | \- org.elasticsearch.plugin:lang-mustache-client:jar:7.17.12:compile
[INFO] \- org.elasticsearch:elasticsearch:jar:7.17.12:compile
[INFO] +- org.elasticsearch:elasticsearch-core:jar:7.17.12:compile
[INFO] +- org.elasticsearch:elasticsearch-secure-sm:jar:7.17.12:compile
[INFO] +- org.elasticsearch:elasticsearch-x-content:jar:7.17.12:compile
[INFO] +- org.elasticsearch:elasticsearch-geo:jar:7.17.12:compile
[INFO] +- org.elasticsearch:elasticsearch-lz4:jar:7.17.12:compile
[INFO] +- org.elasticsearch:elasticsearch-cli:jar:7.17.12:compile
[INFO] \- org.elasticsearch:elasticsearch-plugin-classloader:jar:7.17.12:runtime
[INFO]
[INFO] ------------------< org.opengroup.osdu:search-azure >-------------------
[INFO] Building search-azure 0.24.0-SNAPSHOT [6/7]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ search-azure ---
[INFO] org.opengroup.osdu:search-azure:jar:0.24.0-SNAPSHOT
[INFO] \- org.opengroup.osdu:search-core:jar:0.24.0-SNAPSHOT:compile
[INFO] +- org.elasticsearch:elasticsearch:jar:7.8.1:compile
[INFO] | +- org.elasticsearch:elasticsearch-core:jar:7.8.1:compile
[INFO] | +- org.elasticsearch:elasticsearch-secure-sm:jar:7.8.1:compile
[INFO] | +- org.elasticsearch:elasticsearch-x-content:jar:7.8.1:compile
[INFO] | +- org.elasticsearch:elasticsearch-geo:jar:7.8.1:compile
[INFO] | +- org.elasticsearch:elasticsearch-cli:jar:7.8.1:compile
[INFO] | \- org.elasticsearch:jna:jar:5.5.0:compile
[INFO] +- org.elasticsearch.client:elasticsearch-rest-client:jar:7.17.8:compile
[INFO] \- org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:7.8.1:compile
[INFO] +- org.elasticsearch.plugin:mapper-extras-client:jar:7.8.1:compile
[INFO] +- org.elasticsearch.plugin:parent-join-client:jar:7.8.1:compile
[INFO] +- org.elasticsearch.plugin:aggs-matrix-stats-client:jar:7.8.1:compile
[INFO] +- org.elasticsearch.plugin:rank-eval-client:jar:7.8.1:compile
[INFO] \- org.elasticsearch.plugin:lang-mustache-client:jar:7.8.1:compile
[INFO]
[INFO] -------------------< org.opengroup.osdu:search-ibm >--------------------
[INFO] Building search-ibm 0.24.0-SNAPSHOT [7/7]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ search-ibm ---
[INFO] org.opengroup.osdu:search-ibm:jar:0.24.0-SNAPSHOT
[INFO] +- org.elasticsearch:elasticsearch:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-core:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-secure-sm:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-x-content:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-geo:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-lz4:jar:7.17.12:compile
[INFO] | +- org.elasticsearch:elasticsearch-cli:jar:7.17.12:compile
[INFO] | \- org.elasticsearch:elasticsearch-plugin-classloader:jar:7.17.12:runtime
[INFO] +- org.elasticsearch.client:elasticsearch-rest-client:jar:7.17.9:compile
[INFO] \- org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:mapper-extras-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:parent-join-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:aggs-matrix-stats-client:jar:7.17.12:compile
[INFO] +- org.elasticsearch.plugin:rank-eval-client:jar:7.17.12:compile
[INFO] \- org.elasticsearch.plugin:lang-mustache-client:jar:7.17.12:compile
[INFO] ------------------------------------------------------------------------
~~~Rustam Lotsmanenko (EPAM)rustam_lotsmanenko@epam.comRustam Lotsmanenko (EPAM)rustam_lotsmanenko@epam.comhttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/540Draft: Elastic 82023-08-16T16:51:26ZRiabokon Stanislav(EPAM)[GCP]Draft: Elastic 8## Type of change
- [ ] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud p...## Type of change
- [ ] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud provider implementation, if so which cloud?
- [ ] AWS
- [ ] Azure
- [ ] Google Cloud
- [ ] IBM
## Does this introduce a breaking change?
- [YES/NO]
## What is the current behavior?
## What is the new/expected behavior?
## Have you added/updated Unit Tests and Integration Tests?
## Any other useful informationRustam Lotsmanenko (EPAM)rustam_lotsmanenko@epam.comRiabokon Stanislav(EPAM)[GCP]Rustam Lotsmanenko (EPAM)rustam_lotsmanenko@epam.comhttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/539Tmp commit for elastic 82023-08-14T12:21:40ZRiabokon Stanislav(EPAM)[GCP]Tmp commit for elastic 8## Type of change
- [ ] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud p...## Type of change
- [ ] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud provider implementation, if so which cloud?
- [ ] AWS
- [ ] Azure
- [ ] Google Cloud
- [ ] IBM
## Does this introduce a breaking change?
- [YES/NO]
## What is the current behavior?
## What is the new/expected behavior?
## Have you added/updated Unit Tests and Integration Tests?
## Any other useful informationhttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/538Draft: jackson-databind-upgrade2023-08-10T12:06:30Zsagar thapaDraft: jackson-databind-upgrade## Type of change
- [ ] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud p...## Type of change
- [ ] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud provider implementation, if so which cloud?
- [ ] AWS
- [ ] Azure
- [ ] Google Cloud
- [ ] IBM
## Does this introduce a breaking change?
- [YES/NO]
## What is the current behavior?
## What is the new/expected behavior?
## Have you added/updated Unit Tests and Integration Tests?
## Any other useful informationhttps://community.opengroup.org/osdu/platform/system/search-service/-/merge_requests/537Draft: Update version of default branch to 0.22.0-SNAPSHOT2023-08-09T20:08:28ZMahsa HanifiDraft: Update version of default branch to 0.22.0-SNAPSHOT## Type of change
- [ ] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud p...## Type of change
- [ ] Bug Fix
- [ ] Feature
**Please provide link to gitlab issue or ADR(Architecture Decision Record)**
## Does this introduce a change in the core logic?
- [YES/NO]
## Does this introduce a change in the cloud provider implementation, if so which cloud?
- [ ] AWS
- [ ] Azure
- [ ] Google Cloud
- [ ] IBM
## Does this introduce a breaking change?
- [YES/NO]
## What is the current behavior?
## What is the new/expected behavior?
## Have you added/updated Unit Tests and Integration Tests?
## Any other useful informationMahsa HanifiMahsa Hanifi