Merge remote-tracking branch 'upstream/master' into docs/reorganize-repo-docs

Author: bandantonio

.github/workflows/create-event-workflow-reusable.yml

@@ -102,9 +102,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 22
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
       - name: Install deps

.github/workflows/mailing/index.js

@@ -8,6 +8,10 @@ const sendMail = async (to, type, name, links, title, custom = {}) => {
   const { subject, html } = htmlMailContent(type, name, links, title, custom);
   const text = htmlToText(html);
 
+  console.debug(`Sending mail with subject: ${subject}`);
+  console.debug(`Sending mail with text: ${text}`);
+  console.debug(`Sending mail with text in html: ${html}`);
+
   const msg = {
     to,
     from,

.github/workflows/maintainer_management.yml

@@ -172,7 +172,11 @@ jobs:
                 });
                 core.info(`Successfully removed ${maintainer} from the organization.`);
               } catch (error) {
-                core.setFailed(`Failed to remove ${maintainer} from the organization: ${error.message}`);
+                if (error.message.startsWith('Cannot find')) {
+                  core.info(`Failed to remove ${maintainer} from the organization: ${error.message}`);
+                } else {
+                  core.setFailed(`Failed to remove ${maintainer} from the organization: ${error.message}`);
+                }
               }
             }
 
@@ -191,14 +195,10 @@ jobs:
           github-token: ${{ secrets.GH_TOKEN_ORG_ADMIN }}
           script: |
               const removedMaintainers = "${{ needs.remove_maintainer.outputs.removedMaintainers }}".split(",");
-              const removedTscMembers = "${{ needs.remove_maintainer.outputs.removedTscMembers }}".split(",");
 
-              // Goodbye message to removed maintainers and notification to TSC members
+              // Goodbye message to removed maintainers
               const combinedMessages = removedMaintainers.map((maintainer) => {
-                const tscNotification = removedTscMembers.includes(maintainer)
-                  ? `@asyncapi/tsc_members We want to inform you that @${maintainer.trim().replace(/^@/, '')} is no longer a maintainer of any repository under AsyncAPI Initiative. It means this maintainer is also no longer a member of TSC.`
-                  : '';
-                return `@${maintainer.trim().replace(/^@/, '')} We wanted to express our gratitude for your contributions as a maintainer of AsyncAPI Initiative. Your efforts have been immensely valuable to us, and we truly appreciate your dedication. Thank you once again, and we wish you all the best in your future endeavors!\n\n${tscNotification}`;
+                return `@${maintainer.trim().replace(/^@/, '')} We would like to express our gratitude for your contributions as a maintainer of AsyncAPI Initiative. Your efforts have been immensely valuable to us, and we truly appreciate your dedication. Thank you once again, and we wish you all the best in your future endeavors!\n\n`;
               });
 
               const { owner, repo } = context.repo;

.github/workflows/tsc_management.yml

@@ -183,7 +183,7 @@ jobs:
 
             // Goodbye message to removed TSC members
             const tscMessages = removedTscMembers.map(tscMember => {
-              return `@asyncapi/tsc_members We want to inform you that @${tscMember.trim().replace(/^@/, '')} is no longer a member of the TSC. This might be because of various reasons. Might be that @${tscMember.trim().replace(/^@/, '')} is no longer a maintainer of any repository under AsyncAPI Initiative. Might be also that @${tscMember.trim().replace(/^@/, '')} is still a maintainer but cannot commit to support entire organization and wants to focus only on the maintained repository. Might be also that @${tscMember.trim().replace(/^@/, '')}  did not participate in voting for a long time and was removed due to inactivity and no communication.`;
+              return `@${tscMember.trim().replace(/^@/, '')} We would like to express our gratitude for your contributions as a member of the Technical Steering Committee at the AsyncAPI Initiative. Your efforts have been immensely valuable to us, and we truly appreciate your dedication. Thank you once again, and we wish you all the best in your future endeavors!\n\n`;
             });
 
             const { owner, repo } = context.repo;
@@ -196,6 +196,8 @@ jobs:
     needs: remove_tsc_member
     if: needs.remove_tsc_member.outputs.removedMaintainers != ''
     runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
     steps:
       - name: Check out code
         uses: actions/checkout@v2
