refactor: shared code uses shared messages

salesforcecli · Dec 6, 2023 · 9c33c62 · 9c33c62
1 parent 71cb002
commit 9c33c62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/messages/verify.md b/messages/verify.md
@@ -22,7 +22,7 @@ The registry name. The behavior is the same as npm.
 
 # NotSigned
 
-The plugin is not digitally signed.
+The plugin isn't digitally signed.
 
 # SignatureCheckSuccess
 

diff --git a/src/shared/installationVerification.ts b/src/shared/installationVerification.ts
@@ -446,8 +446,10 @@ export async function doInstallationCodeSigningVerification(
   plugin: { plugin: string; tag: string },
   verificationConfig: VerificationConfig
 ): Promise<void> {
+  const messages = Messages.loadMessages('@salesforce/plugin-trust', 'verify');
+
   if (await verificationConfig.verifier?.isAllowListed()) {
-    verificationConfig.log(`The plugin [${plugin.plugin}] is allow-listed, skipping digital signature verification.`);
+    verificationConfig.log(messages.getMessage('SkipSignatureCheck', [plugin.plugin]));
     return;
   }
   try {
@@ -456,13 +458,10 @@ export async function doInstallationCodeSigningVerification(
     }
     const meta = await verificationConfig.verifier.verify();
     if (!meta.verified) {
-      const err = new SfError(
-        "A digital signature is specified for this plugin but it didn't verify against the certificate.",
-        'FailedDigitalSignatureVerification'
-      );
+      const err = messages.createError('FailedDigitalSignatureVerification');
       throw setErrorName(err, 'FailedDigitalSignatureVerification');
     }
-    verificationConfig.log(`Successfully validated digital signature for ${plugin.plugin}.`);
+    verificationConfig.log(messages.getMessage('SignatureCheckSuccess', [plugin.plugin]));
   } catch (err) {
     if (err instanceof Error) {
       if (err.name === 'NotSigned' || err.message?.includes('Response code 403')) {