Add back access commands

Author: eablack

packages/cli/src/oldCommands/access/add.ts renamed to packages/cli/src/commands/access/add.ts

@@ -1,10 +1,9 @@
-import color from '@heroku-cli/color'
+import {color} from '@heroku-cli/color'
 import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import * as Heroku from '@heroku-cli/schema'
 import {isTeamApp, getOwner} from '../../lib/teamUtils.js'
-import * as _ from 'lodash'
-/*
+
 export default class AccessAdd extends Command {
   static description = 'add new users to your app'
   static flags = {
@@ -40,7 +39,7 @@ export default class AccessAdd extends Command {
         this.error('Missing argument: permissions', {exit: 1})
       const permissionsArray = permissions ? permissions.split(',') : []
       permissionsArray.push('view')
-      const permissionsArraySorted = _.uniq(permissionsArray.sort())
+      const permissionsArraySorted = [...new Set(permissionsArray.sort())]
       output += ` with ${color.green(permissionsArraySorted.join(', '))} permissions`
       ux.action.start(output)
       await this.heroku.post<Heroku.TeamAppCollaborator[]>(`/teams/apps/${appName}/collaborators`, {
@@ -52,7 +51,5 @@ export default class AccessAdd extends Command {
       await this.heroku.post<Heroku.Collaborator[]>(`/apps/${appName}/collaborators`, {body: {user: email}})
       ux.action.stop()
     }
-    }
   }
-*/
-
+}

packages/cli/src/oldCommands/access/index.ts renamed to packages/cli/src/commands/access/index.ts

@@ -1,12 +1,11 @@
-/*
-import color from '@heroku-cli/color'
+import {color} from '@heroku-cli/color'
 import {Command, flags} from '@heroku-cli/command'
-import {HerokuAPIError} from '@heroku-cli/command/lib/api-client'
+import {HerokuAPIError} from '@heroku-cli/command/lib/api-client.js'
 import {ux} from '@oclif/core'
 import {hux} from '@heroku/heroku-cli-util'
 import * as Heroku from '@heroku-cli/schema'
-import * as _ from 'lodash'
-import {isTeamApp, getOwner} from '../../lib/teamUtils'
+import _ from 'lodash'
+import {isTeamApp, getOwner} from '../../lib/teamUtils.js'
 
 type MemberData = {
   email: string,
@@ -19,7 +18,7 @@ type AdminWithPermissions = Heroku.TeamMember & {
 }
 
 function printJSON(collaborators: Heroku.TeamAppCollaborator[]) {
-  ux.log(JSON.stringify(collaborators, null, 2))
+  ux.stdout(JSON.stringify(collaborators, null, 2))
 }
 
 function buildTableColumns(showPermissions: boolean) {
@@ -109,4 +108,3 @@ export default class AccessIndex extends Command {
       printAccess(app, collaborators)
   }
 }
-*/

packages/cli/src/oldCommands/access/remove.ts renamed to packages/cli/src/commands/access/remove.ts

@@ -1,5 +1,5 @@
-/*
-import color from '@heroku-cli/color'
+
+import {color} from '@heroku-cli/color'
 import {Command, flags} from '@heroku-cli/command'
 import {ux} from '@oclif/core'
 import * as Heroku from '@heroku-cli/schema'
@@ -25,4 +25,3 @@ export default class AccessRemove extends Command {
     ux.action.stop()
   }
 }
-*/

packages/cli/src/oldCommands/access/update.ts renamed to packages/cli/src/commands/access/update.ts

@@ -1,9 +1,8 @@
-/*
-import color from '@heroku-cli/color'
+import {color} from '@heroku-cli/color'
 import {Command, flags} from '@heroku-cli/command'
 import {Args, ux} from '@oclif/core'
 import * as Heroku from '@heroku-cli/schema'
-import {isTeamApp} from '../../lib/teamUtils'
+import {isTeamApp} from '../../lib/teamUtils.js'
 
 export default class Update extends Command {
     static topic = 'access';
@@ -40,4 +39,3 @@ export default class Update extends Command {
       ux.action.stop()
     }
 }
-*/

packages/cli/test/helpers/stubs/get.ts

