fix: pr comments

forcedotcom · Jan 29, 2025 · 1a540c4 · 1a540c4
1 parent 081bc6f
commit 1a540c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/src/interfaces/packagingInterfacesAndType.ts b/src/interfaces/packagingInterfacesAndType.ts
@@ -561,8 +561,3 @@ export type PackagePushRequestReportJobFailuresResult = {
   ErrorType: string;
   PackagePushJobId: string;
 };
-
-export type PackagePushUpgradeAbortResult = {
-  PushRequestId: string;
-  Status: string;
-};
diff --git a/src/package/packagePushUpgrade.ts b/src/package/packagePushUpgrade.ts
@@ -18,7 +18,6 @@ import {
   PackagePushRequestJobCountByStatusResult,
   PackagePushRequestReportJobFailuresResult,
   PackagePushRequestAbortQueryOptions,
-  PackagePushUpgradeAbortResult,
 } from '../interfaces';
 import { applyErrorAction, massageErrorMessage } from '../utils/packageUtils';
 
@@ -189,10 +188,7 @@ export class PackagePushUpgrade {
     }
   }
 
-  public static async abort(
-    connection: Connection,
-    options: PackagePushRequestAbortQueryOptions
-  ): Promise<PackagePushUpgradeAbortResult> {
+  public static async abort(connection: Connection, options: PackagePushRequestAbortQueryOptions): Promise<boolean> {
     try {
       // Fetch the current status of the PackagePushRequest
       const abortQuery = util.format(getPushRequestStatusQuery(), getPushRequestStatusWhereClause(options));
@@ -219,15 +215,12 @@ export class PackagePushUpgrade {
       });
 
       // Return the updated PackagePushRequest details
-      return {
-        PushRequestId: pushRequest.Id,
-        Status: 'Canceled',
-      };
+      return true;
     } catch (err) {
       if (err instanceof Error) {
         throw applyErrorAction(massageErrorMessage(err));
       }
-      throw err;
+      return false;
     }
   }
 
@@ -346,6 +339,6 @@ function getPushRequestStatusWhereClause(options: PackagePushRequestAbortQueryOp
 }
 
 function getPushRequestStatusQuery(): string {
-  const QUERY = 'SELECT PackageVersionId, Id, Status FROM PackagePushRequest ' + '%s';
+  const QUERY = 'SELECT Id, Status FROM PackagePushRequest ' + '%s';
   return QUERY;
 }