From c8d2dd1cf12705299b0727b357d3ec5a88b2e90c Mon Sep 17 00:00:00 2001
From: Konrad Pabjan <Konrad.Pabjan@microsoft.com>
Date: Fri, 7 Feb 2020 12:05:28 -0500
Subject: [PATCH] Misc Improvements

---
 .../artifact/__tests__/upload-specification.test.ts   |  6 +++---
 packages/artifact/src/upload-http-client.ts           |  5 -----
 packages/artifact/src/utils.ts                        | 11 +++++++++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/artifact/__tests__/upload-specification.test.ts b/packages/artifact/__tests__/upload-specification.test.ts
index 64942c3a..ae4bfa17 100644
--- a/packages/artifact/__tests__/upload-specification.test.ts
+++ b/packages/artifact/__tests__/upload-specification.test.ts
@@ -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 path from 'path'
+import {promises as fs} from 'fs'
+import {getUploadSpecification} from '../src/upload-specification'
 
 const artifactName = 'my-artifact'
 const root = path.join(__dirname, '_temp', 'upload-specification')
diff --git a/packages/artifact/src/upload-http-client.ts b/packages/artifact/src/upload-http-client.ts
index dafae76a..96815561 100644
--- a/packages/artifact/src/upload-http-client.ts
+++ b/packages/artifact/src/upload-http-client.ts
@@ -46,7 +46,6 @@ export async function createArtifactInFileContainer(
   const body: string = await rawResponse.readBody()
 
   if (
-    rawResponse.message.statusCode &&
     isSuccessStatusCode(rawResponse.message.statusCode) &&
     body
   ) {
@@ -248,7 +247,6 @@ async function uploadChunk(
 
   const response = await uploadChunkRequest()
   if (
-    response.message.statusCode &&
     isSuccessStatusCode(response.message.statusCode)
   ) {
     debug(
@@ -256,7 +254,6 @@ async function uploadChunk(
     )
     return true
   } else if (
-    response.message.statusCode &&
     isRetryableStatusCode(response.message.statusCode)
   ) {
     // eslint-disable-next-line no-console
@@ -266,7 +263,6 @@ async function uploadChunk(
     await new Promise(resolve => setTimeout(resolve, 10000))
     const retryResponse = await uploadChunkRequest()
     if (
-      retryResponse.message.statusCode &&
       isSuccessStatusCode(retryResponse.message.statusCode)
     ) {
       return true
@@ -311,7 +307,6 @@ export async function patchArtifactSize(
   const body: string = await rawResponse.readBody()
 
   if (
-    rawResponse.message.statusCode &&
     isSuccessStatusCode(rawResponse.message.statusCode)
   ) {
     debug(
diff --git a/packages/artifact/src/utils.ts b/packages/artifact/src/utils.ts
index e706b4aa..a35fdb09 100644
--- a/packages/artifact/src/utils.ts
+++ b/packages/artifact/src/utils.ts
@@ -26,11 +26,18 @@ export function getApiVersion(): string {
   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
 }
 
-export function isRetryableStatusCode(statusCode: number): boolean {
+export function isRetryableStatusCode(statusCode?: number): boolean {
+  if (!statusCode) {
+    return false
+  }
+
   const retryableStatusCodes = [
     HttpCodes.BadGateway,
     HttpCodes.ServiceUnavailable,