eslinted code

Author: chrisns

.eslintrc.js

@@ -6,7 +6,7 @@ module.exports = {
   },
   extends: [
     'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
-    "plugin:prettier/recommended"
+    'plugin:prettier/recommended',
   ],
   rules: {
     // Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs

index.ts

@@ -1,38 +1,24 @@
 import { getGithubUsersFromGoogle } from './src/google'
-import {
-  getGithubUsersFromGithub,
-  addUsersToGitHubOrg,
-  removeUsersToGitHubOrg
-} from './src/github'
+import { getGithubUsersFromGithub, addUsersToGitHubOrg, removeUsersToGitHubOrg } from './src/github'
 
-export async function run () {
+export async function run() {
   const googleUsers = await getGithubUsersFromGoogle()
   console.log(`Users from google: ${Array.from(googleUsers).join(', ')}`)
 
   const gitHubUsers = await getGithubUsersFromGithub()
   console.log(`Users from github: ${Array.from(gitHubUsers).join(', ')}`)
 
-  const usersNotInGithub = new Set(
-    Array.from(googleUsers).filter(x => !gitHubUsers.has(x))
-  )
+  const usersNotInGithub = new Set(Array.from(googleUsers).filter((x) => !gitHubUsers.has(x)))
 
-  const usersNotInGoogle = new Set(
-    Array.from(gitHubUsers).filter(x => !googleUsers.has(x))
-  )
+  const usersNotInGoogle = new Set(Array.from(gitHubUsers).filter((x) => !googleUsers.has(x)))
   if (usersNotInGithub.size > 0) {
-    console.log(
-      `Users not in github: ${Array.from(usersNotInGithub).join(', ')}`
-    )
-    if (process.env.ADD_USERS.toLowerCase() === 'true')
-      await addUsersToGitHubOrg(usersNotInGithub)
+    console.log(`Users not in github: ${Array.from(usersNotInGithub).join(', ')}`)
+    if (process.env.ADD_USERS.toLowerCase() === 'true') await addUsersToGitHubOrg(usersNotInGithub)
   }
 
   if (usersNotInGoogle.size > 0) {
-    console.log(
-      `Users not in google: ${Array.from(usersNotInGoogle).join(', ')}`
-    )
-    if (process.env.REMOVE_USERS.toLowerCase() === 'true')
-      await removeUsersToGitHubOrg(usersNotInGoogle)
+    console.log(`Users not in google: ${Array.from(usersNotInGoogle).join(', ')}`)
+    if (process.env.REMOVE_USERS.toLowerCase() === 'true') await removeUsersToGitHubOrg(usersNotInGoogle)
   }
 
   if (usersNotInGoogle.size > 0 || usersNotInGithub.size > 0)

jest.config.js

@@ -4,7 +4,7 @@ module.exports = {
   },
   testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
-  testEnvironment: "node",
+  testEnvironment: 'node',
   coverageReporters: ['lcovonly', 'text'],
   collectCoverage: true,
   coverageDirectory: 'coverage',

src/github.ts

@@ -4,50 +4,40 @@ const ignoredUsers = process.env.IGNORED_USERS.toLowerCase().split(',')
 
 const octokit = getAuthenticatedOctokit()
 
-export function getAuthenticatedOctokit () {
+export function getAuthenticatedOctokit() {
   return new Octokit({
     authStrategy: createAppAuth,
     auth: {
       appId: process.env.GITHUB_APP_ID,
-      privateKey: Buffer.from(
-        process.env.GITHUB_PRIVATE_KEY,
-        'base64'
-      ).toString('utf-8'),
-      installationId: process.env.GITHUB_INSTALLATION_ID
-    }
+      privateKey: Buffer.from(process.env.GITHUB_PRIVATE_KEY, 'base64').toString('utf-8'),
+      installationId: process.env.GITHUB_INSTALLATION_ID,
+    },
   })
 }
 
-export async function getGithubUsersFromGithub () {
+export async function getGithubUsersFromGithub() {
   const members = await octokit.paginate(octokit.orgs.listMembers, {
-    org: process.env.GITHUB_ORG
+    org: process.env.GITHUB_ORG,
   })
 
-  const pendingInvites = await octokit.paginate(
-    octokit.orgs.listPendingInvitations,
-    {
-      org: process.env.GITHUB_ORG
-    }
-  )
+  const pendingInvites = await octokit.paginate(octokit.orgs.listPendingInvitations, {
+    org: process.env.GITHUB_ORG,
+  })
   const pendingGithubAccounts = formatUserList(pendingInvites)
 
   const githubAccounts = formatUserList(members)
 
   if (pendingGithubAccounts.size > 0)
-    console.log(
-      `Outstanding GitHub invites for ${Array.from(pendingGithubAccounts).join(
-        ', '
-      )}`
-    )
+    console.log(`Outstanding GitHub invites for ${Array.from(pendingGithubAccounts).join(', ')}`)
 
   return new Set([...githubAccounts, ...pendingGithubAccounts])
 }
 
-export function formatUserList (users): Set<string> {
-  return new Set(users.map(user => user.login.toLowerCase()))
+export function formatUserList(users): Set<string> {
+  return new Set(users.map((user) => user.login.toLowerCase()))
 }
 
-export async function getUserIdFromUsername (username: string) {
+export async function getUserIdFromUsername(username: string) {
   console.log(`Looking up user ${username}`)
   let user
   try {
@@ -59,13 +49,13 @@ export async function getUserIdFromUsername (username: string) {
   return user.data.id
 }
 
-export async function addUsersToGitHubOrg (users: Set<string>) {
+export async function addUsersToGitHubOrg(users: Set<string>) {
   for (const user of users) {
     await addUserToGitHubOrg(user)
   }
 }
 
-export async function addUserToGitHubOrg (user: string) {
+export async function addUserToGitHubOrg(user: string) {
   if (ignoredUsers.includes(user.toLowerCase())) {
     console.log(`Ignoring add for ${user}`)
     return false
@@ -74,27 +64,25 @@ export async function addUserToGitHubOrg (user: string) {
   console.log(`Inviting ${user} (${userId} to ${process.env.GITHUB_ORG})`)
   await octokit.orgs.createInvitation({
     org: process.env.GITHUB_ORG,
-    invitee_id: userId
+    invitee_id: userId,
   })
-  console.log(
-    `Invitation sent to ${user} (${userId} to ${process.env.GITHUB_ORG})`
-  )
+  console.log(`Invitation sent to ${user} (${userId} to ${process.env.GITHUB_ORG})`)
 }
 
-export async function removeUsersToGitHubOrg (users: Set<string>) {
+export async function removeUsersToGitHubOrg(users: Set<string>) {
   for (const user of users) {
     await removeUserToGitHubOrg(user)
   }
 }
 
-export async function removeUserToGitHubOrg (user: string) {
+export async function removeUserToGitHubOrg(user: string) {
   if (ignoredUsers.includes(user.toLowerCase())) {
     console.log(`Ignoring remove for ${user}`)
     return false
   }
   console.log(`Removing user/invitation ${user} from ${process.env.GITHUB_ORG}`)
   return octokit.orgs.removeMembershipForUser({
     org: process.env.GITHUB_ORG,
-    username: user
+    username: user,
   })
 }

src/google.ts

@@ -1,29 +1,27 @@
 const { google } = require('googleapis')
 
-const privatekey = JSON.parse(
-  Buffer.from(process.env.GOOGLE_CREDENTIALS, 'base64').toString('utf-8')
-)
+const privatekey = JSON.parse(Buffer.from(process.env.GOOGLE_CREDENTIALS, 'base64').toString('utf-8'))
 
 export const googleAuth = async () => {
   const jwtClient = new google.auth.JWT(
     privatekey.client_email,
     null,
     privatekey.private_key,
     ['https://www.googleapis.com/auth/admin.directory.user.readonly'],
-    process.env.GOOGLE_EMAIL_ADDRESS
+    process.env.GOOGLE_EMAIL_ADDRESS,
   )
   await jwtClient.authorize()
   return jwtClient
 }
 
-export async function getAdminService () {
+export async function getAdminService() {
   return google.admin({
     version: 'directory_v1',
-    auth: await googleAuth()
+    auth: await googleAuth(),
   })
 }
 
-export async function getGithubUsersFromGoogle () {
+export async function getGithubUsersFromGoogle() {
   const service = await getAdminService()
 
   const userList: {
@@ -33,7 +31,7 @@ export async function getGithubUsersFromGoogle () {
     maxResults: 250,
     projection: 'custom',
     fields: 'users(customSchemas/Accounts/github(value))',
-    customFieldMask: 'Accounts'
+    customFieldMask: 'Accounts',
   })
 
   const githubAccounts = formatUserList(userList.data.users)
@@ -44,15 +42,11 @@ interface userResponseEntry {
   customSchemas: { Accounts: { github: Array<{ value: string }> } }
 }
 
-export function formatUserList (users: Array<userResponseEntry>): Set<string> {
+export function formatUserList(users: Array<userResponseEntry>): Set<string> {
   return new Set(
     users
-      .map(user =>
-        user?.customSchemas?.Accounts?.github.map(account =>
-          account.value.toLowerCase()
-        )
-      )
+      .map((user) => user?.customSchemas?.Accounts?.github.map((account) => account.value.toLowerCase()))
       .flat()
-      .filter(Boolean)
+      .filter(Boolean),
   )
 }

tests/github.spec.ts

@@ -9,14 +9,8 @@ describe('github integration', () => {
   it.todo('removeUserToGitHubOrg')
 
   it('formatUserList', () => {
-    const response = [
-      { login: 'chrisns' },
-      { login: 'chrisns' },
-      { login: 'foo' }
-    ]
+    const response = [{ login: 'chrisns' }, { login: 'chrisns' }, { login: 'foo' }]
 
-    return expect(mod.formatUserList(response)).toEqual(
-      new Set(['chrisns', 'foo'])
-    )
+    return expect(mod.formatUserList(response)).toEqual(new Set(['chrisns', 'foo']))
   })
 })

tests/google.spec.ts

@@ -14,17 +14,15 @@ describe('google integration', () => {
       { customSchemas: { Accounts: { github: [{ value: 'chrisns' }] } } },
       {
         customSchemas: {
-          Accounts: { github: [{ value: 'Foo' }, , { value: 'tar' }] }
-        }
+          Accounts: { github: [{ value: 'Foo' }, , { value: 'tar' }] },
+        },
       },
       {
         customSchemas: {
-          Accounts: { github: [{ value: 'foo' }, { value: 'bar' }] }
-        }
-      }
+          Accounts: { github: [{ value: 'foo' }, { value: 'bar' }] },
+        },
+      },
     ]
-    return expect(mod.formatUserList(response)).toEqual(
-      new Set(['chrisns', 'foo', 'bar', 'tar'])
-    )
+    return expect(mod.formatUserList(response)).toEqual(new Set(['chrisns', 'foo', 'bar', 'tar']))
   })
 })