Skip to content

Commit

Permalink
chore: merge master branch(#1979)
Browse files Browse the repository at this point in the history
* Update version

* [Gradle Release plugin] Before tag commit 'v1.26.5'.

* [Gradle Release plugin] Create new version: 'v1.26.6-SNAPSHOT'.

* Feat: Enable hystrix metrics stream for core APIML services (#1899)

* Enable hystrix stream for api catalog

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Remove hystrix dashboard from ac

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Enable hystrix metrics for caching service

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Enable hystrix metrics for gateway

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Enable hystrix metrics for discovery service

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add flag to enable access to hystrix stream

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Remove unused imports

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add HystrixCommand to missed controllers

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Update version

* [Gradle Release plugin] Before tag commit 'v1.26.6'.

* [Gradle Release plugin] Create new version: 'v1.26.7-SNAPSHOT'.

* fix: remove hardcoded values from metrics service ui (#1902)

* refactor: Streamline category's content - Wizard Dialog (#1720)

* Allows for more inputs where multiple configurations can be present. Updated input data for the Plain Java Enabler. TBD: testing.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* WizardInputs test coverage now at 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Multiple configs of same category now visually divided, wizard-reducer test coverage raised to 100%

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Squashed bug occurring after loading already wrapped in array category content.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Plain Java Enabler data configuration.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Wizard reducer refactoring.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised wizard reducer coverage to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Foundation for YAML generation.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* YAML now shows in its own tab. TBD: lots of bug squashing.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* YAML Visualizer test

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Wizard actions and reducer test coverage raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed Next / Save button bug, added 'Copy' button the the YAML result tab.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Test coverage for wizard files raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Styling of YAML code

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added a missing function after merge.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed npm warning on yaml package

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

* Moved the yaml dependency to the correct package.json

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Spring Enabler category configuration

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Created a defaults file and configured spring defaults.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Injecting default values operational.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised test coverage to 100% & added a missing category for the Spring Enabler.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Moved different components into separate sub-folders, reduced size of wizard-config.jsx by dividing the data inside into 2 files - wizard_categories.jsx and wizard_onboarding_methods.jsx.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* WizardNavigation component now able to group multiple categories under a single tab. Test coverage raised to 100%.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added comments to wizard-actions and all components' functions that weren't self-explanatory.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed several bugs after merging. TBD: improve test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage of wizard files raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Added comments to wizard-reducer, hopefully reduced cognitive complexity

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Test fixes

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Mechanism for handling optional fields and checking for empty compulsory fields. TBD: Fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Wizard now shows true/false options as checkboxes

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Boolean property fully works. TBD: mountains of testing : )

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* UI now alerts when a compulsory field is left empty & optional fields are marked as such

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Option property fully works. Fake events substitute the events Select fires.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage for WizardInputs raised.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Redid functions for unfilled compulsory fields. TBD: fix tests

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed failing tests & improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* maxLength and lowercase properties functional.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Tab reorganization.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Dependencies now functional.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Tabs now indicate if they have an unfilled field & improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage of WizardInputs raised

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added mechanism for generating warnings when deleting filled fields & improved test coverage. TBD: Add the actual warnings

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfixes of unfilled validation

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed failing tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Restructuring. TBD: fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised coverage of WizardNavigation, WizardInputs and WizardDialog to 100.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed wizard-reducer tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed some code smells.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Simplified and streamlined the way a category's content is used.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Reduced reducer's cognitive complexity

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed WizardInputs tests

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

Co-authored-by: DianaKorladinova <chanchunche@gmail.com>
Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* refactor: GH1625 integration test refactor (#1727)

* move access tests to functional

Signed-off-by: jandadav <janda.david@gmail.com>

* Change to GatewayRequests

Signed-off-by: jandadav <janda.david@gmail.com>

* cleanup

Signed-off-by: jandadav <janda.david@gmail.com>

* Move the complexity to the Requests.

Signed-off-by: Jakub Balhar <jakub@balhar.net>

Co-authored-by: Jakub Balhar <jakub@balhar.net>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: compress response if service wants to (#1728)

* initial commit, compress response if service wants to

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

* add unit tests

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

* empty gzip body should be 20 bytes

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

* test flush buffers

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

* test no instances available and close buffers

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

* compress per service acceptance test

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

* compress per service acceptance test

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

* resolve conflicts

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

* provide description for filter class

Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* fix: check for correct URI pattern (#1732)

Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* chore: Publish Zowe Conformant Gateway image (#1730)

* Set base image to zowe base

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add initial containers structure

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use first shared action for GW image

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Set up prepare script

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Allow docker to run start script indefinitely

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Clean up prepare script

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add default values to start.sh

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add readme for GW image

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Rename workflow appropriately

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add ubuntu-s390x workflow

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add ubi amd64 workflow

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add define manifest jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add ubi s390x job

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add image jobs to release workflows

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use strategy.matrix to combine ubi and ubuntu jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix syntax error

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use strategy matrix to combine release jobs for ubuntu and ubi images

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use proper permissions for manifests jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add back pid and wait for java to stop early container exit

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Set image artifactory users to delete permission for replacing images

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: SSE - turbine stream access through gateway

Signed-off-by: Kumar Saurabh Raj <kumarsaurabhraj.sr@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* fix: Turbine SSE - multi client support

Signed-off-by: Kumar Saurabh Raj <kumarsaurabhraj.sr@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* fix: code smells in ServerSentEventProxyHandler

Signed-off-by: Kumar Saurabh Raj <kumarsaurabhraj.sr@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* changes for testing

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* enable turbine

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* embeded metrics dashboards

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Update version

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* [Gradle Release plugin] Before tag commit 'v1.24.3'.

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* [Gradle Release plugin] Create new version: 'v1.24.4-SNAPSHOT'.

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: SAF resource access check controller (#1734)

* feat: SAF check controller

Signed-off-by: jandadav <janda.david@gmail.com>

* extend test for coverage

Signed-off-by: jandadav <janda.david@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* fix: configurable timeout to verify the zOSMF availability (#1738)

Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* fix: exclude tls_rsa ciphers (#1737)

* exclude tls_rsa ciphers

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

* remove exclude ciphers

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

* revert

Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* chore: Upgrade dependencies for 1.24 release (#1736)

* Upgrade spring security to 5.3.11 everywhere

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Force upgrade xstream to 1.4.18

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Force upgrade jquery to 3.5.1

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Force upgrade json-smart to 2.4.7

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade micronaut version to 2.5.12

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade jackson databind in zaas client

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade eureka client

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade Spring fox dependency to 2.9.2

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Remove unused jakarta from whole project.

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Split build of Zowe confomrant containers

Signed-off-by: Jakub Balhar <jakub@balhar.net>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* chore: explain override to jwtSecurityInitializer timeout (#1739)

Signed-off-by: jandadav <janda.david@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* chore: Zowe Conformant images for all services (#1731)

* Set base image to zowe base

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add initial containers structure

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use first shared action for GW image

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Set up prepare script

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Allow docker to run start script indefinitely

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Clean up prepare script

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add default values to start.sh

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add readme for GW image

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Rename workflow appropriately

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add ubuntu-s390x workflow

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add ubi amd64 workflow

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add define manifest jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add ubi s390x job

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add image jobs to release workflows

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use strategy.matrix to combine ubi and ubuntu jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix syntax error

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use strategy matrix to combine release jobs for ubuntu and ubi images

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use proper permissions for manifests jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Prepare structure for more services

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Test matrix for service name

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix directories for prepare scripts

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add back pid and wait for java to stop early container exit

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix master merge adding unneeded files

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add discovery service to containers

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix directory name in workflow

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add default for DS peers

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add caching service

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add api catalog

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add new services to one workflow as test

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Update readme for other service images

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix caching service default port

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add all service images to all jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Run CS and AC in background

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* WIP debug CS

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Update version

* [Gradle Release plugin] Before tag commit 'v1.24.3'.

* [Gradle Release plugin] Create new version: 'v1.24.4-SNAPSHOT'.

* feat: SAF resource access check controller (#1734)

* feat: SAF check controller

Signed-off-by: jandadav <janda.david@gmail.com>

* extend test for coverage

Signed-off-by: jandadav <janda.david@gmail.com>

* fix: configurable timeout to verify the zOSMF availability (#1738)

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

* fix: exclude tls_rsa ciphers (#1737)

* exclude tls_rsa ciphers

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

* remove exclude ciphers

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

* revert

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

* chore: Upgrade dependencies for 1.24 release (#1736)

* Upgrade spring security to 5.3.11 everywhere

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Force upgrade xstream to 1.4.18

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Force upgrade jquery to 3.5.1

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Force upgrade json-smart to 2.4.7

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade micronaut version to 2.5.12

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade jackson databind in zaas client

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade eureka client

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade Spring fox dependency to 2.9.2

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Remove unused jakarta from whole project.

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Split build of Zowe confomrant containers

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* chore: explain override to jwtSecurityInitializer timeout (#1739)

Signed-off-by: jandadav <janda.david@gmail.com>

* Fix CS default values

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix missing env var in release workflows

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix dockerfile name lables

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add GATEWAY_HOST param for API CATALOG

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix typo

Signed-off-by: Carson Cook <carson.cook@ibm.com>

Co-authored-by: Zowe Robot <zowe-robot@users.noreply.github.com>
Co-authored-by: David Janda <janda.david@gmail.com>
Co-authored-by: achmelo <37397715+achmelo@users.noreply.github.com>
Co-authored-by: Jakub Balhar <jakub@balhar.net>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* refactor: Combine amd64 and s390x image jobs (#1740)

* Add if logic to steps to combine amd64 and s390x jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix syntax for if check

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix syntax for if check

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Combine s390x and amd64 for release jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: Wizard configuration (#1722)

* Allows for more inputs where multiple configurations can be present. Updated input data for the Plain Java Enabler. TBD: testing.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* WizardInputs test coverage now at 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Multiple configs of same category now visually divided, wizard-reducer test coverage raised to 100%

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Squashed bug occurring after loading already wrapped in array category content.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Plain Java Enabler data configuration.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Wizard reducer refactoring.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised wizard reducer coverage to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Foundation for YAML generation.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* YAML now shows in its own tab. TBD: lots of bug squashing.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* YAML Visualizer test

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Wizard actions and reducer test coverage raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed Next / Save button bug, added 'Copy' button the the YAML result tab.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Test coverage for wizard files raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Styling of YAML code

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added a missing function after merge.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed npm warning on yaml package

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

* Moved the yaml dependency to the correct package.json

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Spring Enabler category configuration

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Created a defaults file and configured spring defaults.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Injecting default values operational.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised test coverage to 100% & added a missing category for the Spring Enabler.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Moved different components into separate sub-folders, reduced size of wizard-config.jsx by dividing the data inside into 2 files - wizard_categories.jsx and wizard_onboarding_methods.jsx.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* WizardNavigation component now able to group multiple categories under a single tab. Test coverage raised to 100%.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added comments to wizard-actions and all components' functions that weren't self-explanatory.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed several bugs after merging. TBD: improve test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage of wizard files raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Added comments to wizard-reducer, hopefully reduced cognitive complexity

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Test fixes

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Mechanism for handling optional fields and checking for empty compulsory fields. TBD: Fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Wizard now shows true/false options as checkboxes

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Boolean property fully works. TBD: mountains of testing : )

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* UI now alerts when a compulsory field is left empty & optional fields are marked as such

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Option property fully works. Fake events substitute the events Select fires.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage for WizardInputs raised.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Redid functions for unfilled compulsory fields. TBD: fix tests

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed failing tests & improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* maxLength and lowercase properties functional.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Tab reorganization.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Dependencies now functional.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Tabs now indicate if they have an unfilled field & improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage of WizardInputs raised

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added mechanism for generating warnings when deleting filled fields & improved test coverage. TBD: Add the actual warnings

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfixes of unfilled validation

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed failing tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Restructuring. TBD: fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised coverage of WizardNavigation, WizardInputs and WizardDialog to 100.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed wizard-reducer tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed some code smells.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Indentation dependency now available. TBD: fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Array wrapping of some YAML categories for static onboarding. TBD: fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed & added tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Wizard dialog 'Next' button fix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Post-merge fixes.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

Co-authored-by: ViktorKorladinov <v.korladinov@gmail.com>
Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* refactor: Remove required LAUNCH_COMPONENT from conformant containers environment variables (#1741)

* Set base image to zowe base

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add initial containers structure

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use first shared action for GW image

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Set up prepare script

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Allow docker to run start script indefinitely

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Clean up prepare script

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add default values to start.sh

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add readme for GW image

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Rename workflow appropriately

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add ubuntu-s390x workflow

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add ubi amd64 workflow

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add define manifest jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add ubi s390x job

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add image jobs to release workflows

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use strategy.matrix to combine ubi and ubuntu jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix syntax error

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use strategy matrix to combine release jobs for ubuntu and ubi images

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Use proper permissions for manifests jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Prepare structure for more services

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Test matrix for service name

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix directories for prepare scripts

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add back pid and wait for java to stop early container exit

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix master merge adding unneeded files

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add discovery service to containers

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix directory name in workflow

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add default for DS peers

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add caching service

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add api catalog

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add new services to one workflow as test

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Update readme for other service images

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix caching service default port

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add all service images to all jobs

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Run CS and AC in background

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* WIP debug CS

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Update version

* [Gradle Release plugin] Before tag commit 'v1.24.3'.

* [Gradle Release plugin] Create new version: 'v1.24.4-SNAPSHOT'.

* feat: SAF resource access check controller (#1734)

* feat: SAF check controller

Signed-off-by: jandadav <janda.david@gmail.com>

* extend test for coverage

Signed-off-by: jandadav <janda.david@gmail.com>

* fix: configurable timeout to verify the zOSMF availability (#1738)

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

* fix: exclude tls_rsa ciphers (#1737)

* exclude tls_rsa ciphers

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

* remove exclude ciphers

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

* revert

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

* chore: Upgrade dependencies for 1.24 release (#1736)

* Upgrade spring security to 5.3.11 everywhere

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Force upgrade xstream to 1.4.18

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Force upgrade jquery to 3.5.1

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Force upgrade json-smart to 2.4.7

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade micronaut version to 2.5.12

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade jackson databind in zaas client

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade eureka client

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Upgrade Spring fox dependency to 2.9.2

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Remove unused jakarta from whole project.

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Split build of Zowe confomrant containers

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* chore: explain override to jwtSecurityInitializer timeout (#1739)

Signed-off-by: jandadav <janda.david@gmail.com>

* Fix CS default values

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix missing env var in release workflows

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix dockerfile name lables

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add GATEWAY_HOST param for API CATALOG

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix typo

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add start.sh script check for no launch_component set

Signed-off-by: Carson Cook <carson.cook@ibm.com>

Co-authored-by: Zowe Robot <zowe-robot@users.noreply.github.com>
Co-authored-by: David Janda <janda.david@gmail.com>
Co-authored-by: achmelo <37397715+achmelo@users.noreply.github.com>
Co-authored-by: Jakub Balhar <jakub@balhar.net>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* fix: hide logmessages with no value (#1744)

Signed-off-by: jandadav <janda.david@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Update version

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* [Gradle Release plugin] Before tag commit 'v1.24.4'.

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* [Gradle Release plugin] Create new version: 'v1.24.5-SNAPSHOT'.

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: Static Definition creation endpoints in API Catalog (#1735)

* WIP

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

* Add controller and error handler

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

* Add override controller

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

* Refactoring and debug log

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

* Add license and fix checkstyle

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

* Add functionality to retrieve static location from discovery env endpoint

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

* Add unit test

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

* Add tests

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

* Fix code smell

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

* Fix bug

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

* Add more test

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

* Raise coverage

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

* Address code review comments

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

* Address code review comments pt.2

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

* Change the logic and add shared volumes mount

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

* Add integration tests

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

* Fix location

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

* Add logs

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

* Set environment variable in docker containers

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

* more debugging

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

* additional debug

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

* Fix test

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

* Improve check

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

* Fix indentation

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

* Change the way to get static location

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

* Fix IT

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

* Fix static def path

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

* Try the docker URL

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Another take on volumes

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Fix assertion message

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

* Fix

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

* Revert changes

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

* Get the first directory defined

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

* Fix code smells

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

* Revert staticApiservice

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

* Increase code coverage

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

* revert docker-compose.yml files for local setup

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

Co-authored-by: Jakub Balhar <jakub@balhar.net>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: Wizard NodeJS & Micronaut enablers' configurations (#1733)

* Allows for more inputs where multiple configurations can be present. Updated input data for the Plain Java Enabler. TBD: testing.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* WizardInputs test coverage now at 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Multiple configs of same category now visually divided, wizard-reducer test coverage raised to 100%

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Squashed bug occurring after loading already wrapped in array category content.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Plain Java Enabler data configuration.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Wizard reducer refactoring.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised wizard reducer coverage to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Foundation for YAML generation.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* YAML now shows in its own tab. TBD: lots of bug squashing.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* YAML Visualizer test

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Wizard actions and reducer test coverage raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed Next / Save button bug, added 'Copy' button the the YAML result tab.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Test coverage for wizard files raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Styling of YAML code

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added a missing function after merge.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed npm warning on yaml package

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

* Moved the yaml dependency to the correct package.json

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Spring Enabler category configuration

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Created a defaults file and configured spring defaults.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Injecting default values operational.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised test coverage to 100% & added a missing category for the Spring Enabler.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Moved different components into separate sub-folders, reduced size of wizard-config.jsx by dividing the data inside into 2 files - wizard_categories.jsx and wizard_onboarding_methods.jsx.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* WizardNavigation component now able to group multiple categories under a single tab. Test coverage raised to 100%.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added comments to wizard-actions and all components' functions that weren't self-explanatory.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed several bugs after merging. TBD: improve test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage of wizard files raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Added comments to wizard-reducer, hopefully reduced cognitive complexity

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Test fixes

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Mechanism for handling optional fields and checking for empty compulsory fields. TBD: Fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Wizard now shows true/false options as checkboxes

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Boolean property fully works. TBD: mountains of testing : )

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* UI now alerts when a compulsory field is left empty & optional fields are marked as such

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Option property fully works. Fake events substitute the events Select fires.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage for WizardInputs raised.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Redid functions for unfilled compulsory fields. TBD: fix tests

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed failing tests & improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* maxLength and lowercase properties functional.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Tab reorganization.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Dependencies now functional.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Tabs now indicate if they have an unfilled field & improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage of WizardInputs raised

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added mechanism for generating warnings when deleting filled fields & improved test coverage. TBD: Add the actual warnings

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfixes of unfilled validation

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed failing tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Restructuring. TBD: fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised coverage of WizardNavigation, WizardInputs and WizardDialog to 100.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed wizard-reducer tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed some code smells.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Indentation dependency now available. TBD: fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Array wrapping of some YAML categories for static onboarding. TBD: fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed & added tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Wizard dialog 'Next' button fix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Post-merge fixes.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Node Enabler configuration.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Array indentation mechanism for Micronaut & fixed some tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Micronaut default values.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised test coverage of wizard-reducer and wizard-actions to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Divided category configurations into separate files to improve readability

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed the code smell (hopefully).

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed the code smell (hopefully).

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed the code smell (hopefully).

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Security hotspots.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* remove extra configuration

Signed-off-by: jandadav <janda.david@gmail.com>

* Updated Node JS configuration.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

Co-authored-by: ViktorKorladinov <v.korladinov@gmail.com>
Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com>
Co-authored-by: jandadav <janda.david@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* refactor: Discovery service functional test infrastructure (#1749)

* add functional test

Signed-off-by: jandadav <janda.david@gmail.com>

* decouple SslConfig

Signed-off-by: jandadav <janda.david@gmail.com>

* Introduce test fixture

Signed-off-by: jandadav <janda.david@gmail.com>

* revert run config

Signed-off-by: jandadav <janda.david@gmail.com>

* Migrate tests to functional

Signed-off-by: jandadav <janda.david@gmail.com>

* Migrate additional tests

Signed-off-by: jandadav <janda.david@gmail.com>

* https config for for dockerized discovery service

Signed-off-by: jandadav <janda.david@gmail.com>

* Fix code smell

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

* Allow token refresh for local run

Signed-off-by: jandadav <janda.david@gmail.com>

Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: Wizard UX tweaks (#1752)

* UX tweaks: modified tab warning sign, changed order for checkboxes and labels, fully acceptable tabs now bold.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* 'Done' button disabled till the end of the wizard is reached.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Post-merge fixes

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Code smell fix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

Co-authored-by: DianaKorladinova <chanchunche@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* chore: Automatic update for the Changelog for release (#1748)

* Update changelog

Signed-off-by: Zowe Robot <zowe-robot@users.noreply.github.com>

* Changelog tweaks

Signed-off-by: jandadav <janda.david@gmail.com>

* Update CHANGELOG.md

Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com>

* review points
Signed-off-by: David Janda <janda.david@gmail.com>

Signed-off-by: jandadav <janda.david@gmail.com>

* language refacotr

Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com>

Co-authored-by: Zowe Robot <zowe-robot@users.noreply.github.com>
Co-authored-by: David Janda <janda.david@gmail.com>
Co-authored-by: Andrew Jandacek <38347291+janan07@users.noreply.github.com>
Co-authored-by: David Janda <david.janda@broadcom.com>
Co-authored-by: Andrew Jandacek <andrew.jandacek@broadcom.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: possibility to delete static def (#1759)

* possibility to delete static def

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

* bug fix

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

* bug fix

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

* assert status code only

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

* styles

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

* invalid service id test

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

* disable test

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

* static compile pattern

Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* fix: static generation (#1761)

Signed-off-by: jandadav <janda.david@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: static api enpoints protected by SAF check (#1764)

* protect static def api with saf resource check

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

* correct SC

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

* remove access with cert

Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: Provide compression for specific paths only.  (#1755)

* Limit to Accept-Encoding containing gzip
Limit to specific routes.

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Test new and old paths alike.
Test noncompressed paths

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Refactor the Metadata preparation.

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Add Acceptance Tests for the Compression per path

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Use the provided fulent API

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Correctly handle relative paths

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Show debug information from the Gradle.

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Try just building

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Info instead of debug

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Get the info about tests

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Remove the cached packages.

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Limit the amount of time taken

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Provide scan after the build

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Verify the build of gateway service

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Try removing the functional tests

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Return one functional test

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Return the tests

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Limit the tests to the default configuration

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Return the previous setup

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Test response isn't compressed when client doesn't accept gzip encoding

Signed-off-by: Jakub Balhar <jakub@balhar.net>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* fix: Zaas client to not send a certificate during authentication  (#1763)

* Fix usage of empty keystore in https client

Signed-off-by: JirkaAichler <jiri.aichler@broadcom.com>

* Add unit test

Signed-off-by: JirkaAichler <jiri.aichler@broadcom.com>

* Comment code

Signed-off-by: JirkaAichler <jiri.aichler@broadcom.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: Wizard automatic onboarding & SAF check (#1751)

* Allows for more inputs where multiple configurations can be present. Updated input data for the Plain Java Enabler. TBD: testing.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* WizardInputs test coverage now at 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Multiple configs of same category now visually divided, wizard-reducer test coverage raised to 100%

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Squashed bug occurring after loading already wrapped in array category content.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Plain Java Enabler data configuration.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Wizard reducer refactoring.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised wizard reducer coverage to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Foundation for YAML generation.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* YAML now shows in its own tab. TBD: lots of bug squashing.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* YAML Visualizer test

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Wizard actions and reducer test coverage raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed Next / Save button bug, added 'Copy' button the the YAML result tab.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Test coverage for wizard files raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Styling of YAML code

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added a missing function after merge.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed npm warning on yaml package

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

* Moved the yaml dependency to the correct package.json

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Spring Enabler category configuration

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Created a defaults file and configured spring defaults.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Injecting default values operational.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised test coverage to 100% & added a missing category for the Spring Enabler.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Moved different components into separate sub-folders, reduced size of wizard-config.jsx by dividing the data inside into 2 files - wizard_categories.jsx and wizard_onboarding_methods.jsx.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* WizardNavigation component now able to group multiple categories under a single tab. Test coverage raised to 100%.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added comments to wizard-actions and all components' functions that weren't self-explanatory.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed several bugs after merging. TBD: improve test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage of wizard files raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Added comments to wizard-reducer, hopefully reduced cognitive complexity

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Test fixes

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Mechanism for handling optional fields and checking for empty compulsory fields. TBD: Fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Wizard now shows true/false options as checkboxes

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Boolean property fully works. TBD: mountains of testing : )

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* UI now alerts when a compulsory field is left empty & optional fields are marked as such

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Option property fully works. Fake events substitute the events Select fires.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage for WizardInputs raised.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Redid functions for unfilled compulsory fields. TBD: fix tests

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed failing tests & improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* maxLength and lowercase properties functional.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Tab reorganization.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfix.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Dependencies now functional.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Tabs now indicate if they have an unfilled field & improved test coverage.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage of WizardInputs raised

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Added mechanism for generating warnings when deleting filled fields & improved test coverage. TBD: Add the actual warnings

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Hotfixes of unfilled validation

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed failing tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Restructuring. TBD: fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Raised coverage of WizardNavigation, WizardInputs and WizardDialog to 100.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed wizard-reducer tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Fixed some code smells.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Indentation dependency now available. TBD: fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Array wrapping of some YAML categories for static onboarding. TBD: fix tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Simplified and streamlined the way a category's content is used.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed & added tests.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Reduced reducer's cognitive complexity

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed a failing test

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Request now fires with valid YAML as body. Response is handled both for success and error.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* YAML is sent only if data validation checks pass.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Raised test coverage

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fetch-action sends a valid POST request

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fetch-action request body refactored to a  plain/text format

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* WIP

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

* Ready for SAF check.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Add controller and error handler

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

* Add override controller

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

* Refactoring and debug log

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

* Add license and fix checkstyle

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

* Add functionality to retrieve static location from discovery env endpoint

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

* Add unit test

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

* Add tests

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

* SAF check determines whether user can onboard APIs or not.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fix code smell

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

* Fix bug

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

* Add more test

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

* Raise coverage

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

* Address code review comments

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

* Address code review comments pt.2

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

* Change the logic and add shared volumes mount

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

* Add integration tests

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

* Fix location

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

* Add logs

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

* Set environment variable in docker containers

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

* more debugging

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

* additional debug

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

* Fix test

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

* Improve check

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

* Fix indentation

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

* Change the way to get static location

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

* Fix IT

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

* Fix static def path

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

* POST requests now contain serviceId in the headers

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Try the docker URL

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Another take on volumes

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Fix assertion message

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

* Fix

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

* Revert changes

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

* Get the first directory defined

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

* Fix code smells

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

* Revert staticApiservice

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

* Increase code coverage

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

* revert docker-compose.yml files for local setup

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

* Merged backend endpoints and wired them together. Automatic onboarding now successfully handles normal saves & overwrites.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Bugfix

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Test coverage of wizard-actions, wizard-reducer and WizardInputs now at 100%. Raised test coverage for wizard-fetch-actions.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* Test coverage of ConfirmDialog raised to 100%.

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

* post-merge fixes

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Fixed bug where all enablers tried to save

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Static onboarding shows up only if user's SAF check passes.

Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com>

* Post-merge fixes (handleIndentationDependency, handleArrayIndentation, tests).

Signed-off-by: DianaKorladinova <chanchunche@gmail.com>

Co-authored-by: DianaKorladinova <chanchunche@gmail.com>
Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com>
Co-authored-by: Jakub Balhar <jakub@balhar.net>
Co-authored-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Update version

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* [Gradle Release plugin] Before tag commit 'v1.24.5'.

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* [Gradle Release plugin] Create new version: 'v1.24.6-SNAPSHOT'.

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* chore: share filesystem for static definitions (#1765)

* share filesystem for static definitions

Signed-off-by: jandadav <janda.david@gmail.com>

* debug docker logs

Signed-off-by: jandadav <janda.david@gmail.com>

* debug docker logs 2

Signed-off-by: jandadav <janda.david@gmail.com>

* working directory

Signed-off-by: jandadav <janda.david@gmail.com>

* debug

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* use docker compose

Signed-off-by: jandadav <janda.david@gmail.com>

* add local docker shared apidef dirs

Signed-off-by: jandadav <janda.david@gmail.com>

* add gh actions shared apidef dirs

Signed-off-by: jandadav <janda.david@gmail.com>

* rebuild containers

Signed-off-by: jandadav <janda.david@gmail.com>

* run full test

Signed-off-by: jandadav <janda.david@gmail.com>

* move docker compose shared mount

Signed-off-by: jandadav <janda.david@gmail.com>

* remove nginx

Signed-off-by: jandadav <janda.david@gmail.com>

* volumes everywhere

Signed-off-by: jandadav <janda.david@gmail.com>

* volumes everywhere

Signed-off-by: jandadav <janda.david@gmail.com>

* revert debug changes

Signed-off-by: jandadav <janda.david@gmail.com>

* revert imports

Signed-off-by: jandadav <janda.david@gmail.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* fix: Fix flaky unit test (#1771)

Fix flaky test

Signed-off-by: at670475 <andrea.tabone@broadcom.com>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* chore: Support v2.x.x branch and clean statistics (#1775)

Signed-off-by: Jakub Balhar <jakub@balhar.net>
Signed-off-by: Carson Cook <carson.cook@ibm.com>

* feat: Wizard improvements (#1772)

* Allows for more inputs where multiple configu…
  • Loading branch information
23 people committed Jan 6, 2022
1 parent 28941b1 commit 23b09e0
Show file tree
Hide file tree
Showing 62 changed files with 910 additions and 697 deletions.
121 changes: 106 additions & 15 deletions .github/workflows/containers.yml
Expand Up @@ -72,7 +72,7 @@ jobs:
- /api-defs:/api-defs
gateway-service:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
metrics-service:
image: ghcr.io/balhar-jakub/metrics-service:${{ github.event.pull_request.number || 'latest' }}
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
- /api-defs:/api-defs
gateway-service:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}

steps:
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
- /api-defs:/api-defs
gateway-service:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
env:
ZOSMF_APPLIEDAPARS: PH12143,RSU2012
Expand Down Expand Up @@ -277,7 +277,7 @@ jobs:
- /api-defs:/api-defs
gateway-service:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
env:
ZOSMF_APPLIEDAPARS: PH12143,RSU2012,PH34201
Expand Down Expand Up @@ -346,7 +346,7 @@ jobs:
- /api-defs:/api-defs
gateway-service:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
env:
ZOSMF_APPLIEDAPARS: ''
Expand Down Expand Up @@ -416,7 +416,7 @@ jobs:
- /api-defs:/api-defs
gateway-service:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
env:
ZOSMF_APPLIEDAPARS: AuthenticateApar
Expand Down Expand Up @@ -485,7 +485,7 @@ jobs:
- /api-defs:/api-defs
gateway-service:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
metrics-service:
image: ghcr.io/balhar-jakub/metrics-service:${{ github.event.pull_request.number || 'latest' }}
Expand Down Expand Up @@ -558,7 +558,7 @@ jobs:
- /api-defs:/api-defs
gateway-service:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
env:
ZOSMF_APPLIEDAPARS: AuthenticateApar
Expand Down Expand Up @@ -645,7 +645,7 @@ jobs:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
env:
VERIFY_CERTIFICATES: false
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
env:
ZOSMF_APPLIEDAPARS: AuthenticateApar
Expand Down Expand Up @@ -727,7 +727,7 @@ jobs:
image: ghcr.io/balhar-jakub/discoverable-client:${{ github.event.pull_request.number || 'latest' }}
env:
APIML_SERVICE_HOSTNAME: discoverable-client-2
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
discovery-service:
image: ghcr.io/balhar-jakub/discovery-service:${{ github.event.pull_request.number || 'latest' }}
Expand Down Expand Up @@ -821,7 +821,7 @@ jobs:
env:
APIML_SERVICE_HOSTNAME: discoverable-client-2
APIML_SERVICE_CUSTOMMETADATA_APIML_LB_TYPE: authentication
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
discovery-service:
image: ghcr.io/balhar-jakub/discovery-service:${{ github.event.pull_request.number || 'latest' }}
Expand Down Expand Up @@ -926,7 +926,7 @@ jobs:
image: ghcr.io/balhar-jakub/caching-service:${{ github.event.pull_request.number || 'latest' }}
discoverable-client:
image: ghcr.io/balhar-jakub/discoverable-client:${{ github.event.pull_request.number || 'latest' }}
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
discovery-service:
image: ghcr.io/balhar-jakub/discovery-service:${{ github.event.pull_request.number || 'latest' }}
Expand Down Expand Up @@ -1014,7 +1014,7 @@ jobs:
image: ghcr.io/balhar-jakub/caching-service:${{ github.event.pull_request.number || 'latest' }}
discoverable-client:
image: ghcr.io/balhar-jakub/discoverable-client:${{ github.event.pull_request.number || 'latest' }}
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
discovery-service:
image: ghcr.io/balhar-jakub/discovery-service:${{ github.event.pull_request.number || 'latest' }}
Expand Down Expand Up @@ -1106,7 +1106,7 @@ jobs:
image: ghcr.io/balhar-jakub/discoverable-client:${{ github.event.pull_request.number || 'latest' }}
env:
APIML_SERVICE_HOSTNAME: discoverable-client-2
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
discovery-service:
image: ghcr.io/balhar-jakub/discovery-service:${{ github.event.pull_request.number || 'latest' }}
Expand Down Expand Up @@ -1198,7 +1198,7 @@ jobs:
image: ghcr.io/balhar-jakub/discoverable-client:${{ github.event.pull_request.number || 'latest' }}
env:
APIML_SERVICE_HOSTNAME: discoverable-client-2
mock-zosmf:
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
discovery-service:
image: ghcr.io/balhar-jakub/discovery-service:${{ github.event.pull_request.number || 'latest' }}
Expand Down Expand Up @@ -1271,4 +1271,95 @@ jobs:
rm -f ~/.gradle/caches/modules-2/gc.properties
rm -rf ~/.gradle/caches/build-cache-1
CITestsWithInfinispan:
needs: PublishJibContainers
runs-on: ubuntu-latest
container: ubuntu:latest
timeout-minutes: 10

services:
api-catalog-services:
image: ghcr.io/balhar-jakub/api-catalog-services:${{ github.event.pull_request.number || 'latest' }}
volumes:
- /api-defs:/api-defs
caching-service:
image: ghcr.io/balhar-jakub/caching-service:${{ github.event.pull_request.number || 'latest' }}
env:
ZWE_CACHING_SERVICE_PERSISTENT: 'infinispan'
JGROUPS_BIND_PORT: "7099"
SERVER_SSL_KEYSTORETYPE: "PKCS12"
CACHING_STORAGE_INFINISPAN_PERSISTENCE_DATALOCATION: "data_replica"
CACHING_STORAGE_INFINISPAN_INITIALHOSTS: "caching-service-2[7098]"
CACHING_STORAGE_MODE: "infinispan"
APIML_SERVICE_PORT: "10022"
JGROUPS_BIND_ADDRESS: "caching-service"

caching-service-2:
image: ghcr.io/balhar-jakub/caching-service:${{ github.event.pull_request.number || 'latest' }}
env:
ZWE_CACHING_SERVICE_PERSISTENT: 'infinispan'
JGROUPS_BIND_PORT: "7098"
SERVER_SSL_KEYSTORETYPE: "PKCS12"
CACHING_STORAGE_INFINISPAN_PERSISTENCE_DATALOCATION: "data"
CACHING_STORAGE_INFINISPAN_INITIALHOSTS: "caching-service[7099]"
CACHING_STORAGE_MODE: "infinispan"
JGROUPS_BIND_ADDRESS: "caching-service-2"
APIML_SERVICE_HOSTNAME: "caching-service-2"

discoverable-client:
image: ghcr.io/balhar-jakub/discoverable-client:${{ github.event.pull_request.number || 'latest' }}
discovery-service:
image: ghcr.io/balhar-jakub/discovery-service:${{ github.event.pull_request.number || 'latest' }}
volumes:
- /api-defs:/api-defs
gateway-service:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
env:
ZOSMF_APPLIEDAPARS: AuthenticateApar

steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- name: Build with Gradle
run: >
./gradlew :integration-tests:runCachingServiceTests --info -Denvironment.config=-docker -Denvironment.offPlatform=true
-Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
- name: Store results
uses: actions/upload-artifact@v2
if: always()
with:
name: CITestsWithInfinispan
path: |
integration-tests/build/reports/**
- name: Cleanup Gradle Cache
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
rm -rf ~/.gradle/caches/build-cache-1
12 changes: 6 additions & 6 deletions .github/workflows/pull-request-snapshot-release.yml
Expand Up @@ -3,11 +3,11 @@
name: Release new version for specific pull request (snapshot)

on:
workflow_dispatch:
inputs:
pull_request:
description: 'The pull request snapshot that is going to be released (i.e PR-XXXX)'
required: true
pull_request:
branches: [ master, v2.x.x ]

env:
PR_NUMBER: ${{ github.event.number }}

jobs:
build:
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:

- name: Release with Gradle
run: |
BRANCH_NAME=${{ github.event.inputs.pull_request }}
BRANCH_NAME=PR-${{ env.PR_NUMBER }}
sed -i '/version=/ s/-SNAPSHOT/-'"$BRANCH_NAME"'-SNAPSHOT/' ./gradle.properties
./gradlew build publishAllVersions -Pzowe.deploy.username=$ARTIFACTORY_USERNAME -Pzowe.deploy.password=$ARTIFACTORY_PASSWORD -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_USERNAME -PpullRequest=$BRANCH_NAME
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot-release.yml
Expand Up @@ -13,7 +13,7 @@ jobs:
build:

runs-on: ubuntu-latest
timeout-minutes: 20
timeout-minutes: 30

steps:
- uses: actions/checkout@v2
Expand Down
57 changes: 57 additions & 0 deletions apiml-sample-extension-package/build.gradle
@@ -0,0 +1,57 @@
/*
* This program and the accompanying materials are made available under the terms of the
* Eclipse Public License v2.0 which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-v20.html
*
* SPDX-License-Identifier: EPL-2.0
*
* Copyright Contributors to the Zowe Project.
*/
apply plugin: 'maven-publish'
ext {
artifactName = 'apiml-sample-extension-package'
pullNo = project.hasProperty("pullRequest") && project.getProperty("pullRequest") != null ? "-" + project.getProperty("pullRequest") : ""
}

configurations {
sampleExtensionJar
zip
}

dependencies {
sampleExtensionJar(project(path: ":apiml-sample-extension"))
}

task packageSampleExtension(type: Zip) {
archiveName = artifactName + pullNo + ".zip"
includeEmptyDirs = true
def resourceDir = 'src/main/resources/'

into('/') {
from "$resourceDir/manifest.yaml"
}

into('bin/') {
from configurations.sampleExtensionJar
}
}

jar.dependsOn(packageSampleExtension)
build.dependsOn(packageSampleExtension)

artifacts {
zip packageSampleExtension
}

publishing {
publications {
mavenJava(MavenPublication) {
artifact("$buildDir/distributions/$artifactName" + pullNo + ".zip")
}
}
}


jar {
enabled false
}
23 changes: 23 additions & 0 deletions apiml-sample-extension-package/src/main/resources/manifest.yaml
@@ -0,0 +1,23 @@
---
name: apiml-sample-extension
# Component identifier. This identifier matches artifact path in Zowe Artifactory https://zowe.jfrog.io/.
id: org.zowe.apiml.sdk.apiml-sample-extension-package
# Component version is defined in gradle.properties for Gradle project
# Human readable component name
title: A sample extension for API ML
# Human readable component description
description: JAR that contains a simple controller.
license: EPL-2.0
repository:
type: git
url: https://github.com/zowe/api-layer.git
build:
branch: "{{build.branch}}"
number: "{{build.number}}"
commitHash: "{{build.commitHash}}"
timestamp: "{{build.timestamp}}"
# The following block contains all the extensions directory path
# (or file path) that will be included in the API ML
gatewaySharedLibs:
- bin/apiml-sample-extension.jar

15 changes: 15 additions & 0 deletions apiml-sample-extension/README.md
@@ -0,0 +1,15 @@
# API ML sample extension

This is an API ML sample extension. It only contains a simple controller for testing.
The extension is added to the API Gateway class path. Therefore, as a result, the controller is added in the context
of the API Gateway without starting a new service.

## Usage

If the extension is correctly added to the API Gateway classpath, it will be possible to
call the REST endpoint defined in the controller via Gateway.
The extension is scanned and added to the classpath during the Zowe instance preparation, therefore
once the Gateway is started, you can:

1. Call the `https://<hostname>:<gatewayPort>/api/v1/greeting` endpoint though Gateway
2. Verify that you get the message `Hello, I'm a sample extension!` as response

0 comments on commit 23b09e0

Please sign in to comment.