CRS Catalog merge requestshttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests2023-05-30T14:52:36Zhttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/278Upgrade First Party Library Dependencies for Release 0.212023-05-30T14:52:36ZDavid Diederichd.diederich@opengroup.orgUpgrade First Party Library Dependencies for Release 0.21This generated MR upgrades the first party libraries (other OSDU libraries) to utilize the latest release.
The intent is to keep the OSDU projects utilizing the latest available code to ensure widespread usage and stability.
However, any...This generated MR upgrades the first party libraries (other OSDU libraries) to utilize the latest release.
The intent is to keep the OSDU projects utilizing the latest available code to ensure widespread usage and stability.
However, any library that is older than the previous release will be left as-is, since the upgrade is likely to be more complicated.
Furthermore, the upgrade should only be merged in the CI pipeline reports success.
If this MR has failed, we can spend a little time investigating to see if a trivial upgrade could achieve compatiblity to the new library.
But significant upgrade efforts should not occur on this MR, as part of the release tagging process.
Instead, significant work should be scheduled for a subsequent milestone.
### Dependency Information Before the Upgrade
```
Branch: master
SHA: fa4be63b1926e4e7240fe36876b8554e7a98e332
Maven: 0.22.0-SNAPSHOT
```
| Maven Dependencies | _Root_ |
| ------------------ | ------ |
| core-lib-azure | 0.20.0 |
| os-core-common | 0.20.1 |
| os-core-lib-ibm | 0.20.0 |
### Dependency Information After the Upgrade
```
Branch: dependency-upgrade
SHA: 324bd94d114d43f8d7a499e05246c7760fc82910
Maven: 0.22.0-SNAPSHOT
```
| Maven Dependencies | _Root_ |
| ------------------ | ------ |
| core-lib-azure | 0.21.0 |
| os-core-common | 0.21.0 |
| os-core-lib-ibm | 0.21.0 |M18 - Release 0.21https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/277Cherry-pick 'Full Upgrade of First Party Library Dependencies for Release 0.2...2023-05-22T21:44:52ZChad LeongCherry-pick 'Full Upgrade of First Party Library Dependencies for Release 0.20' into release/0.21**Original MR**: !258
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporati...**Original MR**: !258
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporating all changes in the default branch.
These MRs must be approved by the PMC before they are merged, since they alter the scope of the release.
To see more details about the change itself, look at the Original MR listed above.
#### Skipped Pipeline
Normally, pipelines are not executed on the cherry pick branch/MR prior to merging.
This optimization is accepted because the code was tested when it merged into the default branch, and will be tested again in the release branch prior to tagging.
However, if anybody feels that the MR requires further scrutiny -- whether because it had conflicts in the cherry-picking, it interfaces with some drastically altered logic between the branches, or any other reason -- we can run the pipeline here prior to merging.
#### If There's Reason to Run a Pipeline
If you want to see a pipeline result before this merges, first add a comment explaining why you'd like to see the pipeline results so the PMC and others know your thinking.
Then, mark the MR as a Draft MR (using the vertical ellipsis above, choose 'Mark as Draft').
This prevents the MR from being approved & merged accidentally by a busy release coordinator who didn't see your comment.
Finally, if you are a maintainer on the project, launch a pipeline on this branch.
Since this branch is a protected branch and the MR has ~no-detached-pipeline set, all integration tests will run and there's no need for any `trusted-*` branches.
[Launch a Pipeline for this Branch](https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/pipelines/new?ref=cherry-pick-for-258)M18 - Release 0.21David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/258Full Upgrade of First Party Library Dependencies for Release 0.202023-05-22T21:14:00ZDavid Diederichd.diederich@opengroup.orgFull Upgrade of First Party Library Dependencies for Release 0.20This generated MR upgrades the first party libraries (other OSDU libraries) to utilize the latest release.
The intent is to try to fully upgrade all dependent libraries to see if the latest code will work.
It is expected that these will ...This generated MR upgrades the first party libraries (other OSDU libraries) to utilize the latest release.
The intent is to try to fully upgrade all dependent libraries to see if the latest code will work.
It is expected that these will often fail, since the upgrades were previously rejected for failing pipelines and have not been directly addressed yet.
This upgrade should only be merged in the CI pipeline reports success.
If this MR has failed, we can spend a little time investigating to see if a trivial upgrade could achieve compatiblity to the new library.
But significant upgrade efforts should not occur on this MR, as part of the release tagging process.
Instead, significant work should be scheduled for a subsequent milestone.
This MR may co-exist with a separate, smaller upgrade MR.
If both pass, this one should be used instead.
### Dependency Information Before the Upgrade
```
Branch: master
SHA: e7fbbb9753f5763a3dbde2e4bf0cfc3b7e958eee
Maven: 0.21.0-SNAPSHOT
```
| Maven Dependencies | _Root_ |
| ------------------------------ | ------ |
| core-lib-azure | 0.19.0 |
| os-core-common | 0.19.0 |
| os-core-lib-ibm | 0.17.0 |
| (3rd Party) org.yaml.snakeyaml | 2.0 |
### Dependency Information After the Upgrade
```
Branch: dependency-upgrade
SHA: ac89ec3ce36d166ba98a58b0c4ca90a2695397d7
Maven: 0.21.0-SNAPSHOT
```
| Maven Dependencies | _Root_ |
| ------------------------------ | ------ |
| core-lib-azure | 0.20.0 |
| os-core-common | 0.20.1 |
| os-core-lib-ibm | 0.20.0 |
| (3rd Party) org.yaml.snakeyaml | 2.0 |M18 - Release 0.21Okoun-Ola Fabien HouetoYauhen Shaliou [EPAM/GCP]Srinivasan NarayananOkoun-Ola Fabien Houetohttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/276Fixing variable for aws2023-05-19T21:50:13ZAbhay JoshiFixing variable for aws(cherry picked from commit 711bada60b0ebeeded3d5ac19e85cd730a0f5ac6)(cherry picked from commit 711bada60b0ebeeded3d5ac19e85cd730a0f5ac6)M18 - Release 0.21Abhay JoshiYong ZengMadalyn MarabellaAbhay Joshihttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/274Swagger UI for Catalog service is not loading2023-05-19T14:18:10ZAayushi JainSwagger UI for Catalog service is not loadingSwagger UI for Catalog service is not loading with error Unauthorized
stackTrace: `2023-05-16 05:36:35.730 ERROR crs-catalog-57c94f547f-gjj8r --- [qtp509832867-23] o.o.o.a.l.Slf4JLogger correlation-id=aayushi data-par...Swagger UI for Catalog service is not loading with error Unauthorized
stackTrace: `2023-05-16 05:36:35.730 ERROR crs-catalog-57c94f547f-gjj8r --- [qtp509832867-23] o.o.o.a.l.Slf4JLogger correlation-id=aayushi data-partition-id=opendes api-method=GET operation-name= user-id= app-id=:crs-catalog.app null {correlation-id=aayushi, data-partition-id=opendes} org.opengroup.osdu.crs.util.AppException: null| at org.opengroup.osdu.crs.util.AppException.createUnauthorized(AppException.java:44) ~[crs-catalog-core-0.17.1-SNAPSHOT.jar!/:?]| at org.opengroup.osdu.crs.middleware.AuthenticationService.isAuthorized(AuthenticationService.java:65) ~[crs-catalog-core-0.17.1-SNAPSHOT.jar!/:?]| at org.opengroup.osdu.crs.middleware.AuthenticationRequestFilter.doFilterInternal(AuthenticationRequestFilter.java:24) ~[crs-catalog-core-0.17.1-SNAPSHOT.jar!/:?]| ... suppressed 25 lines| at org.eclipse.jetty.servlet.FilterHolder.doFilter(FilterHolder.java:193) `
The authorized needs to be disabled from SecurityConfig also for swagger UI urlAayushi JainAayushi Jainhttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/275Update images for OpenJDK2023-05-19T13:59:14ZOrest Khud [EPAMĀ / GCP]Update images for OpenJDKM18 - Release 0.21https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/267GONRG-7029: update anthos to baremetal2023-05-19T08:41:47ZYauheni Rykhter (EPAM)GONRG-7029: update anthos to baremetalM18 - Release 0.21Yauheni Rykhter (EPAM)Yauheni Rykhter (EPAM)https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/271Fix CRS Catalog not returning all records, removing capping at 1000 records2023-05-18T15:07:57ZKIRAN ALLAMSETYFix CRS Catalog not returning all records, removing capping at 1000 recordsCloses #31 code fix for the max-1000 records for CRS and CT's.Closes #31 code fix for the max-1000 records for CRS and CT's.M18 - Release 0.21Chad LeongChad Leonghttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/273adding useragent changes2023-05-12T17:42:48ZMadalyn Marabellaadding useragent changesM18 - Release 0.21Abhay JoshiAbhay Joshihttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/268base image changed2023-05-12T14:40:34ZOrest Khud [EPAMĀ / GCP]base image changedM18 - Release 0.21https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/270Fixing vulnerabilties in snake.yml2023-05-11T23:04:14ZKiran VeerapaneniFixing vulnerabilties in snake.ymlhttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/265M18 service and CICD updates2023-05-09T19:59:28ZLong ChengM18 service and CICD updatesAWS code changes only
commit a001921a
Author: Abhay <bios@amazon.com>
Date: Tue Mar 21 2023 08:38:19 GMT-0700 (Pacific Daylight Time)
removing old ssl stuff
commit 663f62f4
Author: Abhay <bios@amazon.com>
Date: Tue Mar 21 20...AWS code changes only
commit a001921a
Author: Abhay <bios@amazon.com>
Date: Tue Mar 21 2023 08:38:19 GMT-0700 (Pacific Daylight Time)
removing old ssl stuff
commit 663f62f4
Author: Abhay <bios@amazon.com>
Date: Tue Mar 21 2023 07:28:24 GMT-0700 (Pacific Daylight Time)
Renaming variable
commit 4d73a4b0
Author: Abhay <bios@amazon.com>
Date: Mon Mar 20 2023 10:38:46 GMT-0700 (Pacific Daylight Time)
adding changes for rootFilesystemM18 - Release 0.21Long ChengLong Chenghttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/266GONRG-7100: Fix gc-anthos-test-python job2023-05-12T13:46:29ZVolodymyr Pienskoi [EPAM / GCP]GONRG-7100: Fix gc-anthos-test-python jobM18 - Release 0.21Volodymyr Pienskoi [EPAM / GCP]Volodymyr Pienskoi [EPAM / GCP]https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/264Upgrade maven dependency versions2023-05-04T13:13:53Zsaketh somarajuUpgrade maven dependency versions Upgrade maven dependency versions
- [crs-catalog-service vulnerability 2959](https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/security/vulnerabilities/2959)
- [crs-catalog-service vulnerability 22046... Upgrade maven dependency versions
- [crs-catalog-service vulnerability 2959](https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/security/vulnerabilities/2959)
- [crs-catalog-service vulnerability 22046](https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/security/vulnerabilities/22046)
- [crs-catalog-service vulnerability 22044](https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/security/vulnerabilities/22044)
- [crs-catalog-service vulnerability 26291](https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/security/vulnerabilities/26291)M18 - Release 0.21saketh somarajusaketh somarajuhttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/263Set FailOnError to false2023-05-03T19:24:27ZYash DholakiaSet FailOnError to falseSet FailOnError to false so build does not fail when dependency-check-maven fails.Set FailOnError to false so build does not fail when dependency-check-maven fails.M18 - Release 0.21Yash DholakiaYash Dholakiahttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/262GONGR-6885 Reduce requests according to VPA2023-08-18T13:52:04ZAndriy Halka [EPAM / GCP]GONGR-6885 Reduce requests according to VPAM18 - Release 0.21https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/261Update CRS_Catalog_Service.md with new responses.2023-04-24T09:17:21ZPer Helge Aarnespeaar@equinor.comUpdate CRS_Catalog_Service.md with new responses.M18 - Release 0.21Chad LeongChad Leonghttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/260Cherry pick M14 to m16 branch2023-04-20T19:27:34ZKiran VeerapaneniCherry pick M14 to m16 branchCherry pick M14 to m16 branchCherry pick M14 to m16 branchKiran VeerapaneniKiran Veerapanenihttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/259Cherry-pick 'Upgrading snakeyaml' into release/0.202023-04-11T09:35:40ZDavid Diederichd.diederich@opengroup.orgCherry-pick 'Upgrading snakeyaml' into release/0.20**Original MR**: !256
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporati...**Original MR**: !256
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporating all changes in the default branch.
These MRs must be approved by the PMC before they are merged, since they alter the scope of the release.
To see more details about the change itself, look at the Original MR listed above.
#### Skipped Pipeline
Normally, pipelines are not executed on the cherry pick branch/MR prior to merging.
This optimization is accepted because the code was tested when it merged into the default branch, and will be tested again in the release branch prior to tagging.
However, if anybody feels that the MR requires further scrutiny -- whether because it had conflicts in the cherry-picking, it interfaces with some drastically altered logic between the branches, or any other reason -- we can run the pipeline here prior to merging.
#### If There's Reason to Run a Pipeline
If you want to see a pipeline result before this merges, first add a comment explaining why you'd like to see the pipeline results so the PMC and others know your thinking.
Then, mark the MR as a Draft MR (using the vertical ellipsis above, choose 'Mark as Draft').
This prevents the MR from being approved & merged accidentally by a busy release coordinator who didn't see your comment.
Finally, if you are a maintainer on the project, launch a pipeline on this branch.
Since this branch is a protected branch and the MR has ~no-detached-pipeline set, all integration tests will run and there's no need for any `trusted-*` branches.
[Launch a Pipeline for this Branch](https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/pipelines/new?ref=cherry-pick-for-256)M17 - Release 0.20David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service/-/merge_requests/256Upgrading snakeyaml2023-04-11T09:34:41ZAbhay JoshiUpgrading snakeyamlcommit 49e85876
Author: Abhay <bios@amazon.com>
Date: Mon Mar 27 2023 10:50:43 GMT-0700 (Pacific Daylight Time)
upgrading dependencies
(cherry picked from commit 517f6d07d3874ce05dc9704de5cdd60bb53a1a39)commit 49e85876
Author: Abhay <bios@amazon.com>
Date: Mon Mar 27 2023 10:50:43 GMT-0700 (Pacific Daylight Time)
upgrading dependencies
(cherry picked from commit 517f6d07d3874ce05dc9704de5cdd60bb53a1a39)M17 - Release 0.20Okoun-Ola Fabien HouetoAbhay JoshiOkoun-Ola Fabien Houeto