@@ -242,6 +244,7 @@ jobs:
         run: |
           git config --global user.name asyncapi-bot
           git config --global user.email [email protected]
+
       - name: Create new branch
         run: |
           git checkout -b update-emeritus-${{ github.run_id }}

.github/workflows/vote-notify-helpers/index.js

@@ -165,6 +165,9 @@ async function sendMailNotification(member, issue, daysSinceStart, slackToken, s
       return false;
     }
 
+	//logging only type of email value to identify if undefined or string so we know if API responds with data or there are some scopes issues and API returns undefined
+	console.debug(`Fetched email from Slack for ${response.data.user.profile.real_name_normalized} and data is: ${typeof response.data.user.profile.email}`);
+
     const { real_name_normalized, email } = response.data.user.profile;
     const { success, message } = await sendMail(email, 'voting', real_name_normalized, links, title, { days: daysSinceStart });
 

.github/workflows/vote-notify.yml

@@ -1,6 +1,17 @@
 name: Notify TSC Members about Voting Status
 
 on:
+  workflow_dispatch:
+    inputs:
+      notification_method:
+        description: 'Which channel(s) to notify on manual dispatch'
+        required: true
+        default: 'both'
+        type: choice
+        options:
+          - email
+          - slack
+          - both
   schedule:
     # Daily at 9:00 UTC
     - cron: '0 9 * * *'
@@ -47,52 +58,65 @@ jobs:
           # This file comes from the branch vote_state which is created by the stateful-action
           # Eg: https://github.com/ash17290/asyncapi-community/tree/vote_state
           cd .vote_state
-          
+
           # Check if the file exists, not empty and readable and create if not
           if [ ! -f vote_status.json ] || [ ! -s vote_status.json ] || [ ! -r vote_status.json ]; then
-            echo "Intializing vote_status.json"
+            echo "Initializing vote_status.json"
             echo "{}" > vote_status.json
           fi
 
           # Read the file and export it as JSON
           export json=$(cat vote_status.json | jq -c)
-
           echo "::debug::vote_status=$json"
 
           # Store in GitHub Output
           echo "vote_status=$json" >> $GITHUB_OUTPUT
-      
+
       # Needed as axios and js-yaml are not available in the default environment
       - name: Install the dependencies
         run: npm install [email protected] [email protected] @sendgrid/[email protected]
         shell: bash
-      
+
       - name: Notify TSC Members
         uses: actions/github-script@v7
         id: notify
         env:
           SENDGRID_API_KEY: ${{ secrets.SENDGRID_API_KEY }}
+          # default to 'both' if inputs.notification_method is undefined (schedule runs)
+          NOTIFY_METHOD: ${{ github.event.inputs.notification_method || 'both' }}
+          SLACK_DM: ${{ secrets.SLACK_DM_TSC }}
         with:
           script: |
             const yaml = require('js-yaml');
             const fs = require('fs');
-            const axios = require('axios');
+            const {
+              filterIssues,
+              getTSCLeftToVote,
+              sendSlackNotification,
+              sendMailNotification
+            } = require('./.github/workflows/vote-notify-helpers/index.js');
+            const { sendMail } = require('./.github/workflows/mailing/index.js');
 
             // Creates list of issues for which the TSC members need to be notified
             // The number of buffer days is easily configurable by changing the value of the days variable
-            const { filterIssues, getTSCLeftToVote, sendSlackNotification, sendMailNotification } = require('./.github/workflows/vote-notify-helpers/index.js');
-            const { sendMail } = require('./.github/workflows/mailing/index.js');
             const issues = ${{ steps.list.outputs.result }};
             const initialState = ${{ steps.fetch.outputs.vote_status }};
-            const config = {
-              days: 5
-            }
+
+            // On manual dispatch, override to 0; on schedule keep 5
+            // If workflow_dispatch is used (manual workflow trigger) then we want to set 0 to force notification sending, even if it was just sent or the other day
+            const daysBuffer = context.eventName === 'workflow_dispatch' ? 0 : 5;
+            const config = { days: daysBuffer };
 
             const { issuesToNotify, state } = filterIssues(issues, initialState, config);
 
