Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d304fe599 | ||
|
|
8cf7e029de | ||
|
|
a6bf8726aa | ||
|
|
ae9272d5cb | ||
|
|
f481b8c8dc | ||
|
|
59851786d4 |
+12
-1
@@ -50,7 +50,18 @@ function setSecret(secret: string): void {}
|
|||||||
|
|
||||||
Now, future logs containing BAR will be masked. E.g. running `echo "Hello FOO BAR World"` will now print `Hello FOO **** World`.
|
Now, future logs containing BAR will be masked. E.g. running `echo "Hello FOO BAR World"` will now print `Hello FOO **** World`.
|
||||||
|
|
||||||
**WARNING** The add-mask and setSecret commands only support single line secrets. To register a multiline secrets you must register each line individually otherwise it will not be masked.
|
**WARNING** The add-mask and setSecret commands only support single-line
|
||||||
|
secrets or multi-line secrets that have been escaped. `@actions/core`
|
||||||
|
`setSecret` will escape the string you provide by default. When an escaped
|
||||||
|
multi-line string is provided the whole string and each of its lines
|
||||||
|
individually will be masked. For example you can mask `first\nsecond\r\nthird`
|
||||||
|
using:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
echo "::add-mask::first%0Asecond%0D%0Athird"
|
||||||
|
```
|
||||||
|
|
||||||
|
This will mask `first%0Asecond%0D%0Athird`, `first`, `second` and `third`.
|
||||||
|
|
||||||
**WARNING** Do **not** mask short values if you can avoid it, it could render your output unreadable (and future steps' output as well).
|
**WARNING** Do **not** mask short values if you can avoid it, it could render your output unreadable (and future steps' output as well).
|
||||||
For example, if you mask the letter `l`, running `echo "Hello FOO BAR World"` will now print `He*********o FOO BAR Wor****d`
|
For example, if you mask the letter `l`, running `echo "Hello FOO BAR World"` will now print `He*********o FOO BAR Wor****d`
|
||||||
|
|||||||
+39
-1
@@ -37,9 +37,12 @@ export class DownloadProgress {
|
|||||||
segmentSize: number
|
segmentSize: number
|
||||||
segmentOffset: number
|
segmentOffset: number
|
||||||
receivedBytes: number
|
receivedBytes: number
|
||||||
|
previouslyReceivedBytes: number
|
||||||
|
lastTimeOfNewBytes?: number
|
||||||
startTime: number
|
startTime: number
|
||||||
displayedComplete: boolean
|
displayedComplete: boolean
|
||||||
timeoutHandle?: ReturnType<typeof setTimeout>
|
timeoutHandle?: ReturnType<typeof setTimeout>
|
||||||
|
abortController?: AbortController
|
||||||
|
|
||||||
constructor(contentLength: number) {
|
constructor(contentLength: number) {
|
||||||
this.contentLength = contentLength
|
this.contentLength = contentLength
|
||||||
@@ -47,8 +50,11 @@ export class DownloadProgress {
|
|||||||
this.segmentSize = 0
|
this.segmentSize = 0
|
||||||
this.segmentOffset = 0
|
this.segmentOffset = 0
|
||||||
this.receivedBytes = 0
|
this.receivedBytes = 0
|
||||||
|
this.previouslyReceivedBytes = 0
|
||||||
|
this.lastTimeOfNewBytes = undefined
|
||||||
this.displayedComplete = false
|
this.displayedComplete = false
|
||||||
this.startTime = Date.now()
|
this.startTime = Date.now()
|
||||||
|
this.abortController = undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -62,6 +68,7 @@ export class DownloadProgress {
|
|||||||
this.segmentIndex = this.segmentIndex + 1
|
this.segmentIndex = this.segmentIndex + 1
|
||||||
this.segmentSize = segmentSize
|
this.segmentSize = segmentSize
|
||||||
this.receivedBytes = 0
|
this.receivedBytes = 0
|
||||||
|
this.previouslyReceivedBytes = 0
|
||||||
|
|
||||||
core.debug(
|
core.debug(
|
||||||
`Downloading segment at offset ${this.segmentOffset} with length ${this.segmentSize}...`
|
`Downloading segment at offset ${this.segmentOffset} with length ${this.segmentSize}...`
|
||||||
@@ -84,6 +91,22 @@ export class DownloadProgress {
|
|||||||
return this.segmentOffset + this.receivedBytes
|
return this.segmentOffset + this.receivedBytes
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setLastTimeOfNewBytes(): void {
|
||||||
|
this.lastTimeOfNewBytes = Date.now()
|
||||||
|
}
|
||||||
|
|
||||||
|
getLastTimeOfNewBytes(): number | undefined {
|
||||||
|
return this.lastTimeOfNewBytes
|
||||||
|
}
|
||||||
|
|
||||||
|
setAbortController(abortReference: AbortController): void {
|
||||||
|
this.abortController = abortReference
|
||||||
|
}
|
||||||
|
|
||||||
|
triggerAbortController(): void {
|
||||||
|
this.abortController?.abort()
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns true if the download is complete.
|
* Returns true if the download is complete.
|
||||||
*/
|
*/
|
||||||
@@ -125,7 +148,21 @@ export class DownloadProgress {
|
|||||||
*/
|
*/
|
||||||
onProgress(): (progress: TransferProgressEvent) => void {
|
onProgress(): (progress: TransferProgressEvent) => void {
|
||||||
return (progress: TransferProgressEvent) => {
|
return (progress: TransferProgressEvent) => {
|
||||||
this.setReceivedBytes(progress.loadedBytes)
|
if (progress.loadedBytes > this.getTransferredBytes()) {
|
||||||
|
this.setReceivedBytes(progress.loadedBytes)
|
||||||
|
this.setLastTimeOfNewBytes()
|
||||||
|
} else {
|
||||||
|
// if download hanging for more than 2 minutes
|
||||||
|
if (
|
||||||
|
this.getLastTimeOfNewBytes() !== undefined &&
|
||||||
|
Date.now() - this.getLastTimeOfNewBytes()! > 120000
|
||||||
|
) {
|
||||||
|
this.triggerAbortController()
|
||||||
|
throw new Error(
|
||||||
|
'Aborting cache download as the download has stalled for more than 2 minutes.'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -252,6 +289,7 @@ export async function downloadCacheStorageSDK(
|
|||||||
try {
|
try {
|
||||||
downloadProgress.startDisplayTimer()
|
downloadProgress.startDisplayTimer()
|
||||||
const controller = new AbortController()
|
const controller = new AbortController()
|
||||||
|
downloadProgress.setAbortController(controller)
|
||||||
const abortSignal = controller.signal
|
const abortSignal = controller.signal
|
||||||
while (!downloadProgress.isDone()) {
|
while (!downloadProgress.isDone()) {
|
||||||
const segmentStart =
|
const segmentStart =
|
||||||
|
|||||||
@@ -161,7 +161,11 @@ describe('@actions/core', () => {
|
|||||||
|
|
||||||
it('setSecret produces the correct command', () => {
|
it('setSecret produces the correct command', () => {
|
||||||
core.setSecret('secret val')
|
core.setSecret('secret val')
|
||||||
assertWriteCalls([`::add-mask::secret val${os.EOL}`])
|
core.setSecret('multi\nline\r\nsecret')
|
||||||
|
assertWriteCalls([
|
||||||
|
`::add-mask::secret val${os.EOL}`,
|
||||||
|
`::add-mask::multi%0Aline%0D%0Asecret${os.EOL}`
|
||||||
|
])
|
||||||
})
|
})
|
||||||
|
|
||||||
it('prependPath produces the correct commands and sets the env', () => {
|
it('prependPath produces the correct commands and sets the env', () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user