actions
/
toolkit
mirror of https://github.com/actions/toolkit
1
0
Fork 0
Code

Misc Improvements

pull/304/head
Konrad Pabjan 2020-02-07 12:05:28 -05:00
parent 813bcf1e6d
commit c8d2dd1cf1
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/artifact/__tests__/upload-specification.test.ts
View File

@ -1,7 +1,7 @@
import {promises as fs} from 'fs'
import * as path from 'path'
import {getUploadSpecification} from '../src/upload-specification'
import * as io from '../../io/src/io' import * as io from '../../io/src/io'
import * as path from 'path'
import {promises as fs} from 'fs'
import {getUploadSpecification} from '../src/upload-specification'
const artifactName = 'my-artifact' const artifactName = 'my-artifact'
const root = path.join(__dirname, '_temp', 'upload-specification') const root = path.join(__dirname, '_temp', 'upload-specification')

5
packages/artifact/src/upload-http-client.ts
View File

@ -46,7 +46,6 @@ export async function createArtifactInFileContainer(
const body: string = await rawResponse.readBody() const body: string = await rawResponse.readBody()
if ( if (
rawResponse.message.statusCode &&
isSuccessStatusCode(rawResponse.message.statusCode) && isSuccessStatusCode(rawResponse.message.statusCode) &&
body body
) { ) {
@ -248,7 +247,6 @@ async function uploadChunk(
const response = await uploadChunkRequest() const response = await uploadChunkRequest()
if ( if (
response.message.statusCode &&
isSuccessStatusCode(response.message.statusCode) isSuccessStatusCode(response.message.statusCode)
) { ) {
debug( debug(
@ -256,7 +254,6 @@ async function uploadChunk(
) )
return true return true
} else if ( } else if (
response.message.statusCode &&
isRetryableStatusCode(response.message.statusCode) isRetryableStatusCode(response.message.statusCode)
) { ) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
@ -266,7 +263,6 @@ async function uploadChunk(
await new Promise(resolve => setTimeout(resolve, 10000)) await new Promise(resolve => setTimeout(resolve, 10000))
const retryResponse = await uploadChunkRequest() const retryResponse = await uploadChunkRequest()
if ( if (
retryResponse.message.statusCode &&
isSuccessStatusCode(retryResponse.message.statusCode) isSuccessStatusCode(retryResponse.message.statusCode)
) { ) {
return true return true
@ -311,7 +307,6 @@ export async function patchArtifactSize(
const body: string = await rawResponse.readBody() const body: string = await rawResponse.readBody()
if ( if (
rawResponse.message.statusCode &&
isSuccessStatusCode(rawResponse.message.statusCode) isSuccessStatusCode(rawResponse.message.statusCode)
) { ) {
debug( debug(

11
packages/artifact/src/utils.ts
View File

@ -26,11 +26,18 @@ export function getApiVersion(): string {
return '6.0-preview' return '6.0-preview'
} }
export function isSuccessStatusCode(statusCode: number): boolean { export function isSuccessStatusCode(statusCode?: number): boolean {
if (!statusCode) {
return false
}
return statusCode >= 200 && statusCode < 300 return statusCode >= 200 && statusCode < 300
} }
export function isRetryableStatusCode(statusCode: number): boolean { export function isRetryableStatusCode(statusCode?: number): boolean {
if (!statusCode) {
return false
}
const retryableStatusCodes = [ const retryableStatusCodes = [
HttpCodes.BadGateway, HttpCodes.BadGateway,
HttpCodes.ServiceUnavailable, HttpCodes.ServiceUnavailable,