Skip to content

Commit

Permalink
feat: create zaas service, use cloud-gateway as gateway (#3568)
Browse files Browse the repository at this point in the history
* rafactor: Rename Gateway to ZAAS and first clean up of ZAAS (#3567)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* refactor: Adapt GH actions to support new ZAAS service (#3571)

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* chore: SCGW conformance migration buildable and unit tests passing (#3572)

---------

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Signed-off-by: Pablo Carle <pablocarle@users.noreply.github.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pavel Jareš <58428711+pj892031@users.noreply.github.com>

* chore: Fix and clean up the ZAAS's unit tests (#3573)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Co-authored-by: Pablo Carle <pablocarle@users.noreply.github.com>

* chore: move GW landing page (#3574)

* Move homepage to CGW

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* fix

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* polishing

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* renaming npm scripts and polishing

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* address comments

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* address comments

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* address comments

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

---------

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* chore:  Rename gateway-service to zaas (#3576)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Carle <pablocarle@users.noreply.github.com>

* chore: Rename Cloud Gateway to Gateway (#3577)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* chore: Clean up dependencies (#3578)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* config: Update configuration of Gateway and ZAAS (#3579)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* feat: Authentication endpoints on the new Gateway for back compatibility (#3583)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix images (#3588)

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* chore: Add health endpoint to GW and adjust the ZAAS one (#3580)

* update cert

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* move health indicator and adjust zaas one

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* fix checkstyle

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* fix

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* address comments

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* address comments

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* address comments

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

---------

Signed-off-by: at670475 <andrea.tabone@broadcom.com>
Co-authored-by: Pablo Carle <pablocarle@users.noreply.github.com>

* chore: fix tests (#3590)

---------

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix: Login into API Catalog fix (#3591)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* chore: fix tests (#3592)

* add bean for httpclient

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* change impl

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* use existing httpclient

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix configuration DTOs

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* use http client

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix use of constructor

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* gateway config

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* gateway service configuration integration tests

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* add metadata

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* remove non-jakarta swagger-core

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* add bootrun add-opens. protect actuator

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* remove old URLs from tests (still in code)

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix url assertion in passticket test

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* disable some tests

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* disable tests that will be fixed in future tasks

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fixes

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix auth forwarding

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* add debug config

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* move version endpoint from ZAAS to GW

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* remove ZUUL

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix cetnral GW routing

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fixes in mock zosmf (ltpa cookie not present)

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* pr review 1

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* pr review 2

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix checking HA by external port / not internal one

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix URLs of services endpoint

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* disable test about messaging

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* remove ltpa condition in mock zosmf

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* format, discoverable client bootRun

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* add custom request header for passticket scheme

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* update deprecated in integration-tests

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix apiml IDs

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* format / debug with gradle bootRun in discoverable client

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix checkstyle

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fixes

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix mock services

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* restore unintended file change

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix TokenFilterFactoryTest

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fixes

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix VersionControllerTest (gateway-service builds)

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fixes

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* test for routing with invalid credentials

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix Java agent ports

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* test improvements

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* set accepting forwared certificate as default in ZAAS

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* use bean for preauth

Signed-off-by: achmelo <a.chmelo@gmail.com>

* support of apiml.security.auth.jwt.customAuthHeader

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* include the whole security package

Signed-off-by: achmelo <a.chmelo@gmail.com>

* test description

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix/revert the logger levels setup

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* X509 fixes for services and registry endpoint

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* validate token for request

Signed-off-by: achmelo <a.chmelo@gmail.com>

* endpoint accessible with token

Signed-off-by: achmelo <a.chmelo@gmail.com>

* fix FIXME about setup cookie

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix default value of ZWE_configs_apiml_security_x509_acceptForwardedCert

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix default value of acceptForwardedCert in ZAAS

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix collecting of GW JaCoCo data

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix ZAAS endpoints URLs in ITs

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* debug

Signed-off-by: achmelo <a.chmelo@gmail.com>

* fixes

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* improvement

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix default port of ZAAS

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* debug zss

Signed-off-by: achmelo <a.chmelo@gmail.com>

* fix tests

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix PAT

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* enable debug, use GW logback in zaas

Signed-off-by: achmelo <a.chmelo@gmail.com>

* handle tokennotvalidexception

Signed-off-by: achmelo <a.chmelo@gmail.com>

* print token in zosmf service

Signed-off-by: achmelo <a.chmelo@gmail.com>

* fix overstrike to fix ZAAS endpoints

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* improve name of the IT about client certs

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix URL of trusted cert

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix test name

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix endpoint in ZAAS: /zaas/auth > /zaas/api/v1/auth

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* attempt to fix configuration for GatewayProxy

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* attempt to fix GatewayServiceRouting

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix hostnames in GA

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* add log messages

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* Oauth2Integration - fix OIDC configuration

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* new component ZAAS increase count of services

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* add Swagger in GW (to fix E2E tests)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* split token for log

Signed-off-by: achmelo <a.chmelo@gmail.com>

* uuid claim in the mock jwt

Signed-off-by: achmelo <a.chmelo@gmail.com>

* include original exception

Signed-off-by: achmelo <a.chmelo@gmail.com>

* attempt to fix CiTests with x509

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* MockZosmf 2012 fix client certs

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix IT GatewayCentralRegistry - client certs

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* enable shutdown endpoint to fix some IT

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix propagating of client certs in CiTest with infinispan

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix client cert and PAT for internal port

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix url from /gateway to /zaas

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* URL /gateway > /zaas

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* add log messages

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix client cert

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix unit tests

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* unit test fixes

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* return failure header from zuul to client

Signed-off-by: achmelo <a.chmelo@gmail.com>

* fix CORS unit test

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* add configuration for central gateway

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* return missing auth header

Signed-off-by: achmelo <a.chmelo@gmail.com>

* fix of compilation - new configuration

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix hostname of GatewayProxy

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix hostname for zaas-2 service

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* attempt to fix routing (routing paths)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix propagation of apimlId

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* basic auth filter

Signed-off-by: achmelo <a.chmelo@gmail.com>

* multi-tenancy routing fixes

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* include error message forbidden

Signed-off-by: achmelo <a.chmelo@gmail.com>

* expect correct error codes

Signed-off-by: achmelo <a.chmelo@gmail.com>

* long conformance url

Signed-off-by: achmelo <a.chmelo@gmail.com>

* forwarding client certs in new GW

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* small refactor of filter to accept client certificate

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix test GatewayServiceRouting

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* add refresh auth endpoint

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix auth pat revoke endpoints urls

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* update redis configuration

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix health endpoints in redis GA

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* refactor checking state of ZAAS

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix using registry on central GW, not the domain one

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* catch exception for endpoint

Signed-off-by: achmelo <a.chmelo@gmail.com>

* fix forwarding certs in CI Tests Zosmf PH34201

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fixes

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* expect token in cookie only

Signed-off-by: achmelo <a.chmelo@gmail.com>

* REVERT APAR

Signed-off-by: achmelo <a.chmelo@gmail.com>

* routing with instance id (base functionality)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* revert routing by instance id

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* do not retry for all 5xx, forward error header

Signed-off-by: achmelo <a.chmelo@gmail.com>

* set auth result unconditionally

Signed-off-by: Andrej Chmelo <ac892247@gf2yydryvy.wifi.broadcom.net>

* fix eureka onboarding and fix IT for registry endpoint

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix JavaDoc - removal of deprecated method

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix URL for CITestsZosmfPH34201

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* enable method security, read saf.yml, ignore preauthtoken

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* fix ContainerCITestsZosmfWithoutJwt (removed invalid condition about ltpa)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* local caching conf, hide jgroups logs

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* print details about user and token

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* print rules, less or equals for time check

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* fixes

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* display service ID for cache operation

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* remove duplicate filter, add more logs

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* import trusted ca to keystore

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* cleanup

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* fix resending of client cert

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix IT - different error message - missing credentials instead of generation of passticket failed

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* OIDC tests fix

Signed-off-by: Elena Kubantseva <elena.kubantseva@broadcom.com>

* disable DistributedLoadBalancingTest

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix url for E2E

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* attempt to fix viewport size

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* simplification of E2E tests (central GW does not make sense anymore)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* gateway is not routed itself anymore

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* replace xml config with code

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* merging of Swagger doc api

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* temporary fix of XML (just reverting the version restrictions)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* attempt to fix IT

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* replace xml config with code

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* remove space

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* central apiml id

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* document API security

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* get element by id in the test

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* code review

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* remove debug logs

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* removal unnecessary implementation SafIdtFilterFactory.processResponse

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* remove unused folder link

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* revert .env (REACT_APP_ZOWE_BUILD_INFO)

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* use cookie util

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* revert format

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* clean up BasicAuthProvider

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* small refactor of TokenAuthFilter

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* small refactor of BasicAuthProvider and TokenProvider

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix

* dub log message improvement

* rename TokenFilterFactory to AbstractTokenFilterFactory (to respect the purpose)

* align start script

Signed-off-by: ac892247 <a.chmelo@gmail.com>

---------

Signed-off-by: at670475 <andrea.tabone@broadcom.com>
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: Andrej Chmelo <ac892247@gf2yydryvy.wifi.broadcom.net>
Signed-off-by: ac892247 <a.chmelo@gmail.com>
Signed-off-by: Elena Kubantseva <elena.kubantseva@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pavel Jareš <58428711+pj892031@users.noreply.github.com>
Co-authored-by: Pavel Jares <Pavel.Jares@broadcom.com>
Co-authored-by: achmelo <a.chmelo@gmail.com>
Co-authored-by: Elena Kubantseva <elena.kubantseva@broadcom.com>

* chore: [GW migration] Remove ZAAS from API Catalog (#3616)

* Remove metadata for catalog in ZAAS + added forgotten after merge with v3 property

Signed-off-by: Elena Kubantseva <elena.kubantseva@broadcom.com>

* removed catalog metadata from test yamls as well

Signed-off-by: Elena Kubantseva <elena.kubantseva@broadcom.com>

---------

Signed-off-by: Elena Kubantseva <elena.kubantseva@broadcom.com>

* registry communication is not valid for v3. (#3617)

Signed-off-by: sj895092 <shobhackm9@gmail.com>

* chore: add missing configuration in the start script (#3620)

* add missing configuration

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

* add encoded slashes config in the yml

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

* change value for zaas

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

* don't allow encoded slashes as default

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* rename filter to better reflect functionality

Signed-off-by: ac892247 <a.chmelo@gmail.com>

---------

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>
Signed-off-by: ac892247 <a.chmelo@gmail.com>
Co-authored-by: Pavel Jares <Pavel.Jares@broadcom.com>
Co-authored-by: achmelo <37397715+achmelo@users.noreply.github.com>
Co-authored-by: ac892247 <a.chmelo@gmail.com>

* fix unit tests

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* chore: [Gateway migration] Fixing CI tests (#3632)

---------

Signed-off-by: sj895092 <shobhackm9@gmail.com>
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pavel Jares <Pavel.Jares@broadcom.com>
Co-authored-by: Pablo Carle <pablocarle@users.noreply.github.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* chore: [Gateway migration] Renaming ZAAS controller path (#3623)

* Renamed ZAAS controller path

Signed-off-by: Elena Kubantseva <elena.kubantseva@broadcom.com>

* fixed path in matchers

Signed-off-by: Elena Kubantseva <elena.kubantseva@broadcom.com>

* Fixed StartupChecker, start messages in Gateway, and conformance IT tests wip

Signed-off-by: Elena Kubantseva <elena.kubantseva@broadcom.com>

* fix protection and refactor method

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

* disable conformance tests

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

* address comments

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

---------

Signed-off-by: Elena Kubantseva <elena.kubantseva@broadcom.com>
Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>
Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com>

* chore: Upgrade of dependencies (v3 - GW migration) (#3634)

---------

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Co-authored-by: Pablo Carle <pablocarle@users.noreply.github.com>

* fix unit tests (#3639)

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix: re-enable integration tests (#3640)

* enable version test

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* sanitize headers

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* add javadoc

Signed-off-by: ac892247 <a.chmelo@gmail.com>

---------

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* chore: update security filters for actuator and conformance endpoint (#3642)

---------

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix: return correct error message when WS auth fails (#3638)

* return correct error message for websocket auth

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* move to correct package

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* use not protected endpoint for redirect

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* fix checkstyle

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* remove unused imports

Signed-off-by: ac892247 <a.chmelo@gmail.com>

---------

Signed-off-by: ac892247 <a.chmelo@gmail.com>
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Carle <pablocarle@users.noreply.github.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* increase coverage for the CookieUtil

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

* test forward cert filter

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* Increase coverage of TokenAuthentication.java

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

* Test PageRedirectionFilterFactory.java

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

* add TokenAuthFilterTest

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* add BasicAuthFilterTest

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* add ApimlWebSocketSessionTest

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix gateway packaging, fix automated startup

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix detected sonar issues

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* zaas validation schema

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* copy zaas litejar to zip package

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* update gateway schema

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* fix: missing referer header in the UI requests (#3647)

* add referer header

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* code review

Signed-off-by: ac892247 <a.chmelo@gmail.com>

---------

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* add extension loading (#3651)

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* fix: parameters in zaas start.sh (#3650)

* default certificate url, use gateway port for routing

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* provide option to not verify hostname

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* add secure headers

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* define ui route in apicatalog so its possible to route without trailing slash - apicatalog/ui/v1/

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* remove internal port tests and usage

Signed-off-by: ac892247 <a.chmelo@gmail.com>

* add rewrite filter for cases without trailing slash

Signed-off-by: ac892247 <a.chmelo@gmail.com>

---------

Signed-off-by: ac892247 <a.chmelo@gmail.com>
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>

* add comment, temporary disable flaky test (#3649)

Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: achmelo <37397715+achmelo@users.noreply.github.com>

* chore: review GW messages (#3648)

* wip - clean up messages

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

* change message code

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

* remove commented message

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>

---------

Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>
Co-authored-by: achmelo <37397715+achmelo@users.noreply.github.com>

* use mock service in the same way (#3656)

Signed-off-by: ac892247 <a.chmelo@gmail.com>

---------

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Signed-off-by: at670475 <andrea.tabone@broadcom.com>
Signed-off-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Signed-off-by: Pablo Carle <pablocarle@users.noreply.github.com>
Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: Andrej Chmelo <ac892247@gf2yydryvy.wifi.broadcom.net>
Signed-off-by: ac892247 <a.chmelo@gmail.com>
Signed-off-by: Elena Kubantseva <elena.kubantseva@broadcom.com>
Signed-off-by: sj895092 <shobhackm9@gmail.com>
Signed-off-by: Andrea Tabone <andrea.tabone@broadcom.com>
Co-authored-by: Pavel Jareš <58428711+pj892031@users.noreply.github.com>
Co-authored-by: Andrea Tabone <39694626+taban03@users.noreply.github.com>
Co-authored-by: Pablo Hernán Carle <pablo.carle@broadcom.com>
Co-authored-by: Pavel Jares <Pavel.Jares@broadcom.com>
Co-authored-by: achmelo <a.chmelo@gmail.com>
Co-authored-by: Elena Kubantseva <elena.kubantseva@broadcom.com>
Co-authored-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com>
Co-authored-by: achmelo <37397715+achmelo@users.noreply.github.com>
Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com>
  • Loading branch information
10 people authored Jul 18, 2024
1 parent cfacc84 commit 4953604
Show file tree
Hide file tree
Showing 766 changed files with 9,786 additions and 28,221 deletions.
3 changes: 2 additions & 1 deletion .github/actions/dump-jacoco/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ runs:
- name: Dump jacoco result
shell: bash
run: |
java -jar ./scripts/jacococli.jar dump --address zaas-service --port 6301 --destfile ./results/zaas-service.exec
java -jar ./scripts/jacococli.jar dump --address gateway-service --port 6300 --destfile ./results/gateway-service.exec
java -jar ./scripts/jacococli.jar dump --address caching-service --port 6306 --destfile ./results/caching-service.exec
java -jar ./scripts/jacococli.jar dump --address discovery-service --port 6301 --destfile ./results/discovery-service.exec
java -jar ./scripts/jacococli.jar dump --address discovery-service --port 6302 --destfile ./results/discovery-service.exec
java -jar ./scripts/jacococli.jar dump --address api-catalog-services --port 6304 --destfile ./results/api-catalog-services.exec
11 changes: 6 additions & 5 deletions .github/actions/validate-apiml-healthy/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "Validate APIML Healthy"
description: "Validates APIML health using Gateway's health status"
description: "Validates APIML health using Gateway, Caching Service and Authentication Service health status"

inputs:
caching-service:
Expand All @@ -18,7 +18,7 @@ inputs:
runs:
using: "composite"

# if GW and input services are not healthy after 3 minutes then exit
# if ZAAS Service and input services are not healthy after 3 minutes then exit
steps:
- name: Validate APIML setup
shell: bash
Expand All @@ -30,21 +30,22 @@ runs:
until [ $attemptCounter -gt $maxAttempts ]; do
sleep 10
gwHealth=$(curl -k -s https://localhost:10010/application/health)
zaasHealth=$(curl -k -s https://localhost:10023/application/health)
echo "Polling for GW health: $attemptCounter"
echo $gwHealth
gatewayUp=$(echo $gwHealth | jq -r '.status')
authUp=$(echo $gwHealth | jq -r '.components.gateway.details.auth')
authUp=$(echo $gwHealth | jq -r '.components.gateway.details.zaas')
acUp="$(echo $gwHealth | jq -r '.components.gateway.details.apicatalog')"
csUp="DOWN"
csHealth="$(echo $gwHealth | jq -r '[.components.apimlDiscoveryComposite.components.discoveryClient.details.services[]] | index("cachingservice")')"
csHealth="$(echo $zaasHealth | jq -r '[.components.discoveryComposite.components.discoveryClient.details.services[]] | index("cachingservice")')"
if [ "$csHealth" != "null" ]; then
csUp="UP"
fi
dcUp="DOWN"
dcHealth="$(echo $gwHealth | jq -r '[.components.apimlDiscoveryComposite.components.discoveryClient.details.services[]] | index("discoverableclient")')"
dcHealth="$(echo $zaasHealth | jq -r '[.components.discoveryComposite.components.discoveryClient.details.services[]] | index("discoverableclient")')"
if [ "$dcHealth" != "null" ]; then
dcUp="UP"
fi
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-conformant-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
default: false
required: false
service:
description: 'Enter a service name for which to create an image. The name must match a directory in /containers. E.g. cloud-gateway-service or discovery-service. If skipped, images will be created for all services.'
description: 'Enter a service name for which to create an image. The name must match a directory in /containers. E.g. gateway-service or discovery-service. If skipped, images will be created for all services.'
type: string
default: 'all'
required: false
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
create-image-all-services-amd64:
strategy:
matrix:
service: [ discovery-service, api-catalog-services, caching-service, cloud-gateway-service ]
service: [ discovery-service, api-catalog-services, caching-service, gateway-service, zaas-service ]
os: [ ubuntu, ubi ]
include:
- os: ubuntu
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
strategy:
max-parallel: 1
matrix:
service: [ discovery-service, api-catalog-services, caching-service, cloud-gateway-service ]
service: [ discovery-service, api-catalog-services, caching-service, gateway-service, zaas-service ]
os: [ ubuntu, ubi ]
include:
- os: ubuntu
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
- create-image-all-services-s390x
strategy:
matrix:
service: [ discovery-service, api-catalog-services, caching-service, cloud-gateway-service ]
service: [ discovery-service, api-catalog-services, caching-service, gateway-service, zaas-service ]
os: [ ubuntu, ubi ]
runs-on: ubuntu-latest
if: ${{ inputs.service == 'all' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/image-publish-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
type: choice
options:
- all
- gateway-service
- zaas-service
- discovery-service
- api-catalog-services
- caching-service
Expand Down
Loading

0 comments on commit 4953604

Please sign in to comment.