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

chore: Integration tests runnable with API ML v2 on z/OS #4022

Open
wants to merge 24 commits into
base: v2.x.x
Choose a base branch
from
Open

chore: Integration tests runnable with API ML v2 on z/OS #4022

wants to merge 24 commits into from
+899 −513

Conversation

nxhafa
Copy link
Contributor

@nxhafa nxhafa commented Mar 5, 2025 •
edited by pablocarle
Loading

Description

Fix integration tests runnable with API ML v2 on z/OS.
Cherry pick of changes from the following PRs in v3:
#3971
#3967

Type of change

  • chore: Chore, repository cleanup, updates the dependencies.

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

@github-actions github-actions bot added the Sensitive Sensitive change that requires peer review label Mar 5, 2025
pablocarle
pablocarle reviewed Mar 7, 2025
View reviewed changes
config/local/gateway-service.yml
Comment on lines +58 to +60
webSocket:
requestBufferSize: 16348
max-http-request-header-size: 16348
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these are v3-specific, we need to verify

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://www.baeldung.com/spring-boot-max-http-header-size#servermax-http-request-header-size

It seems there should be server.max-http-header-size.

The websocket config is probably only Zowe related (see WebSocketConfig). I would rather remove both.

parse cookie
d3e5f02 
Signed-off-by: Pablo Carle <[email protected]>
Pablo Carle and others added 11 commits March 10, 2025 13:08
changes not meant for v2
7cef278 
Signed-off-by: Pablo Carle <[email protected]>
wip
12d9522 
Signed-off-by: Pablo Carle <[email protected]>
rollback v3 specific changes
fe8a867 
Signed-off-by: Pablo Carle <[email protected]>
fix return code
61a0247 
Signed-off-by: Pablo Carle <[email protected]>
assertion message
b2d3392 
Signed-off-by: Pablo Carle <[email protected]>
@pj892031
cherry-pick of changes from v3
63ce607 
Signed-off-by: Pavel Jareš <[email protected]>
Revert "cherry-pick of changes from v3"
a5980ba 
This reverts commit 63ce607.
remove applied lpar in infinispan
d2ca941 
Signed-off-by: Pablo Carle <[email protected]>
@pj892031
fix log messages
eb864f2 
Signed-off-by: Pavel Jareš <[email protected]>
add debug logs to PATs
20010ff 
Signed-off-by: Pablo Carle <[email protected]>
fix unit test
738c643 
Signed-off-by: Pablo Carle <[email protected]>
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
92.9% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

Pablo Carle added 2 commits March 11, 2025 15:25
wip fixes for caching service
8b434cd 
Signed-off-by: Pablo Carle <[email protected]>
wip fix test
f89510c 
Signed-off-by: Pablo Carle <[email protected]>
@pablocarle pablocarle requested a review from pj892031 March 11, 2025 14:44
fix unit test
9949c79 
Signed-off-by: Pablo Carle <[email protected]>
pj892031
pj892031 reviewed Mar 11, 2025
View reviewed changes
config/local/gateway-service.yml
Comment on lines +58 to +60
webSocket:
requestBufferSize: 16348
max-http-request-header-size: 16348
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://www.baeldung.com/spring-boot-max-http-header-size#servermax-http-request-header-size

It seems there should be server.max-http-header-size.

The websocket config is probably only Zowe related (see WebSocketConfig). I would rather remove both.

...ests/src/test/java/org/zowe/apiml/integration/authentication/pat/AccessTokenServiceTest.java
.then().statusCode(401);
.then()
.statusCode(204);
IntStream.range(0, 3).forEach(x -> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe using deterministic routing would be better, but I guess it is good enough.

...ation-tests/src/test/java/org/zowe/apiml/integration/authentication/providers/QueryTest.java
@@ -86,7 +88,7 @@ void givenValidTokenInHeader(String queryUrl) {
@MethodSource("org.zowe.apiml.integration.authentication.providers.QueryTest#queryUrlsSource")
void givenValidTokenInCookie(String queryUrl) {
given()
.cookie(COOKIE, token)
.cookie(COOKIE, validToken)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks strange to me. The cookie should contain also the cookie name.

integration-tests/src/test/java/org/zowe/apiml/util/http/HttpRequestUtils.java
.build();
} catch (URISyntaxException e) {
log.error("Can't create URI for endpoint '{}'", endpoint);
e.printStackTrace();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even this is just a test, we should use the logger.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablocarle pablocarle pablocarle left review comments

@pj892031 pj892031 pj892031 left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
Sensitive Sensitive change that requires peer review size/XXL
Projects
API Mediation Layer Backlog Management
Status: In Progress
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nxhafa @pablocarle @pj892031