From 0d3682e6bb87009fea33b729aa50dbe8d20c0c28 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 2 Oct 2018 16:57:40 -0700 Subject: [PATCH] Fix strict null errors in tfs --- build/tfs/common/publish.ts | 20 ++++++++++---------- build/tfs/darwin/enqueue.ts | 4 ++-- build/tfs/linux/frozen-check.ts | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/tfs/common/publish.ts b/build/tfs/common/publish.ts index 6db872226c7..100d2b88581 100644 --- a/build/tfs/common/publish.ts +++ b/build/tfs/common/publish.ts @@ -43,7 +43,7 @@ function createDefaultConfig(quality: string): Config { } function getConfig(quality: string): Promise { - const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] }); + const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] }); const collection = 'dbs/builds/colls/config'; const query = { query: `SELECT TOP 1 * FROM c WHERE c.id = @quality`, @@ -73,7 +73,7 @@ interface Asset { } function createOrUpdate(commit: string, quality: string, platform: string, type: string, release: NewDocument, asset: Asset, isUpdate: boolean): Promise { - const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] }); + const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] }); const collection = 'dbs/builds/colls/' + quality; const updateQuery = { query: 'SELECT TOP 1 * FROM c WHERE c.id = @id', @@ -127,7 +127,7 @@ async function assertContainer(blobService: azure.BlobService, quality: string): await new Promise((c, e) => blobService.createContainerIfNotExists(quality, { publicAccessLevel: 'blob' }, err => err ? e(err) : c())); } -async function doesAssetExist(blobService: azure.BlobService, quality: string, blobName: string): Promise { +async function doesAssetExist(blobService: azure.BlobService, quality: string, blobName: string): Promise { const existsResult = await new Promise((c, e) => blobService.doesBlobExist(quality, blobName, (err, r) => err ? e(err) : c(r))); return existsResult.exists; } @@ -150,8 +150,8 @@ interface PublishOptions { async function publish(commit: string, quality: string, platform: string, type: string, name: string, version: string, _isUpdate: string, file: string, opts: PublishOptions): Promise { const isUpdate = _isUpdate === 'true'; - const queuedBy = process.env['BUILD_QUEUEDBY']; - const sourceBranch = process.env['BUILD_SOURCEBRANCH']; + const queuedBy = process.env['BUILD_QUEUEDBY']!; + const sourceBranch = process.env['BUILD_SOURCEBRANCH']!; const isReleased = (quality === 'insider' || quality === 'exploration') && /^master$|^refs\/heads\/master$/.test(sourceBranch) && /Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy); @@ -179,12 +179,12 @@ async function publish(commit: string, quality: string, platform: string, type: console.log('SHA256:', sha256hash); const blobName = commit + '/' + name; - const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2']; + const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2']!; - const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2']) + const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2']!) .withFilter(new azure.ExponentialRetryPolicyFilter(20)); - const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY'], `${storageAccount}.blob.core.chinacloudapi.cn`) + const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY']!, `${storageAccount}.blob.core.chinacloudapi.cn`) .withFilter(new azure.ExponentialRetryPolicyFilter(20)); // mooncake is fussy and far away, this is needed! @@ -200,7 +200,7 @@ async function publish(commit: string, quality: string, platform: string, type: doesAssetExist(mooncakeBlobService, quality, blobName) ]); - const promises = []; + const promises: Array> = []; if (!blobExists) { promises.push(uploadBlob(blobService, quality, blobName, file)); @@ -249,7 +249,7 @@ async function publish(commit: string, quality: string, platform: string, type: isReleased: config.frozen ? false : isReleased, sourceBranch, queuedBy, - assets: [], + assets: [] as Array, updates: {} as any }; diff --git a/build/tfs/darwin/enqueue.ts b/build/tfs/darwin/enqueue.ts index f781737313f..a22f85b113d 100644 --- a/build/tfs/darwin/enqueue.ts +++ b/build/tfs/darwin/enqueue.ts @@ -20,7 +20,7 @@ interface Asset { function queueSigningRequest(quality: string, commit: string): Promise { const retryOperations = new azure.ExponentialRetryPolicyFilter(); const queueSvc = azure - .createQueueService(process.env['AZURE_STORAGE_ACCOUNT_2'], process.env['AZURE_STORAGE_ACCESS_KEY_2']) + .createQueueService(process.env['AZURE_STORAGE_ACCOUNT_2']!, process.env['AZURE_STORAGE_ACCESS_KEY_2']!) .withFilter(retryOperations); queueSvc.messageEncoder = new azure.QueueMessageEncoder.TextBase64QueueMessageEncoder(); @@ -31,7 +31,7 @@ function queueSigningRequest(quality: string, commit: string): Promise { } function isBuildSigned(quality: string, commit: string): Promise { - const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] }); + const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] }); const collection = 'dbs/builds/colls/' + quality; const updateQuery = { query: 'SELECT TOP 1 * FROM c WHERE c.id = @id', diff --git a/build/tfs/linux/frozen-check.ts b/build/tfs/linux/frozen-check.ts index c97d33b3953..09bc36a2406 100644 --- a/build/tfs/linux/frozen-check.ts +++ b/build/tfs/linux/frozen-check.ts @@ -20,7 +20,7 @@ function createDefaultConfig(quality: string): Config { } function getConfig(quality: string): Promise { - const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] }); + const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] }); const collection = 'dbs/builds/colls/config'; const query = { query: `SELECT TOP 1 * FROM c WHERE c.id = @quality`, -- GitLab