+            // Read TSC members from MAINTAINERS.yaml
             const tscMembers = yaml.load(fs.readFileSync('MAINTAINERS.yaml', 'utf8')).filter(member => member.isTscMember);
             const failingSlackIds = new Set();
             const failingEmails = new Set();
+
+            const method = process.env.NOTIFY_METHOD; // 'email' | 'slack' | 'both'
+
+            console.log(`Notification method: ${method}`);
             console.log(`Issues to notify: ${JSON.stringify(issuesToNotify.map(issue => issue.number))}`);
 
             for (const issue of issuesToNotify) {
@@ -101,22 +125,30 @@ jobs:
               for (const member of leftToVote) {
                 console.log(`Notifying ${member.name} about issue #${issue.number}`);
 
-                if (!await sendSlackNotification(member, issue, daysSinceStart, `${{ secrets.SLACK_DM_TSC }}`, voteCommentURL)) {
-                  failingSlackIds.add(member.slack);
+                // Only send Slack if requested
+                if (method === 'slack' || method === 'both') {
+                  if (!await sendSlackNotification(member, issue, daysSinceStart, process.env.SLACK_DM, voteCommentURL)) {
+                    failingSlackIds.add(member.slack);
+                  }
                 }
 
-                if (!await sendMailNotification(member, issue, daysSinceStart, `${{ secrets.SLACK_DM_TSC }}`, sendMail, voteCommentURL)) {
-                  failingEmails.add(member.email);
+                // Only send Email if requested
+                if (method === 'email' || method === 'both') {
+                  if (!await sendMailNotification(member, issue, daysSinceStart, process.env.SLACK_DM, sendMail, voteCommentURL)) {
+                    failingEmails.add(member.email);
+                  }
                 }
               }
+
+              // Update last_notified timestamp
               state[issue.number].last_notified = new Date().toISOString();
             }
 
             // Store the failing IDs in GITHUB_ENV
             const failingIds = [...failingSlackIds, ...failingEmails];
             if (failingIds.length > 0) {
-              process.env.FAILED_IDS = Array.from(failingIds).join(',');
-              core.exportVariable('FAILED_IDS', JSON.stringify(Array.from(failingIds)));
+              process.env.FAILED_IDS = failingIds.join(',');
+              core.exportVariable('FAILED_IDS', JSON.stringify(failingIds));
             }
 
             // Store the state back
@@ -127,11 +159,12 @@ jobs:
         run: |
           echo ${{ steps.notify.outputs.result }} | jq > ./.vote_state/vote_status.json
 
+      # Always alert on any failures, regardless of method
       - name: Notify about failing Slack DMs
-        if: env.FAILED_IDS
+        if: ${{ env.FAILED_IDS }}
         uses: rtCamp/action-slack-notify@v2
         env:
-          SLACK_WEBHOOK: ${{secrets.SLACK_CI_FAIL_NOTIFY}}
-          SLACK_TITLE: 🚨 Vote notifications could'nt be sent to following IDs 🚨
-          SLACK_MESSAGE: ${{ env.FAILED_SLACK_IDS }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_CI_FAIL_NOTIFY }}
+          SLACK_TITLE: 🚨 Vote notifications couldn’t be sent 🚨
+          SLACK_MESSAGE: ${{ env.FAILED_IDS }}
           MSG_MINIMAL: true

Emeritus.yaml

@@ -6,7 +6,7 @@ emeritus_ambassadors:
   - raphaeldelio
 
 emeritus_tsc:
-  - jotamusik 
+  - jotamusik
   - LouisXhaferi
   - aeworxet
   - arjungarg07
@@ -25,3 +25,4 @@ emeritus_tsc:
   - M3lkior
   - anandsunderraman
   - lbroudoux
+  - CameronRushton

MAINTAINERS.yaml

@@ -85,7 +85,7 @@
   slack: U01DVKKAV5K
   availableForHire: false
   company: Solace
-  isTscMember: true
+  isTscMember: false
   repos:
     - spec-json-schemas
     - bindings