Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
derberg authored Jun 10, 2024
2 parents 76291c7 + 9115838 commit 7f8484d
Show file tree
Hide file tree
Showing 7 changed files with 309 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/slack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ Three main resources are created using the slack integration:
- Use of bot token of the format `xoxo-<your-slack-token>` is not supported for creating user groups.
- The user group should be unique across the workspace (i.e., no channel, user, or user group should have the same handle).
- Please [import](#importing-existing-resources) the user groups to terraform state if they already exist in the workspace, as they **cannot be deleted** in Slack 😢.
- **You have to invite the bot to all managed channels to make it work.**
> [!WARNING]
> **Creation of multitudes of groups leads to a lot of API calls and can lead to rate limiting. Please be cautious while creating groups, otherwise you will get `Error: couldn't get usergroups: slack rate limit exceeded, retry after 30s`**. Related issue (not fixed even thought it is closed): https://github.com/pablovarela/terraform-provider-slack/issues/64
> [!IMPORTANT]
> The terraform state will overwrite any description, name, or topic change. It is better to manage the changes in the YAML files and then apply them. However, the terraform state will not affect bookmarks, pinned items, etc.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slack/groups/groups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

- name: "Studio"
handle: "studio"
description: "To notify all regular Studio contributors at once. If you don't contribute regularly but want to get notified too, please open a PR to get added."
description: "To notify all regular Studio contributors at once, please open PR to get added"
users:
- "U01RWDD69PZ"
- "U0572R8J927"
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- name: Aishat Muibudeen
github: mayaleeeee
github: Mayaleeeee
linkedin: aishatmuibudeen
slack: U03CNHGEUR1
twitter: maya_ux_ui
Expand Down
3 changes: 3 additions & 0 deletions WORKING_GROUPS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ working_groups:
- name: Fran Méndez
github: fmvilas
slack: U34F2JRRS
- name: Aayush Saini
github: AayushSaini101
slack: U04RN9LRV97
slack:
channel:
handle: wg-developer-experience
Expand Down
248 changes: 248 additions & 0 deletions code_of_conduct/coc-incident-resolution-procedures.md

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions code_of_conduct/code-of-conduct-committee.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# AsyncAPI Code of Conduct Committee

## Purpose

The AsyncAPI Code of Conduct Committee (CoC Committee) is a committee that responds to investigates, and resolves [AsyncAPI Code of Conduct](https://github.com/asyncapi/community/blob/master/CODE_OF_CONDUCT.md) incidents.

The members of the CoC Committee are members of the [Technical Steering Committee](https://www.asyncapi.com/community/tsc) (TSC) [voted](https://github.com/orgs/asyncapi/discussions/682#discussioncomment-7498209) publicly by the community. The committee has a two-year term, after which re-election will take place.

## Members

The AsyncAPI CoC Committee consists of 3 full members and 3 alternate members:

**Full Members**:

- [Aishat Muibudeen](https://github.com/mayaleeeee)
- [Azeez Elegbede](https://github.com/acethecreator)
- [Sergio Moya](https://github.com/smoya)

**Alternate Members:**

- [Alejandra Quetzalli](https://github.com/alequetzalli)
- [Thulisile Sibanda](https://github.com/thulieblack)

If one of the CoC members listed above is unavailable or has to recuse themselves from participating in the resolution of a CoC incident due to a conflict of interest (see our [Conflict of Interest policy](*)), AsyncAPI may request assistance from the [Technical Steering Committee](https://www.asyncapi.com/community/tsc) in appointing an alternate from the TSC members to take their place for that incident.

## How Decisions Are Made

Decisions of the CoC Committee shall be made by consensus whenever possible. In the event consensus cannot be reached, decisions shall be made by majority vote of non-conflicted members of the CoC Committee. A decision to take temporary interim action in the event of an emergency may be taken by any individual CoC Committee member acting in good faith, and the CoC Committee shall review such action and decide whether to confirm or reverse such action. Any permanent action shall require approval of a majority of non-conflicted members of the CoC Committee. The CoC Committee may take action without a meeting if a majority of non-conflicted members express agreement in writing (e.g., email or Slack) and none of the non-conflicted CoC Committee members either object to the proposed action or request a meeting to discuss the proposed action within 24 hours after the action is first proposed to the CoC Committee. In the absence of such agreement in writing, the CoC Committee may only take action during or after a meeting takes place at which the proposed action is discussed and agreed to by consensus or voted upon by a quorum of the non-conflicted members. A majority of non-conflicted members shall be deemed a quorum for purposes of a meeting. See the [Conflict of Interest](*) section of the Incident Resolution Procedures for more information.

## External Support Resources

The CoC Committee may, in its discretion, consult external mediators, investigators, advisors, and consultants as needed to assist with resolution of CoC Incidents. Any such external resources shall not have a vote, and shall be required to maintain confidentiality.

## Incident Resolution Procedures

Please see our [Incident Resolution Procedures](coc-incident-resolution-procedures.md), which address, among others:

- How to submit a report
- What information to share in your report
- What happens after a report is submitted
- Resolution
- Information sharing
- Confidentiality Policy
- No retaliation
- Conflicts of interest
7 changes: 7 additions & 0 deletions tweets/recurring-slack-link/2024-06-08.tweet
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
✨ Did you know #AsyncAPI is on Slack? ✨

Join our Slack workspace to chat with anyone from our Open-Source community!

🔗 asyncapi.com/slack-invite

Ask for help and help others too. 💪🏿💪🏽🦾

0 comments on commit 7f8484d

Please sign in to comment.