actions/toolkit
1
0
Fork 0
mirror of https://github.com/actions/toolkit synced 2025-05-11 01:22:57 +00:00
Code Activity

Minor fixes

Browse source
This commit is contained in:
Konrad Pabjan 2020-01-30 19:53:26 -05:00
parent e6f55916d2
commit 7f482379e4
2 changed files with 37 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

69
packages/artifact/__tests__/upload.test.ts
View file

@ -5,7 +5,7 @@ import * as path from 'path'
import * as uploadHttpClient from '../src/upload-artifact-http-client'
import {promises as fs} from 'fs'
import {getRuntimeUrl} from '../src/config-variables'
import {HttpClient, HttpClientResponse} from '@actions/http-client/index'
import {HttpClient, HttpClientResponse} from '@actions/http-client'
import {
CreateArtifactResponse,
PatchArtifactSizeSuccessResponse
@ -268,44 +268,43 @@ describe('Upload Tests', () => {
function mockHttpPost(): void {
// eslint-disable-next-line @typescript-eslint/unbound-method
HttpClient.prototype.post = async (
requestdata,
data
): Promise<HttpClientResponse> => {
// parse the input data and use the provided artifact name as part of the response
const inputData = JSON.parse(data)
const mockMessage = new http.IncomingMessage(new net.Socket())
let mockReadBody = mockReadBodyEmpty
HttpClient.prototype.post = jest.fn(
async (requestdata, data): Promise<HttpClientResponse> => {
// parse the input data and use the provided artifact name as part of the response
const inputData = JSON.parse(data)
const mockMessage = new http.IncomingMessage(new net.Socket())
let mockReadBody = mockReadBodyEmpty
if (inputData.Name === 'invalid-artifact-name') {
mockMessage.statusCode = 400
} else {
mockMessage.statusCode = 201
const response: CreateArtifactResponse = {
containerId: '13',
size: -1,
signedContent: 'false',
fileContainerResourceUrl: `${getRuntimeUrl()}_apis/resources/Containers/13`,
type: 'actions_storage',
name: inputData.Name,
url: `${getRuntimeUrl()}_apis/pipelines/1/runs/1/artifacts?artifactName=${
inputData.Name
}`
if (inputData.Name === 'invalid-artifact-name') {
mockMessage.statusCode = 400
} else {
mockMessage.statusCode = 201
const response: CreateArtifactResponse = {
containerId: '13',
size: -1,
signedContent: 'false',
fileContainerResourceUrl: `${getRuntimeUrl()}_apis/resources/Containers/13`,
type: 'actions_storage',
name: inputData.Name,
url: `${getRuntimeUrl()}_apis/pipelines/1/runs/1/artifacts?artifactName=${
inputData.Name
}`
}
const returnData: string = JSON.stringify(response, null, 2)
mockReadBody = async function(): Promise<string> {
return new Promise(resolve => {
resolve(returnData)
})
}
}
const returnData: string = JSON.stringify(response, null, 2)
mockReadBody = async function(): Promise<string> {
return new Promise(resolve => {
resolve(returnData)
return new Promise<HttpClientResponse>(resolve => {
resolve({
message: mockMessage,
readBody: mockReadBody
})
}
}
return new Promise<HttpClientResponse>(resolve => {
resolve({
message: mockMessage,
readBody: mockReadBody
})
})
}
}
)
}
function mockHttpSendStream(): void {

10
packages/artifact/src/upload-artifact-http-client.ts
View file

@ -138,7 +138,7 @@ export async function uploadArtifactToFileContainer(
)
// eslint-disable-next-line no-console
console.log(`Total size of all the files uploaded ${fileSizes}`)
console.log(`Total size of all the files uploaded is ${fileSizes} bytes`)
return {
size: fileSizes,
failedItems: failedItemsToReport
@ -320,12 +320,8 @@ export async function patchArtifactSize(
if (rawResponse.message.statusCode === 200) {
const successResponse: PatchArtifactSizeSuccessResponse = JSON.parse(body)
// eslint-disable-next-line no-console
console.log(
`Artifact ${artifactName} uploaded successfully, total size ${size}`
)
// eslint-disable-next-line no-console
console.log(successResponse)
debug(`Artifact ${artifactName} uploaded successfully, total size ${size}`)
debug(successResponse.toString())
} else if (rawResponse.message.statusCode === 404) {
throw new Error(`An Artifact with the name ${artifactName} was not found`)
} else {