Merge pull request #329 from github/general-fixes

General Fixes + Dependency Updates

Author: GrantBirki

__tests__/functions/prechecks.test.js

@@ -270,7 +270,7 @@ test('runs prechecks and finds the commit fetched via the rest call does not mat
 
   expect(await prechecks(context, octokit, data)).toStrictEqual({
     message:
-      '### ⚠️ Cannot proceed with deployment\n\nThe commit sha from the PR head does not match the commit sha from the graphql query\n\n- sha: `abc123`\n- commit_oid: `evilcommit123`. This is unexpected and could be caused by a commit being pushed to the branch after the initial rest call was made. Please review your PR timeline and try again.',
+      '### ⚠️ Cannot proceed with deployment\n\nThe commit sha from the PR head does not match the commit sha from the graphql query\n\n- sha: `abc123`\n- commit_oid: `evilcommit123`\n\nThis is unexpected and could be caused by a commit being pushed to the branch after the initial rest call was made. Please review your PR timeline and try again.',
     status: false
   })
 })
@@ -308,7 +308,7 @@ test('runs prechecks and fails due to bad user permissions', async () => {
     .mockReturnValueOnce({data: {permission: 'read'}, status: 200})
   expect(await prechecks(context, octokit, data)).toStrictEqual({
     message:
-      '👋 __monalisa__, seems as if you have not admin/write/maintain permissions in this repo, permissions: read',
+      '👋 @monalisa, that command requires the following permission(s): `admin/write/maintain`\n\nYour current permissions: `read`',
     status: false
   })
 })

__tests__/functions/valid-permissions.test.js

@@ -46,7 +46,7 @@ test('determines that a user has does not valid permissions to invoke the Action
     })
 
   expect(await validPermissions(octokit, context, permissions)).toEqual(
-    '👋 __monalisa__, seems as if you have not write/maintain/admin permissions in this repo, permissions: read'
+    '👋 @monalisa, that command requires the following permission(s): `write/maintain/admin`\n\nYour current permissions: `read`'
   )
   expect(setOutputMock).toHaveBeenCalledWith('actor', 'monalisa')
 })

__tests__/main.test.js

@@ -238,6 +238,12 @@ test('successfully runs the action in noop mode', async () => {
   expect(saveStateMock).toHaveBeenCalledWith('comment_id', 123)
   expect(saveStateMock).toHaveBeenCalledWith('ref', 'test-ref')
   expect(saveStateMock).toHaveBeenCalledWith('noop', true)
+  expect(infoMock).toHaveBeenCalledWith(
+    `🧑‍🚀 commit sha to noop: ${COLORS.highlight}deadbeef${COLORS.reset}`
+  )
+  expect(infoMock).toHaveBeenCalledWith(
+    `🚀 ${COLORS.success}deployment started!${COLORS.reset} (noop)`
+  )
 })
 
 test('successfully runs the action in noop mode when using sticky_locks_for_noop set to true', async () => {

dist/index.js

@@ -331,7 +331,7 @@ export async function prechecks(context, octokit, data) {
     // This could occur if the branch had a commit pushed to it in between the rest call and the graphql query
     // In this case, we should not proceed with the deployment as we cannot guarantee the sha is safe for a variety of reasons
   } else if (sha !== commit_oid) {
-    message = `### ⚠️ Cannot proceed with deployment\n\nThe commit sha from the PR head does not match the commit sha from the graphql query\n\n- sha: \`${sha}\`\n- commit_oid: \`${commit_oid}\`. This is unexpected and could be caused by a commit being pushed to the branch after the initial rest call was made. Please review your PR timeline and try again.`
+    message = `### ⚠️ Cannot proceed with deployment\n\nThe commit sha from the PR head does not match the commit sha from the graphql query\n\n- sha: \`${sha}\`\n- commit_oid: \`${commit_oid}\`\n\nThis is unexpected and could be caused by a commit being pushed to the branch after the initial rest call was made. Please review your PR timeline and try again.`
 
     return {message: message, status: false}
 

dist/index.js.map

@@ -30,11 +30,11 @@ export async function validPermissions(
   // Check to ensure the user has at least write permission on the repo
   const actorPermission = permissionRes.data.permission
   if (!validPermissionsArray.includes(actorPermission)) {
-    return `👋 __${
+    return `👋 @${
       context.actor
-    }__, seems as if you have not ${validPermissionsArray.join(
+    }, that command requires the following permission(s): \`${validPermissionsArray.join(
       '/'
-    )} permissions in this repo, permissions: ${actorPermission}`
+    )}\`\n\nYour current permissions: \`${actorPermission}\``
   }
 
   // Return true if the user has permissions