fix: fix credential storage netrc warnings so they refer to the user's keychain

Author: k80bowman

src/credential-manager-core/index.ts

@@ -37,7 +37,7 @@ export async function saveAuth(account: string, token: string, hosts: string[],
       credDebug(message)
       if (process.env.HEROKU_KEYCHAIN_WARNINGS !== 'off') {
         ux.warn(heredoc(`
-          We can’t save the Heroku token to ${service}.
+          We can't save the Heroku token to your computer's keychain.
           We'll save the token to the .netrc file instead.
           To turn off this warning, set HEROKU_KEYCHAIN_WARNINGS to "off".`))
       }
@@ -81,7 +81,7 @@ export async function getAuth(account: string | undefined, host: string, service
       credDebug(message)
       if (process.env.HEROKU_KEYCHAIN_WARNINGS !== 'off') {
         ux.warn(heredoc(`
-          We can’t retrieve the Heroku token from ${service}.
+          We can't retrieve the Heroku token from your computer's keychain.
           We'll try to retrieve the token from the .netrc file instead.
           To turn off this warning, set HEROKU_KEYCHAIN_WARNINGS to "off".`))
       }
@@ -129,7 +129,7 @@ export async function removeAuth(account: string | undefined, hosts: string[], s
       credDebug(message)
       if (process.env.HEROKU_KEYCHAIN_WARNINGS !== 'off') {
         ux.warn(heredoc(`
-          We can’t remove the Heroku token from ${service}.
+          We can't remove the Heroku token from your computer's keychain.
           We'll remove the token from the .netrc file instead.
           To turn off this warning, set HEROKU_KEYCHAIN_WARNINGS to "off".`))
       }

test/credential-manager/index.test.ts

@@ -93,7 +93,7 @@ describe('credential-manager', function () {
 
       expect(macosStub.calledOnce).to.be.true
       expect(netrcStub.calledOnce).to.be.true
-      expect(unwrap(stderr.output)).to.contain('Warning: We can’t save the Heroku token to heroku-cli.')
+      expect(unwrap(stderr.output)).to.contain('Warning: We can\'t save the Heroku token to your computer\'s keychain.')
       expect(unwrap(stderr.output)).to.contain('We\'ll save the token to the .netrc file instead.')
       expect(unwrap(stderr.output)).to.contain('To turn off this warning, set HEROKU_KEYCHAIN_WARNINGS to "off".')
 
@@ -200,7 +200,7 @@ describe('credential-manager', function () {
       expect(netrcStub.calledOnce).to.be.true
       expect(netrcStub.firstCall.args[0]).to.equal('api.heroku.com')
       expect(auth).to.deep.equal({account: 'user@example.com', token: 'netrc-token'})
-      expect(unwrap(stderr.output)).to.contain('Warning: We can’t retrieve the Heroku token from heroku-cli.')
+      expect(unwrap(stderr.output)).to.contain('Warning: We can\'t retrieve the Heroku token from your computer\'s keychain.')
       expect(unwrap(stderr.output)).to.contain('We\'ll try to retrieve the token from the .netrc file instead.')
       expect(unwrap(stderr.output)).to.contain('To turn off this warning, set HEROKU_KEYCHAIN_WARNINGS to "off".')
 
@@ -218,7 +218,7 @@ describe('credential-manager', function () {
         .to.be.rejectedWith(Error, 'No auth found for api.heroku.com')
       expect(macosStub.calledOnce).to.be.true
       expect(netrcStub.calledOnce).to.be.true
-      expect(unwrap(stderr.output)).to.contain('Warning: We can’t retrieve the Heroku token from heroku-cli.')
+      expect(unwrap(stderr.output)).to.contain('Warning: We can\'t retrieve the Heroku token from your computer\'s keychain.')
       expect(unwrap(stderr.output)).to.contain('We\'ll try to retrieve the token from the .netrc file instead.')
       expect(unwrap(stderr.output)).to.contain('To turn off this warning, set HEROKU_KEYCHAIN_WARNINGS to "off".')
 
@@ -236,7 +236,7 @@ describe('credential-manager', function () {
         .to.be.rejectedWith(Error, 'No auth found')
       expect(macosStub.calledOnce).to.be.true
       expect(netrcStub.calledOnce).to.be.true
-      expect(unwrap(stderr.output)).to.contain('Warning: We can’t retrieve the Heroku token from heroku-cli.')
+      expect(unwrap(stderr.output)).to.contain('Warning: We can\'t retrieve the Heroku token from your computer\'s keychain.')
       expect(unwrap(stderr.output)).to.contain('We\'ll try to retrieve the token from the .netrc file instead.')
       expect(unwrap(stderr.output)).to.contain('To turn off this warning, set HEROKU_KEYCHAIN_WARNINGS to "off".')
 
@@ -328,7 +328,7 @@ describe('credential-manager', function () {
 
       expect(macosStub.calledOnce).to.be.true
       expect(netrcStub.calledOnce).to.be.true
-      expect(unwrap(stderr.output)).to.contain('Warning: We can’t remove the Heroku token from heroku-cli.')
+      expect(unwrap(stderr.output)).to.contain('Warning: We can\'t remove the Heroku token from your computer\'s keychain.')
       expect(unwrap(stderr.output)).to.contain('We\'ll remove the token from the .netrc file instead.')
       expect(unwrap(stderr.output)).to.contain('To turn off this warning, set HEROKU_KEYCHAIN_WARNINGS to "off".')
 
@@ -374,7 +374,7 @@ describe('credential-manager', function () {
 
       expect(macosStub.notCalled).to.be.true
       expect(netrcStub.calledOnce).to.be.true
-      expect(unwrap(stderr.output)).to.not.contain('We can’t remove the Heroku token from heroku-cli.')
+      expect(unwrap(stderr.output)).to.not.contain('We can\'t remove the Heroku token from your computer\'s keychain.')
 
       stderr.stop()
     })