Merge branch 'main' into mdonnalley/core-v4

Author: mdonnalley

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [5.4.8](https://github.com/salesforcecli/plugin-release-management/compare/5.4.7...5.4.8) (2024-06-06)
+
+### Bug Fixes
+
+- replace NamedError with SfError ([857a694](https://github.com/salesforcecli/plugin-release-management/commit/857a6947564c5d8a6ca199fa16105751e461f9d7))
+
 ## [5.4.7](https://github.com/salesforcecli/plugin-release-management/compare/5.4.6...5.4.7) (2024-06-02)
 
 ### Bug Fixes

README.md

@@ -145,7 +145,7 @@ EXAMPLES
   $ sfdx channel promote --candidate latest-rc --target latest --platform win --platform mac
 ```
 
-_See code: [src/commands/channel/promote.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/channel/promote.ts)_
+_See code: [src/commands/channel/promote.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/channel/promote.ts)_
 
 ## `sfdx cli artifacts compare`
 
@@ -169,7 +169,7 @@ EXAMPLES
   $ sfdx cli artifacts compare
 ```
 
-_See code: [src/commands/cli/artifacts/compare.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/cli/artifacts/compare.ts)_
+_See code: [src/commands/cli/artifacts/compare.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/cli/artifacts/compare.ts)_
 
 ## `sfdx cli install jit test`
 
@@ -190,7 +190,7 @@ EXAMPLES
   $ sfdx cli install jit test
 ```
 
-_See code: [src/commands/cli/install/jit/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/cli/install/jit/test.ts)_
+_See code: [src/commands/cli/install/jit/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/cli/install/jit/test.ts)_
 
 ## `sfdx cli install test`
 
@@ -231,7 +231,7 @@ EXAMPLES
   $ sfdx cli install test --cli sf --method tarball --channel stable-rc
 ```
 
-_See code: [src/commands/cli/install/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/cli/install/test.ts)_
+_See code: [src/commands/cli/install/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/cli/install/test.ts)_
 
 ## `sfdx cli release automerge`
 
@@ -262,7 +262,7 @@ EXAMPLES
   $ sfdx cli release automerge --owner salesforcecli --repo sfdx-cli --pul-number 1049
 ```
 
-_See code: [src/commands/cli/release/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/cli/release/automerge.ts)_
+_See code: [src/commands/cli/release/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/cli/release/automerge.ts)_
 
 ## `sfdx cli release build`
 
@@ -325,7 +325,7 @@ EXAMPLES
   $ sfdx cli release build --only @salesforce/plugin-source,@salesforce/plugin-info@1.2.3
 ```
 
-_See code: [src/commands/cli/release/build.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/cli/release/build.ts)_
+_See code: [src/commands/cli/release/build.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/cli/release/build.ts)_
 
 ## `sfdx cli releasenotes`
 
@@ -366,7 +366,7 @@ EXAMPLES
   $ sfdx cli releasenotes --cli sf --markdown > changes.md
 ```
 
-_See code: [src/commands/cli/releasenotes.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/cli/releasenotes.ts)_
+_See code: [src/commands/cli/releasenotes.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/cli/releasenotes.ts)_
 
 ## `sfdx cli tarballs prepare`
 
@@ -394,7 +394,7 @@ EXAMPLES
   $ sfdx cli tarballs prepare
 ```
 
-_See code: [src/commands/cli/tarballs/prepare.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/cli/tarballs/prepare.ts)_
+_See code: [src/commands/cli/tarballs/prepare.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/cli/tarballs/prepare.ts)_
 
 ## `sfdx cli tarballs smoke`
 
@@ -424,7 +424,7 @@ EXAMPLES
   $ sfdx cli tarballs smoke
 ```
 
-_See code: [src/commands/cli/tarballs/smoke.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/cli/tarballs/smoke.ts)_
+_See code: [src/commands/cli/tarballs/smoke.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/cli/tarballs/smoke.ts)_
 
 ## `sfdx cli tarballs verify`
 
@@ -456,7 +456,7 @@ EXAMPLES
   $ sfdx cli tarballs verify --cli sf
 ```
 
-_See code: [src/commands/cli/tarballs/verify.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/cli/tarballs/verify.ts)_
+_See code: [src/commands/cli/tarballs/verify.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/cli/tarballs/verify.ts)_
 
 ## `sfdx cli versions inspect`
 
@@ -509,7 +509,7 @@ EXAMPLES
   $ sfdx cli versions inspect -l npm -c latest -d chalk -s
 ```
 
-_See code: [src/commands/cli/versions/inspect.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/cli/versions/inspect.ts)_
+_See code: [src/commands/cli/versions/inspect.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/cli/versions/inspect.ts)_
 
 ## `sfdx dependabot automerge`
 
@@ -549,7 +549,7 @@ EXAMPLES
   $ sfdx dependabot automerge --max-version-bump major
 ```
 
-_See code: [src/commands/dependabot/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/dependabot/automerge.ts)_
+_See code: [src/commands/dependabot/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/dependabot/automerge.ts)_
 
 ## `sfdx github check closed`
 
@@ -576,7 +576,7 @@ EXAMPLES
   $ sfdx github check closed -o me@gus.com
 ```
 
-_See code: [src/commands/github/check/closed.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/github/check/closed.ts)_
+_See code: [src/commands/github/check/closed.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/github/check/closed.ts)_
 
 ## `sfdx npm dependencies pin`
 
@@ -602,7 +602,7 @@ DESCRIPTION
   in the package.json
 ```
 
-_See code: [src/commands/npm/dependencies/pin.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/npm/dependencies/pin.ts)_
+_See code: [src/commands/npm/dependencies/pin.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/npm/dependencies/pin.ts)_
 
 ## `sfdx npm package release`
 
@@ -634,7 +634,7 @@ DESCRIPTION
   publish npm package
 ```
 
-_See code: [src/commands/npm/package/release.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/npm/package/release.ts)_
+_See code: [src/commands/npm/package/release.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/npm/package/release.ts)_
 
 ## `sfdx plugins trust verify`
 
@@ -702,6 +702,6 @@ EXAMPLES
   $ sfdx repositories --json | jq -r '.result[] | select(.name=="sfdx-core") | .packages[] | .url
 ```
 
-_See code: [src/commands/repositories/index.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.7/src/commands/repositories/index.ts)_
+_See code: [src/commands/repositories/index.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.4.8/src/commands/repositories/index.ts)_
 
 <!-- commandsstop -->

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/plugin-release-management",
   "description": "A plugin for preparing and publishing npm packages",
-  "version": "5.4.7",
+  "version": "5.4.8",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "type": "module",

src/codeSigning/error.ts

@@ -12,13 +12,11 @@ import { EOL } from 'node:os';
 import { join as pathJoin } from 'node:path';
 import { Agents } from 'got';
 import { Ux } from '@salesforce/sf-plugins-core';
-import { Logger } from '@salesforce/core';
-import { NamedError } from '@salesforce/kit';
+import { Logger, SfError } from '@salesforce/core';
 import { ProxyAgent } from 'proxy-agent';
 import { parseNpmName } from '@salesforce/plugin-trust/npmName';
 import { PackageJson } from '../package.js';
 import { signVerifyUpload as sign2, SigningResponse, getSfdxProperty } from './SimplifiedSigning.js';
-import { ExecProcessFailed } from './error.js';
 
 class PathGetter {
   private static packageJson = 'package.json';
@@ -83,7 +81,12 @@ export const api = {
         // we expect an error code from this command, so we're adding it to the normal Error type
         (error: null | (Error & { code?: number | string }), stdout: string, stderr: string) => {
           if (error?.code) {
-            return reject(new ExecProcessFailed(command, error['code'], stderr));
+            return reject(
+              new SfError(
+                `Exec'd subprocess ${command} failed with error code '${error['code']}' and message '${stderr}'.`,
+                'SubProcessError'
+              )
+            );
           } else {
             const output = stdout.split(EOL);
             if (output.length > 1) {
@@ -93,15 +96,15 @@ export const api = {
                 return resolve(pathGetter.getFile(path));
               } else {
                 return reject(
-                  new NamedError(
-                    'UnexpectedNpmFormat',
-                    `Npm pack did not return an expected tgz filename result: [${path}]`
+                  new SfError(
+                    `Npm pack did not return an expected tgz filename result: [${path}]`,
+                    'UnexpectedNpmFormat'
                   )
                 );
               }
             } else {
               return reject(
-                new NamedError('UnexpectedNpmFormat', `The output from the npm utility is unexpected [${stdout}]`)
+                new SfError(`The output from the npm utility is unexpected [${stdout}]`, 'UnexpectedNpmFormat')
               );
             }
           }
@@ -134,16 +137,16 @@ export const api = {
   validateNpmIgnorePatterns(content: string): void {
     const validate = (pattern: string): void => {
       if (!content) {
-        throw new NamedError(
-          'MissingNpmIgnoreFile',
-          'Missing .npmignore file. The following patterns are required in for code signing: *.tgz, *.sig, package.json.bak.'
+        throw new SfError(
+          'Missing .npmignore file. The following patterns are required in for code signing: *.tgz, *.sig, package.json.bak.',
+          'MissingNpmIgnoreFile'
         );
       }
 
       if (!content.includes(pattern)) {
-        throw new NamedError(
-          'MissingNpmIgnorePattern',
-          `.npmignore is missing ${pattern}. The following patterns are required for code signing: *.tgz, *.sig, package.json.bak`
+        throw new SfError(
+          `.npmignore is missing ${pattern}. The following patterns are required for code signing: *.tgz, *.sig, package.json.bak`,
+          'MissingNpmIgnorePattern'
         );
       }
     };
@@ -160,9 +163,9 @@ export const api = {
   validateNpmFilePatterns(patterns: string[]): void {
     const validate = (pattern: string): void => {
       if (patterns.includes(pattern)) {
-        throw new NamedError(
-          'ForbiddenFilePattern',
-          'the files property in package.json should not include the following: *.tgz, *.sig, package.json.bak'
+        throw new SfError(
+          'the files property in package.json should not include the following: *.tgz, *.sig, package.json.bak',
+          'ForbiddenFilePattern'
         );
       }
     };