@@ -10,8 +10,8 @@ export function apps() {
 }
 
 export function appCollaborators(collaborators =
-[{user: {email: 'raulb@heroku.com'}, role: 'owner'},
-  {user: {email: 'jeff@heroku.com'}, role: 'collaborator'}]) {
+[{user: {email: 'gandalf@heroku.com'}, role: 'owner'},
+  {user: {email: 'frodo@heroku.com'}, role: 'collaborator'}]) {
   return nock('https://api.heroku.com:443')
     .get('/apps/myapp/collaborators')
     .reply(200, collaborators)
@@ -91,7 +91,7 @@ export function teamInfo(type = 'enterprise') {
 
 export function teamInvites(invites = [
   {
-    invited_by: {email: 'raulb@heroku.com'},
+    invited_by: {email: 'gandalf@heroku.com'},
     role: 'admin',
     user: {email: '[email protected]'},
   },
@@ -105,9 +105,9 @@ export function teamInvites(invites = [
 
 export function teamMembers(members = [
   {
-    email: 'raulb@heroku.com',
+    email: 'gandalf@heroku.com',
     role: 'admin',
-    user: {email: 'raulb@heroku.com'},
+    user: {email: 'gandalf@heroku.com'},
   },
   {
     email: '[email protected]',
@@ -130,11 +130,11 @@ export function personalApp() {
     .get('/apps/myapp')
     .reply(200, {
       name: 'myapp',
-      owner: {email: 'raulb@heroku.com'},
+      owner: {email: 'gandalf@heroku.com'},
     })
 }
 
-export function userAccount(email = 'raulb@heroku.com') {
+export function userAccount(email = 'gandalf@heroku.com') {
   return nock('https://api.heroku.com:443')
     .get('/account')
     .reply(200, {email})

packages/cli/test/helpers/stubs/post.ts

@@ -3,11 +3,11 @@ import nock from 'nock'
 export function collaborators() {
   return nock('https://api.heroku.com:443')
     .post('/apps/myapp/collaborators', {
-      user: 'raulb@heroku.com',
+      user: 'gandalf@heroku.com',
     }).reply(200)
 }
 
-export function teamAppCollaborators(email = 'raulb@heroku.com', permissions: string[] = [], response: {code?: number, description?: Record<string, unknown>} = {}) {
+export function teamAppCollaborators(email = 'gandalf@heroku.com', permissions: string[] = [], response: {code?: number, description?: Record<string, unknown>} = {}) {
   const body: {user: string, permissions?: string[]} = {user: email}
   if (permissions.length > 0) {
     body.permissions = permissions

packages/cli/test/helpers/testInstances.ts

@@ -1,8 +1,12 @@
 import {APIClient} from '@heroku-cli/command'
 import {Config} from '@oclif/core'
+import {fileURLToPath} from 'node:url'
+import path from 'node:path'
 
 export const getConfig = async () => {
-  const pjsonPath = require.resolve('../../package.json')
+  const __filename = fileURLToPath(import.meta.url)
+  const __dirname = path.dirname(__filename)
+  const pjsonPath = path.resolve(__dirname, '../../package.json')
   const conf = new Config({root: pjsonPath})
   await conf.load()
   return conf

packages/cli/test/unit/commands/access/add.unit.test.ts

@@ -1,58 +1,61 @@
-import {stdout, stderr} from 'stdout-stderr'
-import * as nock from 'nock'
+import {stderr} from 'stdout-stderr'
+import nock from 'nock'
 import {expect} from 'chai'
-// import Cmd from '../../../../src/commands/access/add'
+import Cmd from '../../../../src/commands/access/add.js'
 import runCommand from '../../../helpers/runCommand.js'
 import {personalApp, teamApp, teamFeatures} from '../../../helpers/stubs/get.js'
 import {collaborators, teamAppCollaborators} from '../../../helpers/stubs/post.js'
+import expectOutput from '../../../helpers/utils/expectOutput.js'
+import tsheredoc from 'tsheredoc'
+const heredoc = tsheredoc.default
 
 let apiGet: nock.Scope
 let apiPost: nock.Scope
 let apiGetOrgFeatures: nock.Scope
-/*
+
 describe('heroku access:add', function () {
   context('with a team app with user permissions', function () {
     beforeEach(function () {
       apiGet = teamApp()
-      apiPost = teamAppCollaborators('raulb@heroku.com', ['deploy', 'view'])
+      apiPost = teamAppCollaborators('gandalf@heroku.com', ['deploy', 'view'])
       apiGetOrgFeatures = teamFeatures([{name: 'org-access-controls'}])
     })
+
     afterEach(function () {
       return nock.cleanAll()
     })
-    it('adds user to the app with permissions, and view is implicit', function () {
-      return runCommand(Cmd, [
+
+    it('adds user to the app with permissions, even specifying the view permission', async function () {
+      await runCommand(Cmd, [
         '--app',
         'myapp',
         '--permissions',
-        'deploy',
-        'raulb@heroku.com',
+        'deploy,view',
+        'gandalf@heroku.com',
       ])
-        .then(() => expect('').to.eq(stdout.output))
-        .then(() => expect('Adding [email protected] access to the app myapp with deploy, view permissions...\nAdding [email protected] access to the app myapp with deploy, view permissions... done\n').to.eq(stderr.output))
-        .then(() => apiGet.done())
-        .then(() => apiGetOrgFeatures.done())
-        .then(() => apiPost.done())
+      expectOutput(stderr.output, heredoc(`
+        Adding [email protected] access to the app myapp with deploy, view permissions... done
+      `))
     })
-    it('adds user to the app with permissions, even specifying the view permission', function () {
-      return runCommand(Cmd, [
+
+    it('adds user to the app with permissions, and view is implicit', async function () {
+      await runCommand(Cmd, [
         '--app',
         'myapp',
         '--permissions',
-        'deploy,view',
-        'raulb@heroku.com',
+        'deploy',
+        'gandalf@heroku.com',
       ])
-        .then(() => expect('').to.eq(stdout.output))
-        .then(() => expect('Adding [email protected] access to the app myapp with deploy, view permissions...\nAdding [email protected] access to the app myapp with deploy, view permissions... done\n').to.eq(stderr.output))
-        .then(() => apiGet.done())
-        .then(() => apiGetOrgFeatures.done())
-        .then(() => apiPost.done())
+      expectOutput(stderr.output, heredoc(`
+        Adding [email protected] access to the app myapp with deploy, view permissions... done
+      `))
     })
+
     it('raises an error when permissions are not specified', function () {
       return runCommand(Cmd, [
         '--app',
         'myapp',
-        'raulb@heroku.com',
+        'gandalf@heroku.com',
       ])
         .then(() => {
           apiGet.done()
@@ -62,48 +65,54 @@ describe('heroku access:add', function () {
         .catch((error: any) => expect(error.message).to.equal('Missing argument: permissions'))
     })
   })
+
   context('with a team app without user permissions', function () {
     beforeEach(function () {
       apiGet = teamApp()
       apiPost = collaborators()
       apiGetOrgFeatures = teamFeatures([])
     })
+
     afterEach(function () {
       return nock.cleanAll()
     })
-    it('adds user to the app', function () {
-      return runCommand(Cmd, [
+
+    it('adds user to the app', async function () {
+      await runCommand(Cmd, [
         '--app',
         'myapp',
-        'raulb@heroku.com',
+        'gandalf@heroku.com',
       ])
-        .then(() => expect('').to.eq(stdout.output))
-        .then(() => expect('Adding [email protected] access to the app myapp...\nAdding [email protected] access to the app myapp... done\n').to.eq(stderr.output))
-        .then(() => apiGet.done())
-        .then(() => apiGetOrgFeatures.done())
-        .then(() => apiPost.done())
+      expectOutput(stderr.output, heredoc(`
+        Adding [email protected] access to the app myapp... done
+      `))
+      apiGet.done()
+      apiGetOrgFeatures.done()
+      apiPost.done()
     })
   })
+
   context('with a non team app', function () {
     beforeEach(function () {
       apiGet = personalApp()
       apiPost = collaborators()
     })
+
     afterEach(function () {
       return nock.cleanAll()
     })
-    it('adds user to the app as a collaborator', function () {
-      return runCommand(Cmd, [
+
+    it('adds user to the app as a collaborator', async function () {
+      await runCommand(Cmd, [
         '--app',
         'myapp',
-        'raulb@heroku.com',
+        'gandalf@heroku.com',
       ])
-        .then(() => expect('').to.eq(stdout.output))
-        .then(() => expect('Adding [email protected] access to the app myapp...\nAdding [email protected] access to the app myapp... done\n').to.eq(stderr.output))
-        .then(() => apiGet.done())
-        .then(() => apiPost.done())
+      expectOutput(stderr.output, heredoc(`
+        Adding [email protected] access to the app myapp... done
+      `))
+      apiGet.done()
+      apiPost.done()
     })
   })
 })
-
-*/

packages/cli/test/unit/commands/access/index.unit.test.ts

@@ -1,8 +1,9 @@
 import {stdout, stderr} from 'stdout-stderr'
-import * as nock from 'nock'
+import nock from 'nock'
 import {expect} from 'chai'
-// import Cmd from '../../../../src/commands/access/index'
+import Cmd from '../../../../src/commands/access/index.js'
 import runCommand from '../../../helpers/runCommand.js'
+import stripAnsi from 'strip-ansi'
 import {
   personalApp,
   appCollaborators,
@@ -12,7 +13,8 @@ import {
   teamAppCollaboratorsWithPermissions,
 } from '../../../helpers/stubs/get.js'
 
-/*
+const removeAllWhitespace = (str: string): string => stripAnsi(str).replace(/\s+/g, '')
+
 describe('heroku access', function () {
   context('with personal app', function () {
     afterEach(function () {
@@ -25,7 +27,7 @@ describe('heroku access', function () {
         '--app',
         'myapp',
       ])
-        .then(() => expect(stdout.output).to.contain('jeff@heroku.com  collaborator \n raulb@heroku.com owner'))
+        .then(() => expect(removeAllWhitespace(stdout.output)).to.contain(removeAllWhitespace('frodo@heroku.com  collaborator \n gandalf@heroku.com owner')))
         .then(() => expect('').to.eq(stderr.output))
         .then(() => apiGetPersonalApp.done())
         .then(() => apiGetAppCollaborators.done())
@@ -44,7 +46,7 @@ describe('heroku access', function () {
         '--app',
         'myapp',
       ])
-        .then(() => expect(stdout.output).to.contain('bob@heroku.com   member deploy, view                  \n raulb@heroku.com admin  deploy, manage, operate, view \n'))
+        .then(() => expect(removeAllWhitespace(stdout.output)).to.contain(removeAllWhitespace('[email protected]   member deploy, view                  \n gandalf@heroku.com admin  deploy, manage, operate, view \n')))
         .then(() => expect('').to.eq(stderr.output))
         .then(() => apiGetTeamApp.done())
         .then(() => apiGetOrgMembers.done())
@@ -53,5 +55,3 @@ describe('heroku access', function () {
     })
   })
 })
-
-*/