Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Support z/OSMF scheme in Spring Cloud Gateway #3190

Merged
merged 33 commits into from
Nov 14, 2023
Merged

feat: Support z/OSMF scheme in Spring Cloud Gateway #3190

merged 33 commits into from
Nov 14, 2023

Conversation

pj892031
Copy link
Contributor

@pj892031 pj892031 commented Nov 9, 2023

Description

This PR mainly implements support z/OSMF schema in the Spring Cloud Gateway. As a side-effect it refactors the authentication scheme and functional tests (see mocking services)

Linked to # (issue)
Part of the # (epic)

Type of change

Please delete options that are not relevant.

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

Checklist:

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

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

weinfurt and others added 18 commits October 19, 2023 00:02
@weinfurt
Add /zaas/zosmf endpoint to generate zosmf JWT and LTPA tokens
8d06192 
Signed-off-by: Petr Weinfurt <[email protected]>
@weinfurt
Add integration tests
0e3330e 
Signed-off-by: Petr Weinfurt <[email protected]>
@weinfurt
Move zosmfTokensResponse to common-service-core
d185374 
Signed-off-by: Petr Weinfurt <[email protected]>
@weinfurt
Revert unwanted change
998105c 
Signed-off-by: Petr Weinfurt <[email protected]>
@weinfurt
Change the zosmf endpoint response to be more useful.
945f4a5 
Signed-off-by: Petr Weinfurt <[email protected]>
@weinfurt
New zOSMF filter factory - WIP
93c63bf 
Signed-off-by: Petr Weinfurt <[email protected]>
@pj892031
attempt to refactor auth schema factories
a57e114 
Signed-off-by: Pavel Jareš <[email protected]>
@Shobhajayanna
added implementaion for instance null case
157155d 
Signed-off-by: sj895092 <[email protected]>
@pj892031
fixes
4853a79 
Signed-off-by: Pavel Jareš <[email protected]>
@Shobhajayanna
refactoring ZosmfFilterFactory
c10729a 
Signed-off-by: sj895092 <[email protected]>
@pj892031
fix test
e262f15 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
resending serviceId + test fixes
eab2ae2 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
PassticketTest fix + new implementation of mock services
2a2d16e 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
fix tests and new mocks
059ffd0 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
rename AcceptanceTestWithTwoServices
989ac9e 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
doc of MockService
c0e861c 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
doc method AcceptanceTestWithMockServices#mockService(String)
8ba2bc5 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
tests and fixes
6f93748 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
before test refactor
3ecfc45 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
fix tests
2e5aeb2 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
Merge remote-tracking branch 'origin/v2.x.x' into reboot/SCGW/zosmf_s…
617f62d 
…cheme
@pj892031
Merge remote-tracking branch 'origin/v2.x.x' into reboot/SCGW/zosmf_s…
af207f6 
…cheme

# Conflicts:
#	common-service-core/src/main/java/org/zowe/apiml/zaas/zosmf/ZosmfResponse.java
#	gateway-service/src/main/java/org/zowe/apiml/gateway/zaas/ZaasController.java
#	gateway-service/src/test/java/org/zowe/apiml/gateway/controllers/ZaasControllerTest.java
#	integration-tests/src/test/java/org/zowe/apiml/integration/zaas/ZosmfTokensTest.java
@pj892031
integration tests
154dd8c 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
docs
f094fb2 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
code review - remove MockService.getApplication
3b36236 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
code review
ccb1ec0 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
increase code coverage
3fcc665 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
remove unused new dependency
f2a3e12 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031
sonar issue fix
c564784 
Signed-off-by: Pavel Jareš <[email protected]>
@pj892031 pj892031 marked this pull request as ready for review November 13, 2023 13:53
@pj892031 pj892031 requested a review from achmelo November 13, 2023 13:53
@sonarqubecloud SonarQubeCloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

96.0% 96.0% Coverage
0.0% 0.0% Duplication

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

@pj892031 pj892031 merged commit c059322 into v2.x.x Nov 14, 2023
32 checks passed
@delete-merged-branch delete-merged-branch bot deleted the reboot/SCGW/zosmf_scheme branch November 14, 2023 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@achmelo achmelo achmelo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pj892031 @Shobhajayanna @achmelo @weinfurt