From ccbcda523fcb011fb3b56c83bb32d92ba376c6c8 Mon Sep 17 00:00:00 2001
From: Mika Ayenson <Mikaayenson@users.noreply.github.com>
Date: Wed, 3 Aug 2022 14:36:08 -0400
Subject: [PATCH] [Bug] Opening Issues in this Repo Causes "Run failed:
 Community - main" (#2214)

* use ghv6 and catch errors

(cherry picked from commit 73584407d7c8764a85a2e8f4450491d1b2002878)
---
 .github/workflows/community.yml | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/community.yml b/.github/workflows/community.yml
index f6beebde4..83735dd66 100644
--- a/.github/workflows/community.yml
+++ b/.github/workflows/community.yml
@@ -12,30 +12,39 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check if member of elastic org
-        uses: actions/github-script@v4
+        uses: actions/github-script@v6
         id: membership
         with:
           github-token: ${{ secrets.READ_ORG_TOKEN }}
           result-encoding: string
           script: |
-            const result = await github.orgs.getMembershipForUser({
+
+            try {
+              const result = await github.rest.orgs.getMembershipForUser({
                        org: "elastic",
-                       username: context.payload.sender.login
+                       username: '${{ github.actor }}'
                     })
-            console.log(result.data.state)
-            if (result.data.state == "active"){
-              console.log("%s: detected as an active member of elastic org", context.payload.sender.login)
-              return "member"
-            } else {
-              console.log("%s: not detected as active member of elastic org", context.payload.sender.login)
-              return "notMember"
+
+              console.log(result?.data?.state)
+              if (result?.data?.state == "active"){
+                console.log("%s: detected as an active member of elastic org", '${{ github.actor }}')
+                return "member";
+              } else {
+                console.log("%s: not detected as active member of elastic org", '${{ github.actor }}')
+                return "notMember";
+              }
+
+            } catch (error) {
+              return "notMember";
             }
+
+
       - name: Add label for community members
-        uses: actions/github-script@v4
+        uses: actions/github-script@v6
         if: ${{ steps.membership.outputs.result == 'notMember' }}
         with:
           script: |
-            github.issues.addLabels({
+            github.rest.issues.addLabels({
                             issue_number: context.issue.number,
                             owner: context.repo.owner,
                             repo: context.repo.repo,