Merge pull request #1019 from salesforcecli/t/packaging-distribution/W-19170618/Bug-Fixes

T/packaging distribution/w 19170618/bug fixes

Author: dawson-david-salesforce

command-snapshot.json

@@ -63,10 +63,18 @@
     "flags": ["api-version", "description", "flags-dir", "json", "loglevel", "name", "target-dev-hub"],
     "plugin": "@salesforce/plugin-packaging"
   },
+  {
+    "alias": [],
+    "command": "package:bundle:delete",
+    "flagAliases": ["apiversion", "noprompt", "target-hub-org", "targetdevhubusername"],
+    "flagChars": ["b", "n", "v"],
+    "flags": ["api-version", "bundle", "flags-dir", "json", "loglevel", "no-prompt", "target-dev-hub"],
+    "plugin": "@salesforce/plugin-packaging"
+  },
   {
     "alias": [],
     "command": "package:bundle:install",
-    "flagAliases": ["apiversion", "target-hub-org", "targetdevhubusername", "targetusername", "u"],
+    "flagAliases": ["apiversion", "targetusername", "u"],
     "flagChars": ["b", "o", "v", "w"],
     "flags": [
       "api-version",
@@ -84,27 +92,19 @@
   {
     "alias": [],
     "command": "package:bundle:install:list",
-    "flagAliases": ["apiversion", "createdlastdays", "target-hub-org", "targetdevhubusername"],
-    "flagChars": ["c", "s", "v"],
+    "flagAliases": ["apiversion", "createdlastdays", "targetusername", "u"],
+    "flagChars": ["c", "o", "s"],
     "flags": ["api-version", "created-last-days", "flags-dir", "json", "loglevel", "status", "target-org", "verbose"],
     "plugin": "@salesforce/plugin-packaging"
   },
   {
     "alias": [],
     "command": "package:bundle:install:report",
-    "flagAliases": ["apiversion", "packageinstallrequestid", "target-hub-org", "targetdevhubusername"],
-    "flagChars": ["i", "v"],
+    "flagAliases": ["apiversion", "packageinstallrequestid", "targetusername", "u"],
+    "flagChars": ["i", "o"],
     "flags": ["api-version", "flags-dir", "json", "loglevel", "package-install-request-id", "target-org", "verbose"],
     "plugin": "@salesforce/plugin-packaging"
   },
-  {
-    "alias": [],
-    "command": "package:bundle:delete",
-    "flagAliases": ["apiversion", "noprompt", "target-hub-org", "targetdevhubusername"],
-    "flagChars": ["b", "n", "v"],
-    "flags": ["api-version", "bundle", "flags-dir", "json", "loglevel", "no-prompt", "target-dev-hub"],
-    "plugin": "@salesforce/plugin-packaging"
-  },
   {
     "alias": [],
     "command": "package:bundle:list",
@@ -116,8 +116,8 @@
   {
     "alias": [],
     "command": "package:bundle:version:create",
-    "flagAliases": ["apiversion", "target-hub-org", "targetdevhubusername"],
-    "flagChars": ["b", "d", "p", "v", "w"],
+    "flagAliases": ["apiversion", "target-hub-org", "targetdevhubusername", "versionnumber"],
+    "flagChars": ["b", "d", "n", "p", "v", "w"],
     "flags": [
       "api-version",
       "bundle",
@@ -128,6 +128,7 @@
       "loglevel",
       "target-dev-hub",
       "verbose",
+      "version-number",
       "wait"
     ],
     "plugin": "@salesforce/plugin-packaging"

messages/bundle_install.md

@@ -20,6 +20,10 @@ Package bundle version to install (format: BundleName@Version).
 
 Target org for the bundle installation.
 
+# flags.target-dev-hub.summary
+
+Username, alias, or org ID of the target dev hub org.
+
 # flags.wait.summary
 
 Number of minutes to wait for the installation to complete.

messages/bundle_version_create.md

@@ -32,6 +32,10 @@ Show verbose output of the command execution.
 
 Show detailed information about the bundle version creation process.
 
+# flags.version-number.summary
+
+Version number of the package bundle version to be created; overrides the sfdx-project.json value.
+
 # flags.description.summary
 
 Description of the package bundle version.
@@ -46,7 +50,8 @@ Package Bundle version creation completed with status: %s
 
 # multipleErrors
 
-The following errors occurred during bundle version creation:%s
+The following errors occurred during bundle version creation:
+%s
 
 # InProgress
 

src/commands/package/bundle/install.ts

@@ -15,7 +15,6 @@ import {
 import { BundleSObjects, BundleInstallOptions, PackageBundleInstall } from '@salesforce/packaging';
 import { Messages, Lifecycle } from '@salesforce/core';
 import { camelCaseToTitleCase, Duration } from '@salesforce/kit';
-import { requiredHubFlag } from '../../../utils/hubFlag.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-packaging', 'bundle_install');
@@ -37,7 +36,11 @@ export class PackageBundlesInstall extends SfCommand<BundleSObjects.PkgBundleVer
     }),
     'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
-    'target-dev-hub': requiredHubFlag,
+    'target-dev-hub': Flags.string({
+      char: 'v',
+      summary: messages.getMessage('flags.target-dev-hub.summary'),
+      required: true,
+    }),
     wait: Flags.integer({
       char: 'w',
       summary: messages.getMessage('flags.wait.summary'),
@@ -53,14 +56,28 @@ export class PackageBundlesInstall extends SfCommand<BundleSObjects.PkgBundleVer
 
     // Get the target org connection
     const targetOrg = flags['target-org'];
-    const targetDevHub = flags['target-dev-hub'];
+    const targetDevHubFlag = flags['target-dev-hub'];
     const connection = targetOrg.getConnection(flags['api-version']);
 
+    // Check if targetDevHub is already a valid org ID (starts with 00D and is 18 characters)
+    const orgIdRegex = /^00D[a-zA-Z0-9]{15}$/;
+    let targetDevHub: string;
+
+    if (orgIdRegex.test(targetDevHubFlag)) {
+      // It's already an org ID, use it directly
+      targetDevHub = targetDevHubFlag;
+    } else {
+      // It's a username/alias, resolve it to an org and get the org ID
+      const { Org } = await import('@salesforce/core');
+      const devHubOrg = await Org.create({ aliasOrUsername: targetDevHubFlag, isDevHub: true });
+      targetDevHub = devHubOrg.getOrgId();
+    }
+
     const options: BundleInstallOptions = {
       connection,
       project: this.project!,
       PackageBundleVersion: flags.bundle,
-      DevelopmentOrganization: targetDevHub.getOrgId() ?? '',
+      DevelopmentOrganization: targetDevHub,
     };
 
     // Set up lifecycle events for progress tracking

src/commands/package/bundle/install/list.ts

@@ -5,11 +5,16 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand } from '@salesforce/sf-plugins-core';
+import {
+  Flags,
+  loglevel,
+  orgApiVersionFlagWithDeprecations,
+  requiredOrgFlagWithDeprecations,
+  SfCommand,
+} from '@salesforce/sf-plugins-core';
 import { Connection, Messages } from '@salesforce/core';
 import { BundleSObjects, PackageBundleInstall } from '@salesforce/packaging';
 import chalk from 'chalk';
-import { requiredHubFlag } from '../../../../utils/hubFlag.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-packaging', 'bundle_install_list');
@@ -25,7 +30,7 @@ export class PackageBundleInstallListCommand extends SfCommand<PackageBundleInst
   public static readonly examples = messages.getMessages('examples');
   public static readonly flags = {
     loglevel,
-    'target-org': requiredHubFlag,
+    'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
     'created-last-days': Flags.integer({
       char: 'c',

src/commands/package/bundle/install/report.ts

@@ -5,12 +5,17 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand } from '@salesforce/sf-plugins-core';
+import {
+  Flags,
+  loglevel,
+  orgApiVersionFlagWithDeprecations,
+  requiredOrgFlagWithDeprecations,
+  SfCommand,
+} from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 import { BundleSObjects, PackageBundleInstall } from '@salesforce/packaging';
 import chalk from 'chalk';
 import { camelCaseToTitleCase } from '@salesforce/kit';
-import { requiredHubFlag } from '../../../../utils/hubFlag.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-packaging', 'bundle_install_report');
@@ -25,7 +30,7 @@ export class PackageBundleInstallReportCommand extends SfCommand<ReportCommandRe
   public static readonly examples = messages.getMessages('examples');
   public static readonly flags = {
     loglevel,
-    'target-org': requiredHubFlag,
+    'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
     // eslint-disable-next-line sf-plugin/id-flag-suggestions
     'package-install-request-id': Flags.salesforceId({

src/commands/package/bundle/version/create.ts

@@ -54,18 +54,34 @@ export class PackageBundlesCreate extends SfCommand<BundleSObjects.PackageBundle
     verbose: Flags.boolean({
       summary: messages.getMessage('flags.verbose.summary'),
     }),
+    'version-number': Flags.string({
+      deprecateAliases: true,
+      aliases: ['versionnumber'],
+      char: 'n',
+      summary: messages.getMessage('flags.version-number.summary'),
+    }),
   };
 
   public async run(): Promise<BundleSObjects.PackageBundleVersionCreateRequestResult> {
     const { flags } = await this.parse(PackageBundlesCreate);
+
+    // Parse version number if provided
+    let majorVersion = '';
+    let minorVersion = '';
+    if (flags['version-number']) {
+      const versionParts = flags['version-number'].split('.');
+      majorVersion = versionParts[0] || '';
+      minorVersion = versionParts[1] || '';
+    }
+
     const options: BundleVersionCreateOptions = {
       connection: flags['target-dev-hub'].getConnection(flags['api-version']),
       project: this.project!,
       PackageBundle: flags.bundle,
       BundleVersionComponentsPath: flags['definition-file'],
       Description: flags.description,
-      MajorVersion: '',
-      MinorVersion: '',
+      MajorVersion: majorVersion,
+      MinorVersion: minorVersion,
       Ancestor: '',
     };
     Lifecycle.getInstance().on(
@@ -106,7 +122,7 @@ export class PackageBundlesCreate extends SfCommand<BundleSObjects.PackageBundle
 
     switch (result.RequestStatus) {
       case BundleSObjects.PkgBundleVersionCreateReqStatus.error:
-        throw messages.createError('multipleErrors', ['Unknown error']);
+        throw messages.createError('multipleErrors', [result.Error?.join('\n') ?? 'Unknown error']);
       case BundleSObjects.PkgBundleVersionCreateReqStatus.success:
         this.log(messages.getMessage('bundleVersionCreateSuccess', [result.Id]));
         break;

src/commands/package/bundle/version/report.ts

@@ -194,7 +194,7 @@ export class PackageBundleVersionReportCommand extends SfCommand<BundleVersionRe
       'Package Name': component.Name,
       'Package Version Number': `${component.MajorVersion}.${component.MinorVersion}.${component.PatchVersion}.${component.BuildNumber}`,
       'Package Version Id': component.Id,
-      'Package Subscriber Id': component.SubscriberPackageId,
+      'Package Id': component.SubscriberPackageId,
     }));
 
     this.table({ data: displayRecords, title: chalk.blue('Component Packages') });

test/commands/bundle/bundleInstallReport.test.ts

@@ -104,7 +104,7 @@ describe('package:bundle:install:report - tests', () => {
       await cmd.run();
       expect.fail('Expected error was not thrown');
     } catch (error) {
-      expect((error as Error).message).to.include('No default dev hub found');
+      expect((error as Error).message).to.include('No default environment found');
     }
   });
 

test/commands/bundle/packageBundleVersionCreate.test.ts

@@ -222,7 +222,7 @@ describe('package:bundle:version:create - tests', () => {
         assert.fail('the above should throw multiple errors');
       } catch (e) {
         expect((e as Error).message).to.equal(
-          'The following errors occurred during bundle version creation:Unknown error'
+          'The following errors occurred during bundle version creation:\nPropertyController: Invalid type: Schema.Property__c\nSampleDataController: Invalid type: Schema.Property__c\nSampleDataController: Invalid type: Schema.Broker__c'
         );
       }
     });