fix: fix bundle cli issues dev preview

Author: btrn11

command-snapshot.json

@@ -74,19 +74,9 @@
   {
     "alias": [],
     "command": "package:bundle:install",
-    "flagAliases": ["apiversion", "targetdevhubusername", "targetusername", "u"],
-    "flagChars": ["b", "o", "v", "w"],
-    "flags": [
-      "api-version",
-      "bundle",
-      "flags-dir",
-      "json",
-      "loglevel",
-      "target-dev-hub",
-      "target-org",
-      "verbose",
-      "wait"
-    ],
+    "flagAliases": ["apiversion", "targetusername", "u"],
+    "flagChars": ["b", "d", "o", "w"],
+    "flags": ["api-version", "bundle", "dev-hub-org", "flags-dir", "json", "loglevel", "target-org", "verbose", "wait"],
     "plugin": "@salesforce/plugin-packaging"
   },
   {

messages/bundle_create.md

@@ -5,7 +5,7 @@ Create a package bundle in the Dev Hub org.
 # description
 
 A package bundle is an artifact that contains one or more 2GP managed packages.
-A bundle can be listed on AppExchange, installed, or upgraded as a single artifact.
+A bundle can be installed, or upgraded as a single artifact.
 
 # examples
 

messages/bundle_install.md

@@ -8,21 +8,29 @@ Install a specific version of a package bundle in the target org. During develop
 
 # examples
 
-Install a package bundle version in a scratch org:
+- Install a package bundle version in a scratch org:
 
-sf package bundle install --bundle MyPkgBundle1@0.1 --target-org my-scratch-org --wait 10
+  <%= config.bin %> <%= command.id %> --bundle MyPkgBundle1@0.1 --target-org my-scratch-org --dev-hub-org 00Dxx0000000000 --wait 10
+
+- Install using a bundle version ID:
+
+  <%= config.bin %> <%= command.id %> --bundle 1Q8Wt0000000q1pKAA --target-org my-scratch-org --dev-hub-org 00Dxx0000000000 --wait 10
 
 # flags.bundle.summary
 
-Package bundle version to install (format: BundleName@Version).
+Package bundle version to install (format: BundleName@Version or bundle version ID).
 
 # flags.target-org.summary
 
 Target org for the bundle installation.
 
-# flags.target-dev-hub.summary
+# flags.dev-hub-org.summary
+
+Org ID of the dev hub org where the bundle was created.
+
+# flags.dev-hub-org.description
 
-Username, alias, or org ID of the target dev hub org.
+Specify the dev hub org ID directly (e.g., 00Dxx0000000000). This is the org where the bundle was originally created.
 
 # flags.wait.summary
 
@@ -55,4 +63,4 @@ Encountered errors installing the bundle! %s
 # bundleInstallInProgress
 
 Bundle installation is currently %s. You can continue to query the status using
-sf package bundle install:report -i %s -o %s
+sf package bundle install report -i %s -o %s

messages/bundle_version_create_list.md

@@ -1,6 +1,6 @@
 # summary
 
-List package version creation requests.
+List package bundle version creation requests.
 
 # description
 

src/commands/package/bundle/install.ts

@@ -18,7 +18,6 @@ import {
   Flags,
   loglevel,
   orgApiVersionFlagWithDeprecations,
-  requiredHubFlagWithDeprecations,
   requiredOrgFlagWithDeprecations,
   SfCommand,
 } from '@salesforce/sf-plugins-core';
@@ -46,7 +45,14 @@ export class PackageBundlesInstall extends SfCommand<BundleSObjects.PkgBundleVer
     }),
     'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
