Porting #8219 into m139 (#8221)

Author: keljos

Tasks/MavenV2/maventask.ts

@@ -2,7 +2,6 @@
 import Q = require('q');
 import os = require('os');
 import path = require('path');
-import fs = require('fs');
 
 import tl = require('vsts-task-lib/task');
 import {ToolRunner} from 'vsts-task-lib/toolrunner';
@@ -193,7 +192,7 @@ async function execBuild() {
                     }
                     return util.mergeCredentialsIntoSettingsXml(settingsXmlFile, repositories);
                 })
-                .fail(function (err) {
+                .catch(function (err) {
                     return Q.reject(err);
                 });
             } else {
@@ -323,8 +322,7 @@ function publishJUnitTestResults(testResultsFiles: string) {
         tl.debug('Pattern found in testResultsFiles parameter');
         var buildFolder = tl.getVariable('System.DefaultWorkingDirectory');
         tl.debug(`buildFolder=${buildFolder}`);
-        var allFiles = tl.find(buildFolder);
-        matchingJUnitResultFiles = tl.match(allFiles, testResultsFiles, {
+        matchingJUnitResultFiles = tl.findMatch(buildFolder, testResultsFiles, null, {
             matchBase: true
         });
     }
@@ -385,9 +383,9 @@ function enableCodeCoverage() : Q.Promise<any> {
     }
 
     // clean any previously generated files.
-    tl.rmRF(targetDirectory, true);
-    tl.rmRF(reportDirectory, true);
-    tl.rmRF(reportPOMFile, true);
+    tl.rmRF(targetDirectory);
+    tl.rmRF(reportDirectory);
+    tl.rmRF(reportPOMFile);
 
     var buildProps: { [key: string]: string } = {};
     buildProps['buildfile'] = mavenPOMFile;

Tasks/MavenV2/mavenutil.ts

@@ -4,25 +4,19 @@ import path = require('path');
 import fs = require('fs');
 import tl = require('vsts-task-lib/task');
 import tr = require('vsts-task-lib/toolrunner');
-import locationHelpers = require("nuget-task-common/LocationHelpers"); // TODO: refactor
+import * as pkgLocationUtils from "utility-common/packaging/locationUtilities";
 import systemToken = require('utility-common/accesstoken');
 
 import * as url from "url";
-import * as str from 'string';
 import * as xml2js from 'xml2js';
 import * as fse from 'fs-extra';
-import * as cheerio from 'cheerio';
-import * as vsts from "vso-node-api/WebApi";
 
 let stripbom = require('strip-bom');
 let base64 = require('base-64');
 let utf8 = require('utf8');
 let uuidV4 = require("uuid/v4");
 
 const accessTokenEnvSetting: string = 'ENV_MAVEN_ACCESS_TOKEN';
-const ApiVersion = "3.0-preview.1";
-const PackagingAreaName: string = "maven";
-const PackageAreaId: string = "F285A171-0DF5-4C49-AAF2-17D0D37D9F0E";
 
 function readXmlFileAsJson(filePath: string): Q.Promise<any> {
     return readFile(filePath, 'utf-8')
@@ -33,7 +27,7 @@ function readFile(filePath: string, encoding: string): Q.Promise<string> {
     return Q.nfcall<string>(fs.readFile, filePath, encoding);
 }
 
-function convertXmlStringToJson(xmlContent: string): Q.Promise<any> {
+async function convertXmlStringToJson(xmlContent: string): Promise<any> {
     return Q.nfcall<any>(xml2js.parseString, stripbom(xmlContent));
 }
 
@@ -44,7 +38,7 @@ function writeJsonAsXmlFile(filePath: string, jsonContent: any, rootName:string)
         rootName: rootName
     });
     let xml = builder.buildObject(jsonContent);
-    xml = str(xml).replaceAll('&#xD;', '').s;
+    xml = xml.replace(/&#xD;/g, "");
     return writeFile(filePath, xml);
 }
 
@@ -194,64 +188,78 @@ interface RepositoryInfo {
     id:string;
 }
 
-function collectFeedRepositories(pomContents:string): Q.Promise<any> {
-    return convertXmlStringToJson(pomContents).then(function (pomJson) {
-        let repos:RepositoryInfo[] = [];
-        if (!pomJson) {
-            tl.debug('Incomplete pom: ' + pomJson);
-            return Q.resolve(repos);
-        }
-        let collectionUrl = tl.getVariable("System.TeamFoundationCollectionUri");
-        return locationHelpers.assumeNuGetUriPrefixes(collectionUrl).then(function (packageUrl) {
-            tl.debug('collectionUrl=' + collectionUrl);
-            tl.debug('packageUrl=' + packageUrl);
-            let collectionHostname:string = url.parse(collectionUrl).hostname.toLowerCase();
-            let packageHostname:string = packageUrl[1];
-            if (packageHostname) {
-                url.parse(packageHostname).hostname.toLowerCase();
-            } else {
-                packageHostname = collectionHostname;
-            }
-            let parseRepos:(project) => void = function(project) {
-                if (project && project.repositories) {
-                    for (let r of project.repositories) {
-                        r = r instanceof Array ? r[0] : r;
-                        if (r.repository) {
-                            for (let repo of r.repository) {
-                                repo = repo instanceof Array ? repo[0] : repo;
-                                let url:string = repo.url instanceof Array ? repo.url[0] : repo.url;
-                                if (url && (url.toLowerCase().includes(collectionHostname) ||
-                                            url.toLowerCase().includes(packageHostname))) {
-                                tl.debug('using credentials for url: ' + url);
-                                repos.push({
-                                    id: (repo.id && repo.id instanceof Array)
-                                        ? repo.id[0]
-                                        : repo.id
-                                    });
-                                }
-                            }
+async function collectFeedRepositories(pomContents:string): Promise<any> {
+    let pomJson = await convertXmlStringToJson(pomContents);
+    let repos:RepositoryInfo[] = [];
+    if (!pomJson) {
+        tl.debug('Incomplete pom: ' + pomJson);
+        return Promise.resolve(repos);
+    }
+    const collectionUrl = tl.getVariable("System.TeamFoundationCollectionUri");
+    let packagingLocation: pkgLocationUtils.PackagingLocation;
+    try {
+        packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.Maven);
+    } catch (error) {
+        tl.debug("Unable to get packaging URIs, using default collection URI");
+        tl.debug(JSON.stringify(error));
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl
+        };
+    }
+
+    let packageUrl = packagingLocation.DefaultPackagingUri;
+    tl.debug('collectionUrl=' + collectionUrl);
+    tl.debug('packageUrl=' + packageUrl);
+    let collectionName:string = url.parse(collectionUrl).hostname.toLowerCase();
+    let collectionPathName = url.parse(collectionUrl).pathname;
+    if(collectionPathName && collectionPathName.length > 1) {
+        collectionName = collectionName + collectionPathName.toLowerCase();
+        tl.debug('collectionName=' + collectionName);
+    }
+    if (packageUrl) {
+        url.parse(packageUrl).hostname.toLowerCase();
+    } else {
+        packageUrl = collectionName;
+    }
+    let parseRepos:(project) => void = function(project) {
+        if (project && project.repositories) {
+            for (let r of project.repositories) {
+                r = r instanceof Array ? r[0] : r;
+                if (r.repository) {
+                    for (let repo of r.repository) {
+                        repo = repo instanceof Array ? repo[0] : repo;
+                        let url:string = repo.url instanceof Array ? repo.url[0] : repo.url;
+                        if (url && (url.toLowerCase().includes(collectionName) ||
+                                    url.toLowerCase().includes(packageUrl))) {
+                        tl.debug('using credentials for url: ' + url);
+                        repos.push({
+                            id: (repo.id && repo.id instanceof Array)
+                                ? repo.id[0]
+                                : repo.id
+                            });
                         }
                     }
                 }
-            };
-
-            if (pomJson.projects && pomJson.projects.project) {
-                for (let project of pomJson.projects.project) {
-                    parseRepos(project);
-                }
-            } else if (pomJson.project) {
-                parseRepos(pomJson.project);
-            } else {
-                tl.warning(tl.loc('EffectivePomInvalid'));
             }
+        }
+    };
 
-            tl.debug('Feeds found: ' + JSON.stringify(repos));
-            return Q.resolve(repos);
-        });
-    });
+    if (pomJson.projects && pomJson.projects.project) {
+        for (let project of pomJson.projects.project) {
+            parseRepos(project);
+        }
+    } else if (pomJson.project) {
+        parseRepos(pomJson.project);
+    } else {
+        tl.warning(tl.loc('EffectivePomInvalid'));
+    }
+
+    tl.debug('Feeds found: ' + JSON.stringify(repos));
+    return Promise.resolve(repos);
 }
 
-export function collectFeedRepositoriesFromEffectivePom(mavenOutput:string): Q.Promise<any> {
+export function collectFeedRepositoriesFromEffectivePom(mavenOutput:string): Promise<any> {
     tl.debug('collecting account feeds from effective pom');
     const effectivePomStartTag:string = '<!-- Effective POM';
     const projectsBeginTag:string = '<projects';
@@ -263,7 +271,7 @@ export function collectFeedRepositoriesFromEffectivePom(mavenOutput:string): Q.P
     let effectivePomStart:number = xml.lastIndexOf(effectivePomStartTag);
     if (effectivePomStart === -1) {
         tl.warning(tl.loc('EffectivePomInvalid'));
-        return Q.resolve(true);
+        return Promise.resolve(true);
     }
 
     let xmlStart:number = xml.indexOf(projectsBeginTag, effectivePomStart);
@@ -281,7 +289,7 @@ export function collectFeedRepositoriesFromEffectivePom(mavenOutput:string): Q.P
     }
 
     tl.warning(tl.loc('EffectivePomInvalid'));
-    return Q.resolve(true);
+    return Promise.resolve(true);
 }
 
 export function getExecOptions(): tr.IExecOptions {