@W-21729309 Merge bundle uninstall and installed list CLI code to main (plugin)

command-snapshot.json

@@ -81,18 +81,18 @@
   },
   {
     "alias": [],
-    "command": "package:bundle:install:list",
+    "command": "package:bundle:install:report",
     "flagAliases": ["apiversion", "targetusername", "u"],
-    "flagChars": ["c", "o", "s"],
-    "flags": ["api-version", "created-last-days", "flags-dir", "json", "loglevel", "status", "target-org", "verbose"],
+    "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:install:report",
+    "command": "package:bundle:installed:list",
     "flagAliases": ["apiversion", "targetusername", "u"],
-    "flagChars": ["i", "o"],
-    "flags": ["api-version", "flags-dir", "json", "loglevel", "package-install-request-id", "target-org", "verbose"],
+    "flagChars": ["o"],
+    "flags": ["api-version", "flags-dir", "json", "loglevel", "target-org"],
     "plugin": "@salesforce/plugin-packaging"
   },
   {
@@ -103,6 +103,14 @@
     "flags": ["api-version", "flags-dir", "json", "loglevel", "target-dev-hub", "verbose"],
     "plugin": "@salesforce/plugin-packaging"
   },
+  {
+    "alias": [],
+    "command": "package:bundle:uninstall",
+    "flagAliases": ["apiversion", "targetusername", "u"],
+    "flagChars": ["b", "o", "w"],
+    "flags": ["api-version", "bundle", "flags-dir", "json", "loglevel", "target-org", "verbose", "wait"],
+    "plugin": "@salesforce/plugin-packaging"
+  },
   {
     "alias": [],
     "command": "package:bundle:version:create",

messages/bundle_installed_list.md

@@ -0,0 +1,21 @@
+# summary
+
+List all installed package bundles in the target org.
+
+# description
+
+Displays information about all package bundles currently installed in the target org, including the bundle details and the associated packages with their expected and actual versions.
+
+# examples
+
+- List all installed package bundles in your default org:
+
+  <%= config.bin %> <%= command.id %>
+
+- List all installed package bundles in a specific org:
+
+  <%= config.bin %> <%= command.id %> --target-org myorg@example.com
+
+# flags.target-org.summary
+
+The org to list installed package bundles from.

messages/bundle_uninstall.md

@@ -0,0 +1,46 @@
+# summary
+
+Uninstall a package bundle version from a target org.
+
+# description
+
+Provide the package bundle version ID or alias and the target org to start an uninstall request. Optionally wait for the uninstall to complete.
+
+# examples
+
+- Uninstall a bundle version by ID from a specified org:
+
+  <%= config.bin %> <%= command.id %> --bundle 1Q8... --target-org me@example.com
+
+- Uninstall a bundle version by alias from your default org and wait up to 10 minutes for completion:
+
+  <%= config.bin %> <%= command.id %> --bundle MyBundle@1.2 -w 10
+
+# flags.bundle.summary
+
+ID (starts with 1Q8) or alias of the package bundle version to uninstall.
+
+# flags.wait.summary
+
+Number of minutes to wait for the uninstall request to complete.
+
+# flags.verbose.summary
+
+Show additional progress while waiting for uninstall to finish.
+
+# bundleUninstallWaitingStatus
+
+Waiting %s more minutes for bundle uninstall. Current status: %s
+
+# bundleUninstallError
+
+Encountered errors uninstalling the bundle! %s
+
+# bundleUninstallInProgress
+
+Bundle uninstall is currently %s. Request Id: %s. Target org: %s
+
+# bundleUninstallSuccess
+
+Successfully uninstalled bundle version %s from %s
+

package.json

@@ -8,7 +8,7 @@
   "o11yUploadEndpoint": "https://794testsite.my.site.com/byolwr/webruntime/log/metrics",
   "dependencies": {
     "@oclif/core": "^4",
-    "@salesforce/core": "^8.27.0",
+    "@salesforce/core": "^8.27.1",
     "@salesforce/kit": "^3.2.4",
     "@salesforce/packaging": "^4.21.5",
     "@salesforce/sf-plugins-core": "^12.2.6",

schemas/package-bundle-installed-list.json

@@ -0,0 +1,91 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$ref": "#/definitions/PackageBundleInstalledListResults",
+  "definitions": {
+    "PackageBundleInstalledListResults": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/BundleSObjects.InstalledPackageBundleVersion"
+      }
+    },
+    "BundleSObjects.InstalledPackageBundleVersion": {
+      "type": "object",
+      "properties": {
+        "Id": {
+          "type": "string"
+        },
+        "BundleName": {
+          "type": "string"
+        },
+        "BundleId": {
+          "type": "string"
+        },
+        "BundleVersionId": {
+          "type": "string"
+        },
+        "BundleVersionName": {
+          "type": "string"
+        },
+        "MajorVersion": {
+          "type": "number"
+        },
+        "MinorVersion": {
+          "type": "number"
+        },
+        "Description": {
+          "type": "string"
+        },
+        "InstalledDate": {
+          "type": "string"
+        },
+        "LastUpgradedDate": {
+          "type": "string"
+        },
+        "Components": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BundleSObjects.InstalledPackageBundleVersionComponent"
+          }
+        }
+      },
+      "required": [
+        "Id",
+        "BundleName",
+        "BundleId",
+        "BundleVersionId",
+        "BundleVersionName",
+        "MajorVersion",
+        "MinorVersion",
+        "Description",
+        "InstalledDate",
+        "LastUpgradedDate",
+        "Components"
+      ],
+      "additionalProperties": false
+    },
+    "BundleSObjects.InstalledPackageBundleVersionComponent": {
+      "type": "object",
+      "properties": {
+        "ExpectedPackageName": {
+          "type": "string"
+        },
+        "ExpectedPackageVersionNumber": {
+          "type": "string"
+        },
+        "ActualPackageName": {
+          "type": "string"
+        },
+        "ActualPackageVersionNumber": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "ExpectedPackageName",
+        "ExpectedPackageVersionNumber",
+        "ActualPackageName",
+        "ActualPackageVersionNumber"
+      ],
+      "additionalProperties": false
+    }
+  }
+}

