Merge branch 'master' into adding-list-of-contributions

Author: thulieblack

.github/workflows/mailing/index.js

@@ -1,7 +1,11 @@
-const mailer = require('@sendgrid/mail');
+const { Client } = require('node-mailjet')
 const { htmlMailContent, htmlToText } = require('./content');
 
-mailer.setApiKey(process.env.SENDGRID_API_KEY);
+const mailjet = new Client({
+  apiKey: process.env.MAILJET_API_KEY,
+  apiSecret: process.env.MAILJET_API_SECRET
+})
+
 const from = 'info@asyncapi.io';
 
 const sendMail = async (to, type, name, links, title, custom = {}) => {
@@ -12,21 +16,35 @@ const sendMail = async (to, type, name, links, title, custom = {}) => {
   console.debug(`Sending mail with text: ${text}`);
   console.debug(`Sending mail with text in html: ${html}`);
 
-  const msg = {
-    to,
-    from,
-    subject,
-    text,
-    html,
-  };
+  const data = {
+    Messages: [
+      {
+        From: {
+          Email: from,
+        },
+        To: [
+          {
+            Email: to,
+          },
+        ],
+        Subject: subject,
+        HTMLPart: html,
+        TextPart: text
+      },
+    ],
+  }
 
   try {
-    const response = await mailer.send(msg);
+    const response = await mailjet
+      .post('send', { version: 'v3.1' })
+      .request(data);
+
+    const { Status, Errors } = response.body.Messages[0]
 
     return {
-      success: response[0].statusCode === 202,
-      message: response[0].body,
-    };
+      success: Status === 'success',
+      message: Errors,
+    }
   } catch (error) {
     console.error(error);
   }

.github/workflows/notify-tsc-members-mention.yml

@@ -66,11 +66,11 @@ jobs:
           CALENDAR_ID: ${{ secrets.CALENDAR_ID }}
           CALENDAR_SERVICE_ACCOUNT: ${{ secrets.CALENDAR_SERVICE_ACCOUNT }}
           MAILCHIMP_API_KEY: ${{ secrets.MAILCHIMP_API_KEY }}
-          TITLE: ${{github.event.issue.title}}
+          TITLE: ${{ github.event.issue.title }}
         with:
           script: |
             const sendEmail = require('./.github/workflows/scripts/mailchimp/index.js');
-            sendEmail('${{github.event.issue.html_url}}', '$TITLE');
+            sendEmail('${{github.event.issue.html_url}}', process.env.TITLE);
 
   pull_request:
     if: github.event_name == 'pull_request_target' && contains(github.event.pull_request.body, '@asyncapi/tsc_members')
@@ -112,11 +112,11 @@ jobs:
           CALENDAR_ID: ${{ secrets.CALENDAR_ID }}
           CALENDAR_SERVICE_ACCOUNT: ${{ secrets.CALENDAR_SERVICE_ACCOUNT }}
           MAILCHIMP_API_KEY: ${{ secrets.MAILCHIMP_API_KEY }}
-          TITLE: ${{github.event.pull_request.title}}
+          TITLE: ${{ github.event.pull_request.title }}
         with:
           script: |
             const sendEmail = require('./.github/workflows/scripts/mailchimp/index.js');
-            sendEmail('${{github.event.pull_request.html_url}}', '$TITLE');
+            sendEmail('${{github.event.pull_request.html_url}}', process.env.TITLE);
 
   discussion:
     if: github.event_name == 'discussion' && contains(github.event.discussion.body, '@asyncapi/tsc_members')
@@ -158,11 +158,11 @@ jobs:
           CALENDAR_ID: ${{ secrets.CALENDAR_ID }}
           CALENDAR_SERVICE_ACCOUNT: ${{ secrets.CALENDAR_SERVICE_ACCOUNT }}
           MAILCHIMP_API_KEY: ${{ secrets.MAILCHIMP_API_KEY }}
-          TITLE: ${{github.event.discussion.title}}
+          TITLE: ${{ github.event.discussion.title }}
         with:
           script: |
             const sendEmail = require('./.github/workflows/scripts/mailchimp/index.js');
-            sendEmail('${{github.event.discussion.html_url}}', '$TITLE');
+            sendEmail('${{github.event.discussion.html_url}}', process.env.TITLE);
 
   issue_comment:
     if: ${{ github.event_name == 'issue_comment' && !github.event.issue.pull_request && contains(github.event.comment.body, '@asyncapi/tsc_members') }}
@@ -204,11 +204,11 @@ jobs:
           CALENDAR_ID: ${{ secrets.CALENDAR_ID }}
           CALENDAR_SERVICE_ACCOUNT: ${{ secrets.CALENDAR_SERVICE_ACCOUNT }}
           MAILCHIMP_API_KEY: ${{ secrets.MAILCHIMP_API_KEY }}
-          TITLE: ${{github.event.issue.title}}
+          TITLE: ${{ github.event.issue.title }}
         with:
           script: |
             const sendEmail = require('./.github/workflows/scripts/mailchimp/index.js');
-            sendEmail('${{github.event.comment.html_url}}', '$TITLE');
+            sendEmail('${{github.event.comment.html_url}}', process.env.TITLE);
 
   pr_comment:
     if: github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '@asyncapi/tsc_members')
