Skip to content

chore: minor log improvements #4647

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

Draft
richard-salac wants to merge 2 commits into
base: v3.x.x
Choose a base branch
from
Draft

chore: minor log improvements #4647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bc802f
log when applid is missing from service metadata
richard-salac May 20, 2026
82cb890
move passticket logs
richard-salac May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apiml/src/main/java/org/zowe/apiml/ZaasSchemeTransformApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,9 @@ private <R> Mono<AuthorizationResponse<R>> handleMissingOrInvalidAuth(OtelReques
return createAuthorizationResponse((ErrorHeaders) response.getHeaders(), null);
}

private <R> Mono<AuthorizationResponse<R>> handleMissingApplicationName(OtelRequestContext context) {
private <R> Mono<AuthorizationResponse<R>> handleMissingApplicationName(String serviceId, OtelRequestContext context) {
context.authErrorType(ApplicationNameNotProvidedException.class.getName());
log.warn("Service '{}' is missing APPLID set", serviceId);
return createAuthorizationResponse(createErrorMessage("ApplicationName not provided."),null);
}

Expand All @@ -134,7 +135,7 @@ public Mono<AuthorizationResponse<TicketResponse>> passticket(RequestCredentials
var applicationName = requestCredentials.getApplId();
var otelRequestContext = OtelRequestContext.of(exchange);
if (StringUtils.isBlank(applicationName)) {
return handleMissingApplicationName(otelRequestContext);
return handleMissingApplicationName(requestCredentials.getServiceId(), otelRequestContext);
}

try {
Expand Down Expand Up @@ -186,7 +187,7 @@ public Mono<AuthorizationResponse<ZaasTokenResponse>> safIdt(RequestCredentials
var applicationName = requestCredentials.getApplId();
var otelRequestContext = OtelRequestContext.of(exchange);
if (StringUtils.isBlank(applicationName)) {
return handleMissingApplicationName(otelRequestContext);
return handleMissingApplicationName(requestCredentials.getServiceId(), otelRequestContext);
}

try {
Expand Down
5 changes: 4 additions & 1 deletion common-service-core/src/main/java/org/zowe/apiml/passticket/PassTicketService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,11 @@ public synchronized void evaluate(String userId, String applId, String passTicke
// IRRPassTicket is not thread-safe, must be synchronized
public synchronized String generate(String userId, String applId) throws PassTicketException {
try {
log.debug("Generating PassTicket for user: {} and ZOSMF applid: {}", userId, applId);
validateUserIdAndApplId(userId, applId);
return irrPassTicket.generate(userId.toUpperCase(), applId.toUpperCase());
var passTicket = irrPassTicket.generate(userId.toUpperCase(), applId.toUpperCase());
log.debug("Generated PassTicket: {}", passTicket);
return passTicket;
} catch (RuntimeException e) {
log.debug("Error during pass ticket generation, userId={}, applid={}, exception={}", userId, applId, e);
throw e;
Expand Down
3 changes: 0 additions & 3 deletions zaas-service/src/main/java/org/zowe/apiml/zaas/security/service/TokenCreationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,7 @@

private String generatePassTicket(String user) {
try {
log.debug("Generating PassTicket for user: {} and ZOSMF applid: {}", user, zosmfApplId);
String passTicket = passTicketService.generate(user, zosmfApplId);

Check warning on line 106 in zaas-service/src/main/java/org/zowe/apiml/zaas/security/service/TokenCreationService.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Immediately return this expression instead of assigning it to the temporary variable "passTicket". 


See more on https://sonarcloud.io/project/issues?id=zowe_api-layer&issues=AZ5pflmjC-MIXhLv8d-u&open=AZ5pflmjC-MIXhLv8d-u&pullRequest=4647
log.debug("Generated PassTicket: {}", passTicket);

return passTicket;
} catch (IRRPassTicketGenerationException e) {
throw new AuthenticationTokenException("Generation of PassTicket failed", e);
Expand Down
Loading