schemas/package-bundle-install-list.json → schemas/package-bundle-uninstall.json

@@ -1,25 +1,19 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$ref": "#/definitions/PackageBundleInstallRequestResults",
+  "$ref": "#/definitions/BundleUninstallResult",
   "definitions": {
-    "PackageBundleInstallRequestResults": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/BundleSObjects.PkgBundleVersionInstallReqResult"
-      }
+    "BundleUninstallResult": {
+      "$ref": "#/definitions/BundleSObjects.PkgBundleVerUninstallReqResult"
     },
-    "BundleSObjects.PkgBundleVersionInstallReqResult": {
+    "BundleSObjects.PkgBundleVerUninstallReqResult": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
         "Id": {
           "type": "string"
         },
-        "InstallStatus": {
-          "$ref": "#/definitions/BundleSObjects.PkgBundleVersionInstallReqStatus"
-        },
-        "ValidationError": {
-          "type": "string"
+        "UninstallStatus": {
+          "$ref": "#/definitions/BundleSObjects.PkgBundleVersionUninstallReqStatus"
         },
         "CreatedDate": {
           "type": "string"
@@ -36,28 +30,18 @@
         "PackageBundleVersionId": {
           "type": "string"
         },
-        "DevelopmentOrganization": {
+        "InstalledPkgBundleVersionId": {
+          "type": "string"
+        },
+        "ValidationError": {
           "type": "string"
         }
       },
-      "required": [
-        "CreatedById",
-        "CreatedDate",
-        "DevelopmentOrganization",
-        "Id",
-        "InstallStatus",
-        "PackageBundleVersionId",
-        "ValidationError"
-      ]
+      "required": ["CreatedById", "CreatedDate", "Id", "PackageBundleVersionId", "UninstallStatus"]
     },
-    "BundleSObjects.PkgBundleVersionInstallReqStatus": {
+    "BundleSObjects.PkgBundleVersionUninstallReqStatus": {
       "type": "string",
-      "enum": [
-        "Queued",
-        "InProgress",
-        "Success",
-        "Error"
-      ]
+      "enum": ["Queued", "InProgress", "Success", "Error"]
     }
   }
-}
+}