@@ -250,11 +250,11 @@ jobs:
           CALENDAR_ID: ${{ secrets.CALENDAR_ID }}
           CALENDAR_SERVICE_ACCOUNT: ${{ secrets.CALENDAR_SERVICE_ACCOUNT }}
           MAILCHIMP_API_KEY: ${{ secrets.MAILCHIMP_API_KEY }}
-          TITLE: ${{github.event.issue.title}}
+          TITLE: ${{ github.event.issue.title }}
         with:
           script: |
             const sendEmail = require('./.github/workflows/scripts/mailchimp/index.js');
-            sendEmail('${{github.event.comment.html_url}}', '$TITLE');
+            sendEmail('${{github.event.comment.html_url}}', process.env.TITLE);
 
   discussion_comment:
     if: github.event_name == 'discussion_comment' && contains(github.event.comment.body, '@asyncapi/tsc_members')
@@ -296,8 +296,8 @@ jobs:
           CALENDAR_ID: ${{ secrets.CALENDAR_ID }}
           CALENDAR_SERVICE_ACCOUNT: ${{ secrets.CALENDAR_SERVICE_ACCOUNT }}
           MAILCHIMP_API_KEY: ${{ secrets.MAILCHIMP_API_KEY }}
-          TITLE: ${{github.event.discussion.title}}
+          TITLE: ${{ github.event.discussion.title }}
         with:
           script: |
             const sendEmail = require('./.github/workflows/scripts/mailchimp/index.js');
-            sendEmail('${{github.event.comment.html_url}}', '$TITLE');
+            sendEmail('${{github.event.comment.html_url}}', process.env.TITLE);

.github/workflows/vote-notify.yml

@@ -74,14 +74,15 @@ jobs:
 
       # Needed as axios and js-yaml are not available in the default environment
       - name: Install the dependencies
-        run: npm install js-yaml@4.1.0 axios@1.7.4 @sendgrid/mail@8.1.4
+        run: npm install js-yaml@4.1.0 axios@1.7.4 node-mailjet@6.0.9
         shell: bash
 
       - name: Notify TSC Members
         uses: actions/github-script@v7
         id: notify
         env:
-          SENDGRID_API_KEY: ${{ secrets.SENDGRID_API_KEY }}
+          MAILJET_API_KEY: ${{ secrets.MAILJET_PUBLIC_KEY}}
+          MAILJET_API_SECRET: ${{ secrets.MAILJET_PRIVATE_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 }}

CODE_OF_CONDUCT.md

@@ -1,87 +1,46 @@
-# AsyncAPI Code of Conduct
-
-## Introduction
-Welcome to our community! We are a diverse group of individuals united by our passion for open source and commitment to inclusivity.
-
-Our community promotes and supports inclusivity, welcoming individuals from all backgrounds and experiences. We believe that diversity is our strength, and we actively seek participation from those who enhance it.
-
-Our Code of Conduct governs how we behave publicly or privately when representing the project. It ensures that diverse groups collaborate for mutual advantage and enjoyment and challenges prejudice that could jeopardize anyone's participation in the project.
-
-We expect everyone in our community to treat each other with kindness, empathy, and respect. We believe fostering a welcoming and respectful environment can create a positive and successful community.
+# Contributor Covenant Code of Conduct
 
 ## Our Pledge
 
