Replacing archiver package with direct use of zip-stream for fixing macOS upload issues
#1690
updating errors
- Loading branch information
commit 67c383759c81ccff5a529046352d022e8ae675c2
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,124 +1,119 @@ | ||
| import * as core from '@actions/core' | ||
| import { | ||
| UploadArtifactOptions, | ||
| UploadArtifactResponse | ||
| } from '../shared/interfaces' | ||
| import {getExpiration} from './retention' | ||
| import {validateArtifactName} from './path-and-artifact-name-validation' | ||
| import {internalArtifactTwirpClient} from '../shared/artifact-twirp-client' | ||
| import { | ||
| UploadZipSpecification, | ||
| getUploadZipSpecification, | ||
| validateRootDirectory | ||
| } from './upload-zip-specification' | ||
| import {getBackendIdsFromToken} from '../shared/util' | ||
| import {uploadZipToBlobStorage} from './blob-upload' | ||
| import {createZipUploadStream} from './zip' | ||
| import { | ||
| CreateArtifactRequest, | ||
| FinalizeArtifactRequest, | ||
| StringValue | ||
| } from '../../generated' | ||
| import {FilesNotFoundError, InvalidResponseError} from '../shared/errors' | ||
|
|
||
| export async function uploadArtifact( | ||
| name: string, | ||
| files: string[], | ||
| rootDirectory: string, | ||
| options?: UploadArtifactOptions | undefined | ||
| ): Promise<UploadArtifactResponse> { | ||
| validateArtifactName(name) | ||
| validateRootDirectory(rootDirectory) | ||
|
|
||
| const zipSpecification: UploadZipSpecification[] = getUploadZipSpecification( | ||
| files, | ||
| rootDirectory | ||
| ) | ||
| if (zipSpecification.length === 0) { | ||
| throw new FilesNotFoundError( | ||
| zipSpecification.flatMap(s => (s.sourcePath ? [s.sourcePath] : [])) | ||
| ) | ||
| } | ||
|
|
||
| // get the IDs needed for the artifact creation | ||
| const backendIds = getBackendIdsFromToken() | ||
|
|
||
| // create the artifact client | ||
| const artifactClient = internalArtifactTwirpClient() | ||
|
|
||
| // create the artifact | ||
| const createArtifactReq: CreateArtifactRequest = { | ||
| workflowRunBackendId: backendIds.workflowRunBackendId, | ||
| workflowJobRunBackendId: backendIds.workflowJobRunBackendId, | ||
| name, | ||
| version: 4 | ||
| } | ||
|
|
||
| // if there is a retention period, add it to the request | ||
| const expiresAt = getExpiration(options?.retentionDays) | ||
| if (expiresAt) { | ||
| createArtifactReq.expiresAt = expiresAt | ||
| } | ||
|
|
||
| const createArtifactResp = | ||
| await artifactClient.CreateArtifact(createArtifactReq) | ||
| if (!createArtifactResp.ok) { | ||
| throw new InvalidResponseError( | ||
| 'CreateArtifact: response from backend was not ok' | ||
| ) | ||
| } | ||
| // Create the zipupload stream for use in blob upload | ||
| const zipUploadStream = await createZipUploadStream( | ||
| zipSpecification, | ||
| options?.compressionLevel | ||
| ).catch(err => { | ||
| throw new InvalidResponseError( | ||
| `createZipUploadStream: response from backend was not ok: ${err}` | ||
| ) | ||
| }) | ||
|
|
||
| // Upload zip to blob storage | ||
| const uploadResult = await uploadZipToBlobStorage( | ||
| createArtifactResp.signedUploadUrl, | ||
| zipUploadStream | ||
| ).catch(err => { | ||
| throw new InvalidResponseError( | ||
| `uploadZipToBlobStorage: response blob was not ok: ${err}` | ||
| ) | ||
| }) | ||
| // finalize the artifact | ||
| const finalizeArtifactReq: FinalizeArtifactRequest = { | ||
| workflowRunBackendId: backendIds.workflowRunBackendId, | ||
| workflowJobRunBackendId: backendIds.workflowJobRunBackendId, | ||
| name, | ||
| size: uploadResult.uploadSize ? uploadResult.uploadSize.toString() : '0' | ||
| } | ||
| if (uploadResult.sha256Hash) { | ||
| finalizeArtifactReq.hash = StringValue.create({ | ||
| value: `sha256:${uploadResult.sha256Hash}` | ||
| }) | ||
| } | ||
| core.info(`Finalizing artifact upload`) | ||
| const finalizeArtifactResp = | ||
| await artifactClient.FinalizeArtifact(finalizeArtifactReq) | ||
| if (!finalizeArtifactResp.ok) { | ||
| throw new InvalidResponseError( | ||
| 'FinalizeArtifact: response from backend was not ok' | ||
| ) | ||
| } | ||
|
|
||
| const artifactId = BigInt(finalizeArtifactResp.artifactId) | ||
| core.info( | ||
| `Artifact ${name}.zip successfully finalized. Artifact ID ${artifactId}` | ||
| ) | ||
|
|
||
| return { | ||
| size: uploadResult.uploadSize, | ||
| id: Number(artifactId) | ||
| } | ||
| } | ||
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.
This error message might be a bit misleading since errors can come from that function without reaching out to a backend.