Address comments

Author: Seth Rait

lib/container-mapping.js

@@ -38,6 +38,8 @@ const core = __importStar(require("@actions/core"));
 const exec = __importStar(require("@actions/exec"));
 const os = __importStar(require("os"));
 const sendReportRetryCount = 1;
+const GetScanContextURL = "https://dfdinfra-afdendpoint-prod-d5fqbucbg7fue0cf.z01.azurefd.net/github/v1/auth-push/GetScanContext?context=authOnly";
+const ContainerMappingURL = "https://dfdinfra-afdendpoint-prod-d5fqbucbg7fue0cf.z01.azurefd.net/github/v1/container-mappings";
 class ContainerMapping {
     constructor() {
         this.succeedOnError = true;
@@ -166,7 +168,6 @@ class ContainerMapping {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                 let apiTime = new Date().getMilliseconds();
-                let url = "https://dfdinfra-afdendpoint-prod-d5fqbucbg7fue0cf.z01.azurefd.net/github/v1/container-mappings";
                 let options = {
                     method: 'POST',
                     timeout: 2500,
@@ -176,8 +177,8 @@ class ContainerMapping {
                         'Content-Length': data.length
                     }
                 };
-                core.debug(`${options['method'].toUpperCase()} ${url}`);
-                const req = https.request(url, options, (res) => {
+                core.debug(`${options['method'].toUpperCase()} ${ContainerMappingURL}`);
+                const req = https.request(ContainerMappingURL, options, (res) => {
                     let resData = '';
                     res.on('data', (chunk) => {
                         resData += chunk.toString();
@@ -215,32 +216,31 @@ class ContainerMapping {
                 }
                 else {
                     core.debug(`Unexpected status code: ${statusCode}`);
-                    if (retryCount == 0) {
-                        return false;
-                    }
-                    else {
-                        core.info(`Retrying API call.\nRetry count: ${retryCount}`);
-                        retryCount--;
-                        return yield this.checkCallerIsCustomer(bearerToken, retryCount);
-                    }
+                    return yield this.retryCall(bearerToken, retryCount);
                 }
             }))
                 .catch((error) => __awaiter(this, void 0, void 0, function* () {
-                if (retryCount == 0) {
-                    return false;
-                }
-                else {
-                    core.info(`Retrying checkCallerIsCustomer call due to error: ${error}.\nRetry count: ${retryCount}`);
-                    retryCount--;
-                    return yield this.checkCallerIsCustomer(bearerToken, retryCount);
-                }
+                core.info(`Unexpected error: ${error}.`);
+                return yield this.retryCall(bearerToken, retryCount);
             }));
         });
     }
+    retryCall(bearerToken, retryCount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (retryCount == 0) {
+                core.info(`All retries failed.`);
+                return false;
+            }
+            else {
+                core.info(`Retrying checkCallerIsCustomer.\nRetry count: ${retryCount}`);
+                retryCount--;
+                return yield this.checkCallerIsCustomer(bearerToken, retryCount);
+            }
+        });
+    }
     _checkCallerIsCustomer(bearerToken) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                let url = "https://dfdinfra-afdendpoint-prod-d5fqbucbg7fue0cf.z01.azurefd.net/github/v1/auth-push/GetScanContext?context=authOnly";
                 let options = {
                     method: 'GET',
                     timeout: 2500,
@@ -249,8 +249,8 @@ class ContainerMapping {
                         'Authorization': 'Bearer ' + bearerToken,
                     }
                 };
-                core.debug(`${options['method'].toUpperCase()} ${url}`);
-                const req = https.request(url, options, (res) => {
+                core.debug(`${options['method'].toUpperCase()} ${GetScanContextURL}`);
+                const req = https.request(GetScanContextURL, options, (res) => {
                     res.on('end', () => {
                         resolve(res.statusCode);
                     });

src/container-mapping.ts

@@ -252,6 +252,7 @@ export class ContainerMapping implements IMicrosoftSecurityDevOps {
 
     private async retryCall(bearerToken: string, retryCount: number): Promise<boolean> {
         if (retryCount == 0) {
+            core.info(`All retries failed.`);
             return false;
         } else {
             core.info(`Retrying checkCallerIsCustomer.\nRetry count: ${retryCount}`);