AppCenterDistributeV3: Removed abort request as it doesn't exist anymore in new upload flow. (#15418)

* Removed abort request as it doesn't exist anymore in new upload flow.

* Bumped minor version.

* Fixed minor version to match current sprint.

* Fixing unit tests.

* Removed outdated test.

Co-authored-by: Djordje Marjanovic <[email protected]>

Author: velimir-jankovic

Tasks/AppCenterDistributeV3/Tests/L0.ts

@@ -252,16 +252,6 @@ describe('AppCenterDistribute L0 Suite', function () {
         assert(tr.succeeded, 'task should have succeeded');
     });
 
-    it('Negative path: failed when HTTP status is not 2xx', function () {
-        this.timeout(defaultTimeout);
-
-        let tp = path.join(__dirname, 'L0FailsHttpStatusNot2xx.js');
-        let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
-
-        tr.run();
-        assert(tr.succeeded, 'task should have succeeded');
-    });
-
     it('Positive path: publish silent update', function () {
         this.timeout(defaultTimeout);
 

Tasks/AppCenterDistributeV3/Tests/L0EmptyBuildVersionDoesntAppearInBody.ts

@@ -23,7 +23,7 @@ nock('https://example.test')
     .post('/v0.1/apps/testuser/testapp/uploads/releases', body => body.build_version)
     .reply(404, {
         upload_id: 1,
-        upload_url: 'https://example.upload.test/release_upload'
+        upload_url: 'https://example.upload.test/uploads/releases'
     });
 
 //begin symbol upload

Tasks/AppCenterDistributeV3/Tests/L0FailsHttpStatusNot2xx.ts

@@ -19,7 +19,7 @@ export const assertByExitCode = {
 
 export function basicSetup() {
 
-  const uploadDomain = 'https://example.upload.test/release_upload';
+  const uploadDomain = 'https://example.upload.test/uploads/releases';
   const assetId = "00000000-0000-0000-0000-000000000123";
   const uploadId = 7;
 

Tasks/AppCenterDistributeV3/Tests/UnitTests/TestHelpers.ts

@@ -212,33 +212,6 @@ function uploadRelease(releaseUploadParams: UploadInfo, file: string): Promise<a
     });
 }
 
-function abortReleaseUpload(apiServer: string, apiVersion: string, appSlug: string, upload_id: string, token: string, userAgent: string): Q.Promise<void> {
-    tl.debug("-- Aborting release...");
-    let defer = Q.defer<void>();
-    let patchReleaseUrl: string = `${apiServer}/${apiVersion}/apps/${appSlug}/release_uploads/${upload_id}`;
-    tl.debug(`---- url: ${patchReleaseUrl}`);
-    let headers = {
-        "X-API-Token": token,
-        "User-Agent": userAgent,
-        "internal-request-source": "VSTS"
-    };
-
-    let abortedBody = { "status": "aborted" };
-
-    request.patch({ url: patchReleaseUrl, headers: headers, json: abortedBody }, (err, res, body) => {
-        responseHandler(defer, err, res, body, () => {
-
-            const { message } = body;
-            if (err) {
-                defer.reject(`Failed to abort release upload: ${message}`);
-            }
-            defer.resolve();
-        });
-    })
-
-    return defer.promise;
-}
-
 function patchRelease(apiServer: string, apiVersion: string, appSlug: string, upload_id: string, token: string, userAgent: string): Q.Promise<void> {
     tl.debug("-- Finishing uploading release...");
     let defer = Q.defer<void>();
@@ -659,20 +632,11 @@ async function run() {
         let uploadInfo: UploadInfo = await beginReleaseUpload(effectiveApiServer, effectiveApiVersion, appSlug, apiToken, userAgent, buildVersion);
         const uploadId = uploadInfo.id;
         let releaseId: string;
-        try {
 
-            // Perform the upload
-            await uploadRelease(uploadInfo, app);
-            await patchRelease(effectiveApiServer, effectiveApiVersion, appSlug, uploadId, apiToken, userAgent);
-            releaseId = await loadReleaseIdUntilSuccess(effectiveApiServer, effectiveApiVersion, appSlug, uploadId, apiToken, userAgent);
-        } catch (error) {
-            try {
-                return abortReleaseUpload(effectiveApiServer, effectiveApiVersion, appSlug, uploadId, apiToken, userAgent);
-            } catch (abortError) {
-                tl.debug("---- Failed to abort release upload");
-            }
-            throw error;
-        }
+        await uploadRelease(uploadInfo, app);
+        await patchRelease(effectiveApiServer, effectiveApiVersion, appSlug, uploadId, apiToken, userAgent);
+        releaseId = await loadReleaseIdUntilSuccess(effectiveApiServer, effectiveApiVersion, appSlug, uploadId, apiToken, userAgent);
+
         await updateRelease(effectiveApiServer, effectiveApiVersion, appSlug, releaseId, releaseNotes, apiToken, userAgent);
 
         await Q.all(destinationIds.map(destinationId => {

Tasks/AppCenterDistributeV3/appcenterdistribute.ts

@@ -13,7 +13,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 3,
-        "Minor": 186,
+        "Minor": 195,
         "Patch": 0
     },
     "releaseNotes": "Added support for forwarding Android mapping to App Center Diagnostics. Added missing descriptions.",

Tasks/AppCenterDistributeV3/task.json

@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 186,
+    "Minor": 195,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",