Merge pull request #277 from salesforcecli/cd/W-9496922

fix: replace sfdx-trust with plugin-trust

Author: WillieRuemmele

src/dependencies.ts

@@ -28,7 +28,7 @@ interface Result {
 
 const DEPENDENCIES: Dependency[] = [
   {
-    name: 'sfdx-trust',
+    name: 'sfdx',
     type: 'bin',
     condition: (flags): boolean => !!flags.sign,
   },

src/repository.ts

@@ -285,7 +285,7 @@ export class LernaRepo extends Repository {
   public verifySignature(packageNames: string[]): void {
     const packages = this.packages.filter((pkg) => packageNames.includes(pkg.name));
     for (const pkg of packages) {
-      const cmd = `sfdx-trust plugins:trust:verify --npm ${
+      const cmd = `sfdx plugins:trust:verify --npm ${
         pkg.name
       }@${pkg.getNextVersion()}  ${this.registry.getRegistryParameter()}`;
       this.execCommand(cmd);
@@ -389,7 +389,7 @@ export class SinglePackageRepo extends Repository {
   }
 
   public verifySignature(): void {
-    const cmd = `sfdx-trust plugins:trust:verify --npm ${this.name}@${
+    const cmd = `sfdx plugins:trust:verify --npm ${this.name}@${
       this.nextVersion
     } ${this.registry.getRegistryParameter()}`;
     this.execCommand(cmd);

test/dependencies.test.ts

@@ -13,14 +13,14 @@ import { verifyDependencies } from '../src/dependencies';
 
 const $$ = testSetup();
 
-describe('Depedencies', () => {
+describe('Dependencies', () => {
   it('should pass when all required env variables and bin scripts exist', () => {
     $$.SANDBOX.stub(Env.prototype, 'getString').returns('foobar');
     $$.SANDBOX.stub(shelljs, 'which').returns('foobar' as shelljs.ShellString);
     const validation = verifyDependencies({ sign: true });
     expect(validation.failures).to.equal(0);
     expect(validation.results).to.deep.equal([
-      { name: 'sfdx-trust', type: 'bin', passed: true },
+      { name: 'sfdx', type: 'bin', passed: true },
       { name: 'AWS_ACCESS_KEY_ID', type: 'env', passed: true },
       { name: 'AWS_SECRET_ACCESS_KEY', type: 'env', passed: true },
       { name: 'NPM_TOKEN', type: 'env', passed: true },
@@ -34,7 +34,7 @@ describe('Depedencies', () => {
     const validation = verifyDependencies({ sign: true });
     expect(validation.failures).to.equal(3);
     expect(validation.results).to.deep.equal([
-      { name: 'sfdx-trust', type: 'bin', passed: true },
+      { name: 'sfdx', type: 'bin', passed: true },
       {
         name: 'AWS_ACCESS_KEY_ID',
         type: 'env',
@@ -64,8 +64,8 @@ describe('Depedencies', () => {
     expect(validation.failures).to.equal(1);
     expect(validation.results).to.deep.equal([
       {
-        message: 'Install sfdx-trust',
-        name: 'sfdx-trust',
+        message: 'Install sfdx',
+        name: 'sfdx',
         type: 'bin',
         passed: false,
       },

test/repository.test.ts

@@ -284,11 +284,11 @@ describe('SinglePackageRepo', () => {
       execStub = stubMethod($$.SANDBOX, SinglePackageRepo.prototype, 'execCommand').returns('success');
     });
 
-    it('should use sfdx-trust to verify that the package was signed', async () => {
+    it('should use plugin-trust to verify that the package was signed', async () => {
       const repo = await SinglePackageRepo.create({ ux: uxStub });
       repo.verifySignature();
       expect(execStub.callCount).to.equal(1);
-      expect(execStub.firstCall.args[0]).to.include('sfdx-trust');
+      expect(execStub.firstCall.args[0]).to.include('sfdx plugins:trust:verify');
     });
   });
 
@@ -472,10 +472,10 @@ describe('LernaRepo', () => {
       );
     });
 
-    it('should use sfdx-trust to verify that the packages were signed', async () => {
+    it('should use plugin-trust to verify that the packages were signed', async () => {
       const repo = await LernaRepo.create({ ux: uxStub });
       repo.verifySignature([pkgName]);
-      expect(execStub.lastCall.args[0]).to.include('sfdx-trust');
+      expect(execStub.lastCall.args[0]).to.include('sfdx plugins:trust:verify');
     });
   });