Schema merge requestshttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests2023-11-14T21:05:21Zhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/596Cherry pick remove gc migrate2023-11-14T21:05:21ZYan Sushchynski (EPAM)Cherry pick remove gc migrateCherry-picks
45dcc45ea4dc02468f6d2b84613c442a1d317d91
2cd91dce63ffc84a5884f83976a2201d8800a9a3Cherry-picks
45dcc45ea4dc02468f6d2b84613c442a1d317d91
2cd91dce63ffc84a5884f83976a2201d8800a9a3M21 - Release 0.24David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/595gc: remove gc-migration2023-11-14T15:32:01ZYan Sushchynski (EPAM)gc: remove gc-migrationMove the GC migration to another repoMove the GC migration to another repoM22 - Release 0.25https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/594gc fix sql migration2023-11-14T13:56:13ZYan Sushchynski (EPAM)gc fix sql migrationM22 - Release 0.25https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/591Fix content-type as application/json for system-schema api2023-11-27T12:57:48ZVidyaDharani LokamFix content-type as application/json for system-schema apiIssue Reference: https://community.opengroup.org/osdu/platform/pre-shipping/-/issues/521
- As discussed in the above issue received a response with 'application/json' Content-Type, but it is not declared in the schema for system-schema...Issue Reference: https://community.opengroup.org/osdu/platform/pre-shipping/-/issues/521
- As discussed in the above issue received a response with 'application/json' Content-Type, but it is not declared in the schema for system-schema api.
- In this MR we defined the content-type as 'application/json' in system-schema api for the respective api response.M22 - Release 0.25VidyaDharani LokamVidyaDharani Lokamhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/589Upgrade dependancy version and cleanup pom file2023-11-16T16:40:54ZSolomon AyalewUpgrade dependancy version and cleanup pom file* Update dependency versions to mitigate vulnerabilities
* Consume the latest version of os-core-common which uses Spring-boot version 2.7.17
* Cleanup duplicate version numbers declared in pom file dependencies
* Remove version numbers ...* Update dependency versions to mitigate vulnerabilities
* Consume the latest version of os-core-common which uses Spring-boot version 2.7.17
* Cleanup duplicate version numbers declared in pom file dependencies
* Remove version numbers defined that downgrade the default version in pom file dependencies
* Remove duplicate dependency pulling
Issue: https://community.opengroup.org/osdu/platform/security-and-compliance/home/-/issues/160M22 - Release 0.25https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/588Added /liveness_check2023-11-21T19:08:32ZRiabokon Stanislav(EPAM)[GCP]Added /liveness_check## Type of change
- [X] Bug Fix
- [ ] Feature
https://community.opengroup.org/osdu/platform/system/schema-service/-/issues/139
## Does this introduce a change in the core logic?
- [YES]
## Does this introduce a change in the cloud pr...## Type of change
- [X] Bug Fix
- [ ] Feature
https://community.opengroup.org/osdu/platform/system/schema-service/-/issues/139
## Does this introduce a change in the core logic?
- [YES]
## Does this introduce a change in the cloud provider implementation, if so which cloud?
- [x] AWS
- [x] Azure
- [x] Google Cloud
- [x] IBM
## Does this introduce a breaking change?
- [NO]
## What is the current behavior?
## What is the new/expected behavior?
Added /liveness_check. Added int tests. Updated swagger doc.
## Have you added/updated Unit Tests and Integration Tests?
YESM22 - Release 0.25Riabokon Stanislav(EPAM)[GCP]Riabokon Stanislav(EPAM)[GCP]https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/586return 400 as statuscode when invalid input params in get api2023-11-15T13:28:59ZVidyaDharani Lokamreturn 400 as statuscode when invalid input params in get apiIssue reference: [!132](https://community.opengroup.org/osdu/platform/system/schema-service/-/issues/132)
Currently the get api for getSchemaInfoList returning 200(OK) as status code even if contains any unknown requestparams or typos a...Issue reference: [!132](https://community.opengroup.org/osdu/platform/system/schema-service/-/issues/132)
Currently the get api for getSchemaInfoList returning 200(OK) as status code even if contains any unknown requestparams or typos as mentioned in the above issue.
- To fix this added a validation logic to allow only the defined requestparams(authority, source, entity, schema version major, schema version minor, schema version patch, status, scope, latestVersion, limit, offset). In case of any unknown requestparams or typos the code will return 400(Bad request).M22 - Release 0.25VidyaDharani LokamVidyaDharani Lokamhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/583add clean schemas job2023-10-30T09:06:50Zsaketh somarajuadd clean schemas job- Add clean schemas job to delete test schemas created for integration tests.
- Related to https://community.opengroup.org/osdu/platform/deployment-and-operations/operations-azure/schema-cleanup- Add clean schemas job to delete test schemas created for integration tests.
- Related to https://community.opengroup.org/osdu/platform/deployment-and-operations/operations-azure/schema-cleanupM22 - Release 0.25saketh somarajusaketh somarajuhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/582Passing AKS name as an environment variable for schema data init job2023-10-25T13:07:47ZRitushi ShankerPassing AKS name as an environment variable for schema data init job**What is happening :** Currently, during schema data initialization job, the name of the AKS Cluster in which schemas are to be loaded are fetched via az commands.
**What is the fix :** Instead of using az commands, we simply pass the ...**What is happening :** Currently, during schema data initialization job, the name of the AKS Cluster in which schemas are to be loaded are fetched via az commands.
**What is the fix :** Instead of using az commands, we simply pass the correct AKS cluster name as an environment variable to the shell file that loads the schemas.Ritushi ShankerRitushi Shankerhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/580Cherry-pick 'changes in IBM bootstrap.sh to fix bootstrap issue' into release...2023-10-20T07:52:58ZDavid Diederichd.diederich@opengroup.orgCherry-pick 'changes in IBM bootstrap.sh to fix bootstrap issue' into release/0.24**Original MR**: !574
### 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**: !574
### 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/schema-service/-/pipelines/new?ref=cherry-pick-for-574)M21 - Release 0.24David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/579Cherry-pick 'Full Upgrade of First Party Library Dependencies' into release/0.242023-10-20T07:54:50ZDavid Diederichd.diederich@opengroup.orgCherry-pick 'Full Upgrade of First Party Library Dependencies' into release/0.24**Original MR**: !576
### 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**: !576
### 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/schema-service/-/pipelines/new?ref=cherry-pick-for-576)M21 - Release 0.24David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/578Cherry-pick 'Full Upgrade of First Party Library Dependencies' into release/0.242023-10-20T07:54:24ZDavid Diederichd.diederich@opengroup.orgCherry-pick 'Full Upgrade of First Party Library Dependencies' into release/0.24**Original MR**: !565
### 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**: !565
### 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/schema-service/-/pipelines/new?ref=cherry-pick-for-565)M21 - Release 0.24David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/576Full Upgrade of First Party Library Dependencies2023-10-20T06:14:15ZChad LeongFull Upgrade of First Party Library DependenciesThis generated MR upgrades the first party libraries (other OSDU libraries) to utilize the latest release.
The intent is to keep all dependent libraries up to date.
This upgrade can be merged immediately without further approval if the C...This generated MR upgrades the first party libraries (other OSDU libraries) to utilize the latest release.
The intent is to keep all dependent libraries up to date.
This upgrade can be merged immediately without further approval if the CI pipeline reports success.
If this MR has failed, we need to work with the maintainers and affected provider teams to find a solution.
### Dependency Information Before the Upgrade
```
Branch: master
SHA: 92b85a2e4e045465725c62a5f57a1febd5b63e34
Maven: 0.25.0-SNAPSHOT
```
| Maven Dependencies | _Root_ | testing/ |
| ------------------ | -------------- | -------- |
| core-lib-azure | 0.23.2 | 0.23.2 |
| core-lib-gc | 0.24.0 | |
| os-core-lib-aws | 0.24.0 | 0.24.0 |
| obm | 0.24.0 | |
| oqm | 0.24.0 | |
| os-core-common | 0.24.0, 0.23.3 | 0.23.3 |
| os-core-lib-ibm | 0.23.0 | 0.23.0 |
| osm | 0.24.0 | |
### Dependency Information After the Upgrade
```
Branch: dependency-upgrade
SHA: f137cd3257b3b0b9f8bb987496667c99c2107ce7
Maven: 0.25.0-SNAPSHOT
```
| Maven Dependencies | _Root_ | testing/ |
| ------------------ | ------ | -------- |
| core-lib-azure | 0.24.0 | 0.24.0 |
| core-lib-gc | 0.24.0 | |
| os-core-lib-aws | 0.24.0 | 0.24.0 |
| obm | 0.24.0 | |
| oqm | 0.24.0 | |
| os-core-common | 0.24.0 | 0.24.0 |
| os-core-lib-ibm | 0.24.0 | 0.24.0 |
| osm | 0.24.0 | |M21 - Release 0.24https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/575delta changes for schema2023-10-17T21:40:04ZNathan Strelserdelta changes for schemaNathan StrelserNathan Strelserhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/574changes in IBM bootstrap.sh to fix bootstrap issue2023-10-20T06:18:18ZIsha Kumarichanges in IBM bootstrap.sh to fix bootstrap issue changes in IBM bootstrap.sh to fix bootstrap issue changes in IBM bootstrap.sh to fix bootstrap issueM21 - Release 0.24Isha KumariIsha Kumarihttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/573Cherry-pick 'Upgrade First Party Library Dependencies for Release 0.24' into ...2023-10-17T11:33:01ZSrinivasan NarayananCherry-pick 'Upgrade First Party Library Dependencies for Release 0.24' into release/0.24**Original MR**: !572
### 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**: !572
### 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/schema-service/-/pipelines/new?ref=cherry-pick-for-572)M21 - Release 0.24David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/572Upgrade First Party Library Dependencies for Release 0.242023-10-17T10:09:55ZDavid Diederichd.diederich@opengroup.orgUpgrade First Party Library Dependencies for Release 0.24This 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: 2490db5f7ab9fd45c02bbefe86bbcd65d7e5cc35
Maven: 0.24.0-SNAPSHOT
```
| Maven Dependencies | _Root_ | testing/ |
| ----------------------------------------------------- | ------------------ | -------- |
| core-lib-azure | 0.14.0-rc2 | 0.6.1 |
| core-lib-gc | 0.23.0 | |
| os-core-lib-aws | 0.23.0 | 0.23.0 |
| obm | 0.23.0 | |
| oqm | 0.23.0 | |
| os-core-common | 0.23.1, 0.19.0-rc6 | 0.3.23 |
| os-core-lib-ibm | 0.16.0-rc1 | 0.15.2 |
| osm | 0.23.0 | |
| (3rd Party) net.minidev.json-smart | 2.4.9 | 2.3 |
| (3rd Party) org.apache.logging.log4j.log4j-api | 2.17.1, 2.17.2 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-core | 2.17.1 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-jul | 2.17.1 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-slf4j-impl | 2.17.1 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-to-slf4j | 2.17.1, 2.17.2 | 2.13.3 |
| (3rd Party) org.springframework.spring-webflux | 5.3.12 | |
| (3rd Party) org.yaml.snakeyaml | 2.0 | 1.26 |
```
Critical: Found Vulnerable Spring WebFlux dependency (<5.2.20 || >=5.3.0 <5.3.18)
└─ _Root_
└─ org.opengroup.osdu.os-schema-azure == 0.24.0-SNAPSHOT
└─ org.springframework.boot.spring-boot-starter-webflux == 2.6.6
└─ org.springframework.spring-webflux == 5.3.12
```
### Dependency Information After the Upgrade
```
Branch: dependency-upgrade-2
SHA: c5fbaae37ac192de847fee2c799272dc0858ed9d
Maven: 0.24.0-SNAPSHOT
```
| Maven Dependencies | _Root_ | testing/ |
| ----------------------------------------------------- | ------------------ | -------- |
| core-lib-azure | 0.14.0-rc2 | 0.6.1 |
| core-lib-gc | 0.24.0 | |
| os-core-lib-aws | 0.24.0 | 0.24.0 |
| obm | 0.24.0 | |
| oqm | 0.24.0 | |
| os-core-common | 0.24.0, 0.19.0-rc6 | 0.3.23 |
| os-core-lib-ibm | 0.16.0-rc1 | 0.15.2 |
| osm | 0.24.0 | |
| (3rd Party) net.minidev.json-smart | 2.4.9 | 2.3 |
| (3rd Party) org.apache.logging.log4j.log4j-api | 2.17.1, 2.17.2 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-core | 2.17.1 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-jul | 2.17.1 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-slf4j-impl | 2.17.1 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-to-slf4j | 2.17.1, 2.17.2 | 2.13.3 |
| (3rd Party) org.springframework.spring-webflux | 5.3.12 | |
| (3rd Party) org.yaml.snakeyaml | 2.0 | 1.26 |
```
Critical: Found Vulnerable Spring WebFlux dependency (<5.2.20 || >=5.3.0 <5.3.18)
└─ _Root_
└─ org.opengroup.osdu.os-schema-azure == 0.24.0-SNAPSHOT
└─ org.springframework.boot.spring-boot-starter-webflux == 2.6.6
└─ org.springframework.spring-webflux == 5.3.12
```M21 - Release 0.24https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/571merge aws schema2023-10-18T09:19:10ZYunhua Koglinmerge aws schemaM21 - Release 0.24Yunhua KoglinYunhua Koglinhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/570[GONRG-7917] added replicas variable in helm2023-10-13T10:53:30ZAleksandr Primachenko [EPAM / GCP][GONRG-7917] added replicas variable in helmM21 - Release 0.24Aleksandr Primachenko [EPAM / GCP]Aleksandr Primachenko [EPAM / GCP]https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/569merge code to gitlab2023-10-12T10:21:48ZYunhua Koglinmerge code to gitlabM21 - Release 0.24Derek HudsonDerek Hudson