-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
SIGN-7471 - connector logs support #31
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ import * as core from '@actions/core'; | |
import * as moment from 'moment'; | ||
import url from 'url'; | ||
|
||
import { SubmitSigningRequestResult, ValidationResult } from './dtos/submit-signing-request-result'; | ||
import { LogEntry, LogLevelDebug, LogLevelError, LogLevelInformation, LogLevelWarning, SubmitSigningRequestResult, ValidationResult } from './dtos/submit-signing-request-result'; | ||
import { buildSignPathAuthorizationHeader, executeWithRetries, httpErrorResponseToText } from './utils'; | ||
import { SignPathUrlBuilder } from './signpath-url-builder'; | ||
import { SigningRequestDto } from './dtos/signing-request'; | ||
|
@@ -88,6 +88,7 @@ export class Task { | |
|
||
this.checkResponseStructure(response); | ||
this.checkCiSystemValidationResult(response.validationResult); | ||
this.redirectConnectorLogsToActionLogs(response.logs); | ||
|
||
const signingRequestUrlObj = url.parse(response.signingRequestUrl); | ||
this.urlBuilder.signPathBaseUrl = signingRequestUrlObj.protocol + '//' + signingRequestUrlObj.host; | ||
|
@@ -292,10 +293,35 @@ export class Task { | |
|
||
// if neither validationResult nor signingRequestId are present, | ||
// then the response might be not from the connector | ||
core.error(`Unexpected response from the SignPath connector: ${JSON.stringify(response)}`); | ||
throw new Error(`SignPath signing request was not created. Please make sure that connector-url is pointing to the SignPath GitHub Actions connector endpoint.`); | ||
} | ||
} | ||
|
||
private redirectConnectorLogsToActionLogs(logs: LogEntry[]): void { | ||
if (logs && logs.length > 0) { | ||
logs.forEach(log => { | ||
switch (log.level) { | ||
case LogLevelDebug: | ||
core.debug(log.message); | ||
break; | ||
case LogLevelInformation: | ||
core.info(log.message); | ||
break; | ||
case LogLevelWarning: | ||
core.warning(log.message); | ||
break; | ||
case LogLevelError: | ||
core.error(log.message); | ||
break; | ||
default: | ||
core.info(log.message); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Uhmm, should we maybe prefix this with unknown log level or something? IDK |
||
break; | ||
} | ||
}); | ||
} | ||
} | ||
|
||
private buildSigningRequestPayload(): any { | ||
return { | ||
signPathApiToken: this.helperInputOutput.signPathApiToken, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will logging to the error stream cause the workflow to actually fail? How does this interfere with the validation result?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, it will not. This has nothing to do with the validation result. It’s simply a way to convey additional information to the user—such as notifying them that, during validation, we noticed they have a policy file, so we will use it. Such a message is not part of the validation result; it’s just additional insight into what was happening in the connector.