feat: register gateway to additional discovery service #3068

achmelo · 2023-09-07T14:11:50Z

Description

By providing a list of URLs, the gateway will attempt to register for these services. Data from additional discovery services (e.g. central discovery service) will not be used for routing or service info endpoint. The purpose of this registration is for clients outside of the API ML cluster to know about other gateways, e.g. cloud gateway can use this registry for routing to clusters/domains.

Linked to #2425
Part of the #2651

Type of change

Please delete options that are not relevant.

(fix) Bug fix (non-breaking change which fixes an issue)
(feat) New feature (non-breaking change which adds functionality)
(docs) Change in a documentation
(refactor) Refactor the code
(chore) Chore, repository cleanup, updates the dependencies.
(BREAKING CHANGE or !) Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas. In JS I did provide JSDoc
I have made corresponding changes to the documentation
My changes generate no new warnings
I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes
The java tests in the area I was working on leverage @nested annotations
Any dependent changes have been merged and published in downstream modules

For more details about how should the code look like read the Contributing guideline

Signed-off-by: achmelo <[email protected]>

* Added routing integration tests, and some fixes Signed-off-by: Elena Kubantseva <[email protected]> * More integration tests and fixes Signed-off-by: Elena Kubantseva <[email protected]> * Addressed review comments Signed-off-by: Elena Kubantseva <[email protected]> --------- Signed-off-by: Elena Kubantseva <[email protected]> Signed-off-by: achmelo <[email protected]>

* chore: move babel to dev, modify webpack config, spring security Signed-off-by: achmelo <[email protected]> * update npm lock Signed-off-by: achmelo <[email protected]> * old component update Signed-off-by: achmelo <[email protected]> --------- Signed-off-by: achmelo <[email protected]>

Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> Signed-off-by: achmelo <[email protected]>

Signed-off-by: achmelo <[email protected]>

