ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix file upload (#22725)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-04-13 20:51:03 -07:00
committed by GitHub
parent bb3ddc7364
commit 537df7cbac
2 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
build/azure-pipelines/common/publish.js
View File

@@ -109,25 +109,18 @@ async function assertContainer(containerClient) {
return containerResponse && !!containerResponse.errorCode; return containerResponse && !!containerResponse.errorCode;
} }
async function uploadBlob(blobClient, file) { async function uploadBlob(blobClient, file) {
var _a; var _a, _b;
blobClient.setHTTPHeaders({ const result = await blobClient.uploadFile(file, {
blobContentType: mime.lookup(file), blobHTTPHeaders: {
blobCacheControl: 'max-age=31536000, public' blobContentType: mime.lookup(file),
blobCacheControl: 'max-age=31536000, public'
}
}); });
const copyPoller = await blobClient.beginCopyFromURL(file, { if (result && !result.errorCode) {
onProgress(state) { console.log(`Blobs uploaded successfully, response status: ${(_a = result === null || result === void 0 ? void 0 : result._response) === null || _a === void 0 ? void 0 : _a.status}`);
console.log(`Progress: ${state.copyProgress}`);
},
});
while (!copyPoller.isDone()) {
await copyPoller.poll();
}
const result = copyPoller.getResult();
if (result && result.copyStatus === 'success') {
console.log(`Blobs uploaded successfully.`);
} }
else { else {
console.error(`Blobs failed to upload, response status: ${(_a = result === null || result === void 0 ? void 0 : result._response) === null || _a === void 0 ? void 0 : _a.status}, copy status: ${result === null || result === void 0 ? void 0 : result.copyStatus}, errorcode: ${result === null || result === void 0 ? void 0 : result.errorCode}`); console.error(`Blobs failed to upload, response status: ${(_b = result === null || result === void 0 ? void 0 : result._response) === null || _b === void 0 ? void 0 : _b.status}, errorcode: ${result === null || result === void 0 ? void 0 : result.errorCode}`);
} }
} }
async function publish(commit, quality, platform, type, name, version, _isUpdate, file, opts) { async function publish(commit, quality, platform, type, name, version, _isUpdate, file, opts) {
@@ -162,7 +155,7 @@ async function publish(commit, quality, platform, type, name, version, _isUpdate
}); });
let containerClient = blobServiceClient.getContainerClient(quality); let containerClient = blobServiceClient.getContainerClient(quality);
if (await assertContainer(containerClient)) { if (await assertContainer(containerClient)) {
const blobClient = containerClient.getBlobClient(blobName); const blobClient = containerClient.getBlockBlobClient(blobName);
const blobExists = await blobClient.exists(); const blobExists = await blobClient.exists();
if (blobExists) { if (blobExists) {
console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`); console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);

30
build/azure-pipelines/common/publish.ts
View File

@@ -11,7 +11,7 @@ import * as crypto from 'crypto';
import * as mime from 'mime'; import * as mime from 'mime';
import * as minimist from 'minimist'; import * as minimist from 'minimist';
import { DocumentClient, NewDocument } from 'documentdb'; import { DocumentClient, NewDocument } from 'documentdb';
import { BlobServiceClient, BlobClient, ContainerClient, StorageRetryPolicyType } from '@azure/storage-blob'; import { BlobServiceClient, BlockBlobClient, ContainerClient, StorageRetryPolicyType } from '@azure/storage-blob';
// {{SQL CARBON EDIT}} // {{SQL CARBON EDIT}}
if (process.argv.length < 9) { if (process.argv.length < 9) {
@@ -132,25 +132,17 @@ async function assertContainer(containerClient: ContainerClient): Promise<boolea
return containerResponse && !!containerResponse.errorCode; return containerResponse && !!containerResponse.errorCode;
} }
async function uploadBlob(blobClient: BlobClient, file: string): Promise<void> { async function uploadBlob(blobClient: BlockBlobClient, file: string): Promise<void> {
blobClient.setHTTPHeaders({ const result = await blobClient.uploadFile(file, {
blobContentType: mime.lookup(file), blobHTTPHeaders: {
blobCacheControl: 'max-age=31536000, public' blobContentType: mime.lookup(file),
blobCacheControl: 'max-age=31536000, public'
}
}); });
const copyPoller = await blobClient.beginCopyFromURL(file, { if (result && !result.errorCode) {
onProgress(state) { console.log(`Blobs uploaded successfully, response status: ${result?._response?.status}`);
console.log(`Progress: ${state.copyProgress}`);
},
});
while (!copyPoller.isDone()) {
await copyPoller.poll();
}
const result = copyPoller.getResult();
if (result && result.copyStatus === 'success') {
console.log(`Blobs uploaded successfully.`);
} else { } else {
console.error(`Blobs failed to upload, response status: ${result?._response?.status}, copy status: ${result?.copyStatus}, errorcode: ${result?.errorCode}`) console.error(`Blobs failed to upload, response status: ${result?._response?.status}, errorcode: ${result?.errorCode}`)
} }
} }
@@ -199,7 +191,7 @@ async function publish(commit: string, quality: string, platform: string, type:
let containerClient = blobServiceClient.getContainerClient(quality); let containerClient = blobServiceClient.getContainerClient(quality);
if (await assertContainer(containerClient)) { if (await assertContainer(containerClient)) {
const blobClient = containerClient.getBlobClient(blobName); const blobClient = containerClient.getBlockBlobClient(blobName);
const blobExists = await blobClient.exists(); const blobExists = await blobClient.exists();
if (blobExists) { if (blobExists) {