-    'target-dev-hub': requiredHubFlagWithDeprecations,
+    'dev-hub-org': Flags.salesforceId({
+      length: 'both',
+      char: 'd',
+      summary: messages.getMessage('flags.dev-hub-org.summary'),
+      description: messages.getMessage('flags.dev-hub-org.description'),
+      startsWith: '00D',
+      required: true,
+    }),
     wait: Flags.integer({
       char: 'w',
       summary: messages.getMessage('flags.wait.summary'),
@@ -62,15 +68,13 @@ export class PackageBundlesInstall extends SfCommand<BundleSObjects.PkgBundleVer
 
     // Get the target org connection
     const targetOrg = flags['target-org'];
-    const targetDevHub = flags['target-dev-hub'];
     const connection = targetOrg.getConnection(flags['api-version']);
-    const devHubOrgId = targetDevHub.getOrgId();
 
     const options: BundleInstallOptions = {
       connection,
       project: this.project!,
       PackageBundleVersion: flags.bundle,
-      DevelopmentOrganization: devHubOrgId,
+      DevelopmentOrganization: flags['dev-hub-org'],
     };
 
     // Set up lifecycle events for progress tracking

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

@@ -130,7 +130,7 @@ export class PackageBundlesCreate extends SfCommand<BundleSObjects.PackageBundle
       case BundleSObjects.PkgBundleVersionCreateReqStatus.error:
         throw messages.createError('multipleErrors', [result.Error?.join('\n') ?? 'Unknown error']);
       case BundleSObjects.PkgBundleVersionCreateReqStatus.success:
-        this.log(messages.getMessage('bundleVersionCreateSuccess', [result.Id]));
+        this.log(`Successfully created bundle version ${result.PackageBundleVersionId}`);
         break;
       default:
         this.log(messages.getMessage('InProgress', [camelCaseToTitleCase(result.RequestStatus as string), result.Id]));

test/commands/bundle/bundleInstall.test.ts

@@ -60,7 +60,6 @@ const pkgBundleInstallQueuedResult: BundleSObjects.PkgBundleVersionInstallReqRes
 describe('package:bundle:install - tests', () => {
   const $$ = new TestContext();
   const testOrg = new MockTestOrgData();
-  const testHubOrg = new MockTestOrgData();
   let installStub = $$.SANDBOX.stub(PackageBundleInstall, 'installBundle');
   const config = new Config({ root: import.meta.url });
 
@@ -75,7 +74,7 @@ describe('package:bundle:install - tests', () => {
   };
 
   before(async () => {
-    await $$.stubAuths(testOrg, testHubOrg);
+    await $$.stubAuths(testOrg);
     await config.load();
   });
 
@@ -93,7 +92,7 @@ describe('package:bundle:install - tests', () => {
       installStub.resolves(pkgBundleInstallSuccessResult);
 
       const cmd = new PackageBundlesInstall(
-        ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--target-dev-hub', 'test@hub.org'],
+        ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--dev-hub-org', '00D3i000000TNHYCA4'],
         config
       );
       stubSpinner(cmd);
@@ -118,7 +117,7 @@ describe('package:bundle:install - tests', () => {
       installStub.resolves(pkgBundleInstallSuccessResult);
 
       const cmd = new PackageBundlesInstall(
-        ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--target-dev-hub', 'test@hub.org', '-w', '10'],
+        ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--dev-hub-org', '00D3i000000TNHYCA4', '-w', '10'],
         config
       );
       stubSpinner(cmd);
@@ -144,7 +143,7 @@ describe('package:bundle:install - tests', () => {
       installStub.resolves(pkgBundleInstallSuccessResult);
 
       const cmd = new PackageBundlesInstall(
-        ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--target-dev-hub', 'test@hub.org', '--verbose'],
+        ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--dev-hub-org', '00D3i000000TNHYCA4', '--verbose'],
         config
       );
       stubSpinner(cmd);
@@ -170,7 +169,7 @@ describe('package:bundle:install - tests', () => {
       installStub.resolves(pkgBundleInstallQueuedResult);
 
       const cmd = new PackageBundlesInstall(
-        ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--target-dev-hub', 'test@hub.org'],
+        ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--dev-hub-org', '00D3i000000TNHYCA4'],
         config
       );
       stubSpinner(cmd);
@@ -190,7 +189,7 @@ describe('package:bundle:install - tests', () => {
       // Normalize CRLF to LF to make assertion OS-agnostic
       const queuedMsg = String(logStub.args[0][0]).replace(/\r\n/g, '\n');
       expect(queuedMsg).to.equal(
-        'Bundle installation is currently Queued. You can continue to query the status using\nsf package bundle install:report -i 08c3i000000fylgBBB -o test@org.org'
+        'Bundle installation is currently Queued. You can continue to query the status using\nsf package bundle install report -i 08c3i000000fylgBBB -o test@org.org'
       );
     });
 
@@ -200,7 +199,7 @@ describe('package:bundle:install - tests', () => {
 
       try {
         const cmd = new PackageBundlesInstall(
-          ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--target-dev-hub', 'test@hub.org'],
+          ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--dev-hub-org', '00D3i000000TNHYCA4'],
           config
         );
         stubSpinner(cmd);
@@ -220,7 +219,7 @@ describe('package:bundle:install - tests', () => {
 
       try {
         const cmd = new PackageBundlesInstall(
-          ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--target-dev-hub', 'test@hub.org'],
+          ['-b', 'TestBundle@1.0', '--target-org', 'test@org.org', '--dev-hub-org', '00D3i000000TNHYCA4'],
           config
         );
         stubSpinner(cmd);

test/commands/bundle/packageBundleVersionCreate.test.ts

@@ -125,7 +125,7 @@ describe('package:bundle:version:create - tests', () => {
       });
       expect(warnStub.callCount).to.equal(0);
       expect(logStub.callCount).to.equal(1);
-      expect(logStub.args[0]).to.deep.equal(['Successfully created bundle version for bundle 08c3i000000fylgAAA']);
+      expect(logStub.args[0]).to.deep.equal(['Successfully created bundle version 05i3i000000fxw1AAA']);
     });
 
     it('should create a new package bundle version with wait option', async () => {
@@ -154,7 +154,7 @@ describe('package:bundle:version:create - tests', () => {
       });
       expect(warnStub.callCount).to.equal(0);
       expect(logStub.callCount).to.equal(1);
-      expect(logStub.args[0]).to.deep.equal(['Successfully created bundle version for bundle 08c3i000000fylgAAA']);
+      expect(logStub.args[0]).to.deep.equal(['Successfully created bundle version 05i3i000000fxw1AAA']);
     });
 
     it('should create a new package bundle version with verbose option', async () => {
@@ -184,7 +184,7 @@ describe('package:bundle:version:create - tests', () => {
       expect(warnStub.callCount).to.equal(0);
       expect(logStub.callCount).to.equal(2);
       expect(logStub.args[0]).to.deep.equal(['Package Bundle version creation completed with status: Success']);
-      expect(logStub.args[1]).to.deep.equal(['Successfully created bundle version for bundle 08c3i000000fylgAAA']);
+      expect(logStub.args[1]).to.deep.equal(['Successfully created bundle version 05i3i000000fxw1AAA']);
     });
 
     it('should handle queued status', async () => {