…ike (#3053) * chore[ui]: Update UI per suggestions from UX (#3047) * chore[ui]: Update UI per suggestions from UX Update screens to closer align to figma. Signed-off-by: Mike Simpson <[email protected]> * style inputs and focus and hover --------- Signed-off-by: Mike Simpson <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> * wip Signed-off-by: at670475 <[email protected]> * fix zowe ui Signed-off-by: at670475 <[email protected]> * address sonar complains Signed-off-by: at670475 <[email protected]> * add tests Signed-off-by: at670475 <[email protected]> * add test Signed-off-by: at670475 <[email protected]> * add test Signed-off-by: at670475 <[email protected]> * fix dev mode and navbar Signed-off-by: at670475 <[email protected]> --------- Signed-off-by: Mike Simpson <[email protected]> Signed-off-by: at670475 <[email protected]> Co-authored-by: ms895784 <[email protected]> Signed-off-by: achmelo <[email protected]>

Signed-off-by: alexandr cumarav <[email protected]> Co-authored-by: alexandr cumarav <[email protected]> Signed-off-by: achmelo <[email protected]>

* feat(gateway): Reformatted and changed messages a little bit, also changed the container to use sets instead of a list Signed-off-by: matejpopda <[email protected]> * feat(gateway): Work on SSO verification Signed-off-by: matejpopda <[email protected]> * feat(gateway): Fixed style problems Signed-off-by: matejpopda <[email protected]> * feat(gateway): Fixed tests Signed-off-by: matejpopda <[email protected]> * feat(gateway): Coverage Signed-off-by: matejpopda <[email protected]> * feat(gateway): fixed warnings Signed-off-by: matejpopda <[email protected]> * feat(gateway): fixed integration tests Signed-off-by: matejpopda <[email protected]> * feat(gateway): small refactoring Signed-off-by: matejpopda <[email protected]> * feat(gateway): removed some files from PR Signed-off-by: matejpopda <[email protected]> * feat(gateway): addressed some comments Signed-off-by: matejpopda <[email protected]> --------- Signed-off-by: matejpopda <[email protected]> Signed-off-by: achmelo <[email protected]>

Signed-off-by: achmelo <[email protected]>

…ay in request header (#3046) * Add new filter for re-sending auth source. Signed-off-by: Petr Weinfurt <[email protected]> * add license text Signed-off-by: Petr Weinfurt <[email protected]> * Read certificate from request header Signed-off-by: at670475 <[email protected]> * add integration test Signed-off-by: at670475 <[email protected]> * add header to test Signed-off-by: at670475 <[email protected]> * add unit test Signed-off-by: at670475 <[email protected]> * add error to the log Signed-off-by: at670475 <[email protected]> * optmize code and check for certificate in the attibute Signed-off-by: at670475 <[email protected]> * Add certificate signature to the additional header Signed-off-by: Petr Weinfurt <[email protected]> * Add public rest endpoint to provide JWK set. Signed-off-by: Petr Weinfurt <[email protected]> * WellKnownRestController and tests Signed-off-by: Petr Weinfurt <[email protected]> * add licenses Signed-off-by: Petr Weinfurt <[email protected]> * Add simple integration test Signed-off-by: Petr Weinfurt <[email protected]> * Add integration tests for well-known endpoint. Signed-off-by: Petr Weinfurt <[email protected]> * Add some javadoc. Signed-off-by: Petr Weinfurt <[email protected]> * Fix integration test Signed-off-by: Petr Weinfurt <[email protected]> * validate cert Signed-off-by: at670475 <[email protected]> * Simplify retrieving the public key. Signed-off-by: Petr Weinfurt <[email protected]> * Fix for integration tests Signed-off-by: Petr Weinfurt <[email protected]> * Cloud gateway provides certificate chain on public endpoint (instead of public key). Certificate is sent in Client-Cert header. Signed-off-by: Petr Weinfurt <[email protected]> * Cloud gateway implementation fixes Signed-off-by: Petr Weinfurt <[email protected]> * Categorize certs filter WIP Signed-off-by: Petr Weinfurt <[email protected]> * Merge with master branch Signed-off-by: Petr Weinfurt <[email protected]> * Fix casting exception Signed-off-by: Petr Weinfurt <[email protected]> * Cleanup. Add log messages. Signed-off-by: Petr Weinfurt <[email protected]> * Fixes Signed-off-by: Petr Weinfurt <[email protected]> * Add tests for CategorizeCertsFilter Signed-off-by: Petr Weinfurt <[email protected]> * Add CertificateValidatorTest Signed-off-by: Petr Weinfurt <[email protected]> * Add caching trusted certificates Signed-off-by: Petr Weinfurt <[email protected]> * Fix message types Signed-off-by: Petr Weinfurt <[email protected]> * Add javadoc Signed-off-by: Petr Weinfurt <[email protected]> * remove unnecessary dependency Signed-off-by: Petr Weinfurt <[email protected]> * Prepare SSL Auth for integration test. Signed-off-by: Petr Weinfurt <[email protected]> * Remove obsolete test Signed-off-by: Petr Weinfurt <[email protected]> * Add new runtime variables to start.sh files. Signed-off-by: Petr Weinfurt <[email protected]> * Add new options to manifest.yaml files Signed-off-by: Petr Weinfurt <[email protected]> * fix integration test Signed-off-by: Petr Weinfurt <[email protected]> * Update IT Signed-off-by: Petr Weinfurt <[email protected]> * Update keystore for IT Signed-off-by: Petr Weinfurt <[email protected]> * Update error messages Signed-off-by: Petr Weinfurt <[email protected]> * Update common name in the certificate Signed-off-by: Petr Weinfurt <[email protected]> * Update common name in the certificate Signed-off-by: Petr Weinfurt <[email protected]> * Update common name in the certificate Signed-off-by: Petr Weinfurt <[email protected]> * Update common name in the certificate Signed-off-by: Petr Weinfurt <[email protected]> * Add tests for CategorizeCertsFilter Signed-off-by: Petr Weinfurt <[email protected]> * Add CA certificate to keystore Signed-off-by: Petr Weinfurt <[email protected]> * Add unit tests Signed-off-by: Petr Weinfurt <[email protected]> * disable forwarded cert in gateway on localhost Signed-off-by: Petr Weinfurt <[email protected]> * Resolve code review Signed-off-by: Petr Weinfurt <[email protected]> * Increase coverage Signed-off-by: Petr Weinfurt <[email protected]> * Externalize the update public keys function to the CategorizeCertsFilter. Update tests. Signed-off-by: Petr Weinfurt <[email protected]> * Increase coverage. Signed-off-by: Petr Weinfurt <[email protected]> --------- Signed-off-by: Petr Weinfurt <[email protected]> Signed-off-by: at670475 <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: achmelo <[email protected]> Signed-off-by: achmelo <[email protected]>

--------- Signed-off-by: at670475 <[email protected]> Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Carle <[email protected]> Signed-off-by: achmelo <[email protected]>

Signed-off-by: achmelo <[email protected]>

config/local/gateway-service.yml

discovery-service/src/main/resources/application.yml

gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java

...-tests/src/test/java/org/zowe/apiml/functional/gateway/DiscoveryServiceRegistrationTest.java

Signed-off-by: achmelo <[email protected]>

gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java

Signed-off-by: achmelo <[email protected]>

gateway-service/src/test/java/org/zowe/apiml/gateway/config/DiscoveryClientBeanTest.java

Signed-off-by: achmelo <[email protected]>

config/local/gateway-service.yml

gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientWrapper.java

gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java

Signed-off-by: achmelo <[email protected]>

weinfurt

Looks good

This reverts commit 5cad7ed.

Signed-off-by: achmelo <[email protected]>

This reverts commit 956dbd6 Signed-off-by: achmelo <[email protected]>

…ltiple_ds

Signed-off-by: achmelo <[email protected]>

sonarcloud · 2023-09-13T10:37:58Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
1 Code Smell

91.9% Coverage
1.5% Duplication

The version of Java (11.0.20) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

* GH6883 review comments (#3072) Signed-off-by: alexandr cumarav <[email protected]> * feat: register gateway to additional discovery service (#3068) * chore: move babel to dev, modify webpack config, spring security Signed-off-by: achmelo <[email protected]> * fix: Integration tests for new Cloud Gateway routing (#3044) * Added routing integration tests, and some fixes Signed-off-by: Elena Kubantseva <[email protected]> * More integration tests and fixes Signed-off-by: Elena Kubantseva <[email protected]> * Addressed review comments Signed-off-by: Elena Kubantseva <[email protected]> --------- Signed-off-by: Elena Kubantseva <[email protected]> Signed-off-by: achmelo <[email protected]> * chore: update dependencies (#3048) * chore: move babel to dev, modify webpack config, spring security Signed-off-by: achmelo <[email protected]> * update npm lock Signed-off-by: achmelo <[email protected]> * old component update Signed-off-by: achmelo <[email protected]> --------- Signed-off-by: achmelo <[email protected]> * remove dependency from spring enabler (#3052) Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> Signed-off-by: achmelo <[email protected]> * [skip ci] Update version Signed-off-by: achmelo <[email protected]> * [Gradle Release plugin] [skip ci] Before tag commit 'v2.10.15'. Signed-off-by: achmelo <[email protected]> * [Gradle Release plugin] Create new version: 'v2.11.0-SNAPSHOT'. Signed-off-by: achmelo <[email protected]> * [skip ci] Update version Signed-off-by: achmelo <[email protected]> * [Gradle Release plugin] [skip ci] Before tag commit 'v2.11.0'. Signed-off-by: achmelo <[email protected]> * [Gradle Release plugin] Create new version: 'v2.11.1-SNAPSHOT'. Signed-off-by: achmelo <[email protected]> * chore: Update UI per suggestions from UX + add keyboard shortcuts - Mike (#3053) * chore[ui]: Update UI per suggestions from UX (#3047) * chore[ui]: Update UI per suggestions from UX Update screens to closer align to figma. Signed-off-by: Mike Simpson <[email protected]> * style inputs and focus and hover --------- Signed-off-by: Mike Simpson <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> * wip Signed-off-by: at670475 <[email protected]> * fix zowe ui Signed-off-by: at670475 <[email protected]> * address sonar complains Signed-off-by: at670475 <[email protected]> * add tests Signed-off-by: at670475 <[email protected]> * add test Signed-off-by: at670475 <[email protected]> * add test Signed-off-by: at670475 <[email protected]> * fix dev mode and navbar Signed-off-by: at670475 <[email protected]> --------- Signed-off-by: Mike Simpson <[email protected]> Signed-off-by: at670475 <[email protected]> Co-authored-by: ms895784 <[email protected]> Signed-off-by: achmelo <[email protected]> * GH2883 Move ServicesInfoService to the apiml-common (#3056) Signed-off-by: alexandr cumarav <[email protected]> Co-authored-by: alexandr cumarav <[email protected]> Signed-off-by: achmelo <[email protected]> * feat: verify service SSO support from API ML (#3054) * feat(gateway): Reformatted and changed messages a little bit, also changed the container to use sets instead of a list Signed-off-by: matejpopda <[email protected]> * feat(gateway): Work on SSO verification Signed-off-by: matejpopda <[email protected]> * feat(gateway): Fixed style problems Signed-off-by: matejpopda <[email protected]> * feat(gateway): Fixed tests Signed-off-by: matejpopda <[email protected]> * feat(gateway): Coverage Signed-off-by: matejpopda <[email protected]> * feat(gateway): fixed warnings Signed-off-by: matejpopda <[email protected]> * feat(gateway): fixed integration tests Signed-off-by: matejpopda <[email protected]> * feat(gateway): small refactoring Signed-off-by: matejpopda <[email protected]> * feat(gateway): removed some files from PR Signed-off-by: matejpopda <[email protected]> * feat(gateway): addressed some comments Signed-off-by: matejpopda <[email protected]> --------- Signed-off-by: matejpopda <[email protected]> Signed-off-by: achmelo <[email protected]> * register GW into 2 DS with one being primary for auth, service info,.. Signed-off-by: achmelo <[email protected]> * wrapper for discovery clients Signed-off-by: achmelo <[email protected]> * feat: Forward client certificate from central gateway to domain gateway in request header (#3046) * Add new filter for re-sending auth source. Signed-off-by: Petr Weinfurt <[email protected]> * add license text Signed-off-by: Petr Weinfurt <[email protected]> * Read certificate from request header Signed-off-by: at670475 <[email protected]> * add integration test Signed-off-by: at670475 <[email protected]> * add header to test Signed-off-by: at670475 <[email protected]> * add unit test Signed-off-by: at670475 <[email protected]> * add error to the log Signed-off-by: at670475 <[email protected]> * optmize code and check for certificate in the attibute Signed-off-by: at670475 <[email protected]> * Add certificate signature to the additional header Signed-off-by: Petr Weinfurt <[email protected]> * Add public rest endpoint to provide JWK set. Signed-off-by: Petr Weinfurt <[email protected]> * WellKnownRestController and tests Signed-off-by: Petr Weinfurt <[email protected]> * add licenses Signed-off-by: Petr Weinfurt <[email protected]> * Add simple integration test Signed-off-by: Petr Weinfurt <[email protected]> * Add integration tests for well-known endpoint. Signed-off-by: Petr Weinfurt <[email protected]> * Add some javadoc. Signed-off-by: Petr Weinfurt <[email protected]> * Fix integration test Signed-off-by: Petr Weinfurt <[email protected]> * validate cert Signed-off-by: at670475 <[email protected]> * Simplify retrieving the public key. Signed-off-by: Petr Weinfurt <[email protected]> * Fix for integration tests Signed-off-by: Petr Weinfurt <[email protected]> * Cloud gateway provides certificate chain on public endpoint (instead of public key). Certificate is sent in Client-Cert header. Signed-off-by: Petr Weinfurt <[email protected]> * Cloud gateway implementation fixes Signed-off-by: Petr Weinfurt <[email protected]> * Categorize certs filter WIP Signed-off-by: Petr Weinfurt <[email protected]> * Merge with master branch Signed-off-by: Petr Weinfurt <[email protected]> * Fix casting exception Signed-off-by: Petr Weinfurt <[email protected]> * Cleanup. Add log messages. Signed-off-by: Petr Weinfurt <[email protected]> * Fixes Signed-off-by: Petr Weinfurt <[email protected]> * Add tests for CategorizeCertsFilter Signed-off-by: Petr Weinfurt <[email protected]> * Add CertificateValidatorTest Signed-off-by: Petr Weinfurt <[email protected]> * Add caching trusted certificates Signed-off-by: Petr Weinfurt <[email protected]> * Fix message types Signed-off-by: Petr Weinfurt <[email protected]> * Add javadoc Signed-off-by: Petr Weinfurt <[email protected]> * remove unnecessary dependency Signed-off-by: Petr Weinfurt <[email protected]> * Prepare SSL Auth for integration test. Signed-off-by: Petr Weinfurt <[email protected]> * Remove obsolete test Signed-off-by: Petr Weinfurt <[email protected]> * Add new runtime variables to start.sh files. Signed-off-by: Petr Weinfurt <[email protected]> * Add new options to manifest.yaml files Signed-off-by: Petr Weinfurt <[email protected]> * fix integration test Signed-off-by: Petr Weinfurt <[email protected]> * Update IT Signed-off-by: Petr Weinfurt <[email protected]> * Update keystore for IT Signed-off-by: Petr Weinfurt <[email protected]> * Update error messages Signed-off-by: Petr Weinfurt <[email protected]> * Update common name in the certificate Signed-off-by: Petr Weinfurt <[email protected]> * Update common name in the certificate Signed-off-by: Petr Weinfurt <[email protected]> * Update common name in the certificate Signed-off-by: Petr Weinfurt <[email protected]> * Update common name in the certificate Signed-off-by: Petr Weinfurt <[email protected]> * Add tests for CategorizeCertsFilter Signed-off-by: Petr Weinfurt <[email protected]> * Add CA certificate to keystore Signed-off-by: Petr Weinfurt <[email protected]> * Add unit tests Signed-off-by: Petr Weinfurt <[email protected]> * disable forwarded cert in gateway on localhost Signed-off-by: Petr Weinfurt <[email protected]> * Resolve code review Signed-off-by: Petr Weinfurt <[email protected]> * Increase coverage Signed-off-by: Petr Weinfurt <[email protected]> * Externalize the update public keys function to the CategorizeCertsFilter. Update tests. Signed-off-by: Petr Weinfurt <[email protected]> * Increase coverage. Signed-off-by: Petr Weinfurt <[email protected]> --------- Signed-off-by: Petr Weinfurt <[email protected]> Signed-off-by: at670475 <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: achmelo <[email protected]> Signed-off-by: achmelo <[email protected]> * chore: add media icon and change link color (#3057) --------- Signed-off-by: at670475 <[email protected]> Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Carle <[email protected]> Signed-off-by: achmelo <[email protected]> * fix unregistering Signed-off-by: achmelo <[email protected]> * cleanup Signed-off-by: achmelo <[email protected]> * IT for multiple registration Signed-off-by: achmelo <[email protected]> * revert reading of DC list to original version Signed-off-by: achmelo <[email protected]> * revert checkstyle Signed-off-by: achmelo <[email protected]> * REMOVE! hardcode DS url for test Signed-off-by: achmelo <[email protected]> * run new job only Signed-off-by: achmelo <[email protected]> * skip tests Signed-off-by: achmelo <[email protected]> * styles Signed-off-by: achmelo <[email protected]> * align with original CITests Signed-off-by: achmelo <[email protected]> * add metrics service test Signed-off-by: achmelo <[email protected]> * Revert "run new job only" This reverts commit 530047e. Signed-off-by: achmelo <[email protected]> * fix: Fixes for API Catalog standalone mode (#3050) --------- Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> Signed-off-by: achmelo <[email protected]> * fix: header in api portal (#3059) Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> Signed-off-by: achmelo <[email protected]> * verify registration with second DS Signed-off-by: achmelo <[email protected]> * hardcode discovery host Signed-off-by: achmelo <[email protected]> * revert local auth provider Signed-off-by: achmelo <[email protected]> * getting the list of discovery services from configuration Signed-off-by: sj895092 <[email protected]> Signed-off-by: achmelo <[email protected]> * create bean conditionally Signed-off-by: achmelo <[email protected]> * changed the name from discoveryServiceUrlsList to centralRegistryUrls Signed-off-by: sj895092 <[email protected]> Signed-off-by: achmelo <[email protected]> * Changed name of a variable to url Signed-off-by: sj895092 <[email protected]> Signed-off-by: achmelo <[email protected]> * enable second registration in CITests Signed-off-by: achmelo <[email protected]> * default value must be empty Signed-off-by: achmelo <[email protected]> * revert logging level Signed-off-by: achmelo <[email protected]> * fix styles Signed-off-by: achmelo <[email protected]> * code review, store unit test reports Signed-off-by: achmelo <[email protected]> * increase test coverage Signed-off-by: achmelo <[email protected]> * add licenses Signed-off-by: achmelo <[email protected]> * AOP check is done also inside getTargetObject Signed-off-by: achmelo <[email protected]> * remove empty test Signed-off-by: achmelo <[email protected]> * code review Signed-off-by: achmelo <[email protected]> * Revert "code review" This reverts commit 5cad7ed. * shutdown discoveryclient in test Signed-off-by: achmelo <[email protected]> * Revert "Revert "code review"" This reverts commit 956dbd6 Signed-off-by: achmelo <[email protected]> * skip test Signed-off-by: achmelo <[email protected]> * debug system exit Signed-off-by: achmelo <[email protected]> * return test Signed-off-by: achmelo <[email protected]> * remove debugging Signed-off-by: achmelo <[email protected]> * remove system exit Signed-off-by: achmelo <[email protected]> * separate startup check from build Signed-off-by: achmelo <[email protected]> --------- Signed-off-by: achmelo <[email protected]> Signed-off-by: Elena Kubantseva <[email protected]> Signed-off-by: Pablo Hernán Carle <[email protected]> Signed-off-by: Mike Simpson <[email protected]> Signed-off-by: at670475 <[email protected]> Signed-off-by: alexandr cumarav <[email protected]> Signed-off-by: matejpopda <[email protected]> Signed-off-by: Petr Weinfurt <[email protected]> Signed-off-by: sj895092 <[email protected]> Co-authored-by: Elena Kubantseva <[email protected]> Co-authored-by: Pablo Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Zowe Robot <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: ms895784 <[email protected]> Co-authored-by: cumarav <[email protected]> Co-authored-by: alexandr cumarav <[email protected]> Co-authored-by: matejpopda <[email protected]> Co-authored-by: Petr Weinfurt <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: sj895092 <[email protected]> * feat: Add centralRegistryUrls config parameter to zowe.yaml (#3069) * (feat) Add centralRegistryUrls config parameter to zowe.yaml Signed-off-by: Petr Weinfurt <[email protected]> * Add cert forwarding configuration to schema Signed-off-by: Petr Weinfurt <[email protected]> * Add cert forwarding configuration to schema Signed-off-by: Petr Weinfurt <[email protected]> * add mock services to prevent shutdown of gateway Signed-off-by: achmelo <[email protected]> --------- Signed-off-by: Petr Weinfurt <[email protected]> Signed-off-by: achmelo <[email protected]> Co-authored-by: achmelo <[email protected]> Co-authored-by: achmelo <[email protected]> * chore: Update dependencies to avoid vulnerabilities V2 (#3074) Signed-off-by: Pavel Jareš <[email protected]> * chore: Add html-loader in webpack config (#3073) * Add html loader to build html files Signed-off-by: at670475 <[email protected]> * add html-loader as dev-dependency Signed-off-by: at670475 <[email protected]> * remove comment Signed-off-by: at670475 <[email protected]> * custom-logo could have double slashes Signed-off-by: Pablo Hernán Carle <[email protected]> * fix url Signed-off-by: Pablo Hernán Carle <[email protected]> --------- Signed-off-by: at670475 <[email protected]> Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> * chore[ui]: Update UI per suggestions from UX Update screens with notes from jan/mirek Signed-off-by: Mike Simpson <[email protected]> * style fab button * rebase * flex direction column footer * unbroke the dashboard footer, now details has too many scrollbars * Supress more swagger details * Feeback in own component, hide license on details * Footer wrapping better, hide feedback button on small screens * mobile navigations * changed favicon * fix menu animation, move open/close fn * img size * wip changes for tiles? * Looks ok on small, not so good on big * flexing tiles * lint fixup * Hardcode tech docs, param for feedback * remove margin on techdoc in mobile menu * more feedback tweaks * fixed up header to be img text img * fix flex issues, mobile zowe links, footer tweaks * text align * merge * fix scroll issue * fix lint error * cleanup swagger param spacing * space between try it out button and param header, space between params, hide example * Make brett happier with fonts * Pivot from provided html for to custom react form for feedback --------- Signed-off-by: alexandr cumarav <[email protected]> Signed-off-by: achmelo <[email protected]> Signed-off-by: Elena Kubantseva <[email protected]> Signed-off-by: Pablo Hernán Carle <[email protected]> Signed-off-by: Mike Simpson <[email protected]> Signed-off-by: at670475 <[email protected]> Signed-off-by: matejpopda <[email protected]> Signed-off-by: Petr Weinfurt <[email protected]> Signed-off-by: sj895092 <[email protected]> Signed-off-by: Pavel Jareš <[email protected]> Co-authored-by: cumarav <[email protected]> Co-authored-by: achmelo <[email protected]> Co-authored-by: Elena Kubantseva <[email protected]> Co-authored-by: Pablo Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Zowe Robot <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: alexandr cumarav <[email protected]> Co-authored-by: matejpopda <[email protected]> Co-authored-by: Petr Weinfurt <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: sj895092 <[email protected]> Co-authored-by: achmelo <[email protected]> Co-authored-by: Pavel Jareš <[email protected]> Co-authored-by: Brian Lee <[email protected]>

pull-request-size bot added the size/L label Sep 7, 2023

github-actions bot added the Sensitive Sensitive change that requires peer review label Sep 7, 2023

achmelo and others added 28 commits September 7, 2023 16:12

chore: move babel to dev, modify webpack config, spring security

0e909a9

Signed-off-by: achmelo <[email protected]>

remove dependency from spring enabler (#3052)

6317cbf

Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> Signed-off-by: achmelo <[email protected]>

[skip ci] Update version

fa5e37d

Signed-off-by: achmelo <[email protected]>

[Gradle Release plugin] [skip ci] Before tag commit 'v2.10.15'.

406e71c

Signed-off-by: achmelo <[email protected]>

[Gradle Release plugin] Create new version: 'v2.11.0-SNAPSHOT'.

aaa0ef4

Signed-off-by: achmelo <[email protected]>

[skip ci] Update version

8889a4a

Signed-off-by: achmelo <[email protected]>

[Gradle Release plugin] [skip ci] Before tag commit 'v2.11.0'.

c2ef946

Signed-off-by: achmelo <[email protected]>

[Gradle Release plugin] Create new version: 'v2.11.1-SNAPSHOT'.

f90770b

Signed-off-by: achmelo <[email protected]>

GH2883 Move ServicesInfoService to the apiml-common (#3056)

16348b5

Signed-off-by: alexandr cumarav <[email protected]> Co-authored-by: alexandr cumarav <[email protected]> Signed-off-by: achmelo <[email protected]>

register GW into 2 DS with one being primary for auth, service info,..

13b83a1

Signed-off-by: achmelo <[email protected]>

wrapper for discovery clients

329fe29

Signed-off-by: achmelo <[email protected]>

fix unregistering

a2b37be

Signed-off-by: achmelo <[email protected]>

cleanup

b172b2f

Signed-off-by: achmelo <[email protected]>

IT for multiple registration

e48e661

Signed-off-by: achmelo <[email protected]>

revert reading of DC list to original version

d81d465

Signed-off-by: achmelo <[email protected]>

revert checkstyle

b3e8dd9

Signed-off-by: achmelo <[email protected]>

REMOVE! hardcode DS url for test

be7365f

Signed-off-by: achmelo <[email protected]>

run new job only

13cc61b

Signed-off-by: achmelo <[email protected]>

skip tests

5577e8b

Signed-off-by: achmelo <[email protected]>

styles

1af5b16

Signed-off-by: achmelo <[email protected]>

align with original CITests

f58d63b

Signed-off-by: achmelo <[email protected]>

add metrics service test

3394c03

Signed-off-by: achmelo <[email protected]>

pablocarle reviewed Sep 7, 2023

View reviewed changes

achmelo added 3 commits September 7, 2023 18:41

code review, store unit test reports

67f877c

Signed-off-by: achmelo <[email protected]>

increase test coverage

c43694b

Signed-off-by: achmelo <[email protected]>

add licenses

0b99e2f

Signed-off-by: achmelo <[email protected]>

pj892031 reviewed Sep 8, 2023

View reviewed changes

gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java Show resolved Hide resolved

AOP check is done also inside getTargetObject

a83ab73

Signed-off-by: achmelo <[email protected]>

pj892031 reviewed Sep 8, 2023

View reviewed changes

gateway-service/src/test/java/org/zowe/apiml/gateway/config/DiscoveryClientBeanTest.java Outdated Show resolved Hide resolved

remove empty test

9591b5e

Signed-off-by: achmelo <[email protected]>

pj892031 reviewed Sep 8, 2023

View reviewed changes

config/local/gateway-service.yml Show resolved Hide resolved

pj892031 reviewed Sep 8, 2023

View reviewed changes

gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientWrapper.java Show resolved Hide resolved

arxioly reviewed Sep 8, 2023

View reviewed changes

gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java Outdated Show resolved Hide resolved

arxioly reviewed Sep 8, 2023

View reviewed changes

gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java Outdated Show resolved Hide resolved

achmelo and others added 2 commits September 11, 2023 11:28

code review

5cad7ed

Signed-off-by: achmelo <[email protected]>

Merge branch 'v2.x.x' into reboot/gh2425/gw_multiple_ds

846ad85

weinfurt approved these changes Sep 11, 2023

View reviewed changes

achmelo added 10 commits September 12, 2023 10:08

Revert "code review"

956dbd6

This reverts commit 5cad7ed.

shutdown discoveryclient in test

4968c91

Signed-off-by: achmelo <[email protected]>

Revert "Revert "code review""

fcb2f63

This reverts commit 956dbd6 Signed-off-by: achmelo <[email protected]>

Merge remote-tracking branch 'origin/v2.x.x' into reboot/gh2425/gw_mu…

3859beb

…ltiple_ds

skip test

cfbdb58

Signed-off-by: achmelo <[email protected]>

debug system exit

499add9

Signed-off-by: achmelo <[email protected]>

return test

ea2dcb8

Signed-off-by: achmelo <[email protected]>

remove debugging

9730ef1

Signed-off-by: achmelo <[email protected]>

remove system exit

b0bbc3a

Signed-off-by: achmelo <[email protected]>

separate startup check from build

ac0c00b

Signed-off-by: achmelo <[email protected]>

achmelo merged commit e988df3 into v2.x.x Sep 13, 2023
32 of 33 checks passed

delete-merged-branch bot deleted the reboot/gh2425/gw_multiple_ds branch September 13, 2023 10:38

taban03 mentioned this pull request Sep 15, 2023

feat: More ux fixups #3081

Closed

15 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: register gateway to additional discovery service #3068

feat: register gateway to additional discovery service #3068

achmelo commented Sep 7, 2023

weinfurt left a comment

sonarcloud bot commented Sep 13, 2023

feat: register gateway to additional discovery service #3068

feat: register gateway to additional discovery service #3068

Conversation

achmelo commented Sep 7, 2023

Description

Type of change

Checklist:

weinfurt left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Sep 13, 2023