-As members, contributors, and admins of our community, we pledge to ensure that every individual is treated with respect and dignity. We pledge to create a safe, inclusive, and welcoming environment that is free from any form of harassment or discrimination regardless of differences in age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-We pledge to encourage a diverse, healthy community that celebrates individuality and promotes equality. We will act and interact in ways that promote openness, empathy, understanding, and acceptance of everyone's unique perspectives and experiences.
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards
 
-### Examples of behavior that contributes to a positive environment for our community include:
+Examples of behavior that contributes to creating a positive environment include:
 
-- Using welcoming and inclusive language.
-- Being respectful of differing viewpoints and experiences.
-- Gracefully accepting constructive criticism.
-- Focusing on what is best for the community.
-- Showing empathy towards other community members.
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
-### Examples of unacceptable behavior include:
+Examples of unacceptable behavior by participants include:
 
-- The use of sexualized language or imagery and unwelcome sexual attention or advances.
-- Trolling, insulting/derogatory comments, and personal or political attacks.
-- Public or private harassment.
-- Publishing others' private information, such as a physical or electronic address, without explicit permission.
-- Publishing content or comments that promote illegal activities.
-- Violence, threats of violence, or violent language.
-- Other conduct that could reasonably be considered inappropriate in a professional setting.
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
 
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+## Our Responsibilities
 
-## Enforce Responsibilities
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
 
-The Code of Conduct Committee (CoC Committee) responds to, investigates, and resolves AsyncAPI Incidents. The Committee is responsible for clarifying the standards of acceptable behavior and taking appropriate and fair corrective action in response to unacceptable behavior.
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
 
-The Committee has the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that do not align with this Code of Conduct. The Committee may also temporarily or permanently ban any contributor for inappropriate, threatening, offensive, or harmful behaviors to the community.
+## Scope
 
-For more details, please see the [CoC Committee and Incident Resolution Procedure](https://github.com/asyncapi/community/tree/master/code_of_conduct).
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at conduct@asyncapi.io. All complaints will be reviewed and investigated promptly and fairly.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at fmvilas@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-## Enforcement Guidelines
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-Community Impact: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-
-Consequence: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-Community Impact: A violation through a single incident or series of actions.
-
-Consequence: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
-
-### 3. Temporary Ban
-Community Impact: A serious violation of community standards, including sustained inappropriate behavior.
-
-Consequence: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-Community Impact: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
-
-Consequence: A permanent ban from any sort of public interaction within the community.
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at [http://contributor-covenant.org/version/2/1][version].
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
-[version]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/inclusion
+[version]: http://contributor-covenant.org/version/1/4/

docs/000-onboarding/_section.md

@@ -1,4 +1,4 @@
 ---
-title: Onboarding
-weight: 10
+title: 'Onboarding'
+weight: 2
 ---

docs/000-onboarding/documentarian-onboarding-guide.md

@@ -1,6 +1,6 @@
 ---
 title: Documentarian Onboarding Guide
-# weight: 30
+weight: 30
 ---
 
 🚧 This document is under construction.

docs/000-onboarding/how-to-contribute.md

@@ -1,6 +1,6 @@
 ---
 title: How to Contribute
-# weight: 20
+weight: 20
 ---
 
 🚧 This document is under construction.

docs/000-onboarding/index.md

@@ -1,6 +1,6 @@
 ---
 title: Introduction
-weight: 5
+weight: 2
 ---
 ## Technical writer onboarding guide
 
@@ -17,6 +17,3 @@ The goal is providing docs contributors with the necessary tools and knowledge t
 * Implement and propose updates to our documentation.
 * Obtain and incorporate reviewers' feedback.
 * Publish changes successfully.
-
-
-

docs/000-onboarding/where-to-contribute.md

@@ -1,6 +1,6 @@
 ---
 title: Where to Contribute
-# weight: 10
+weight: 10
 ---
 
 🚧 This document is under construction.

docs/010-contribution-guidelines/_section.md

@@ -1,4 +1,4 @@
 ---
-title: Contribution Guidelines
-weight: 20
+title: 'Contribution Guidelines'
+weight: 3
 ---