refactor: simplify GitHub team requirements by removing module contributors from AVM documentation

Author: matebarabas

docs/content/help-support/issue-triage/avm-issue-triage.md

@@ -230,7 +230,7 @@ To look for Orphaned Modules:
     - Add the &nbsp;<mark style="background-image:none;white-space: nowrap;background-color:#C8E6C9;">Status: Module Available 🟢</mark>&nbsp; and &nbsp;<mark style="background-image:none;white-space: nowrap;background-color:#FBEF2A;">Status: Owners Identified 🤘</mark>&nbsp; labels to the issue.
     - Move the issue into the "`Done`" column on the [AVM - Modules Triage](https://aka.ms/avm/moduletriage) GitHub Project board.
 3. Update the AVM Module Indexes, following the [process documented internally](https://dev.azure.com/CSUSolEng/Azure%20Verified%20Modules/_wiki/wikis/AVM%20Internal%20Wiki/684/Module-index-update-process).
-4. Get the new owner(s) and any new contributor(s) added to the related `-module-owners-` or `-module-contributors-` teams as applicable. See [SNFR20]({{% siteparam base %}}/spec/SNFR20) for more details.
+4. Get the new owner(s) added to the related `-module-owners-` team as applicable. See [SNFR20]({{% siteparam base %}}/spec/SNFR20) for more details.
 5. Remove the information notice (i.e., the file that states that `⚠️THIS MODULE IS CURRENTLY ORPHANED.⚠️, etc.` ):
     - In case of a Bicep module:
       - Delete the `ORPHANED.md` file from the module's root.
@@ -276,13 +276,12 @@ If a module meets the criteria described in the "[Deprecated Modules]({{% sitepa
     1. Remove the module from the [`CODEOWNERS`](https://github.com/Azure/bicep-registry-modules/blob/main/.github/CODEOWNERS) file.
     1. Submit a Pull Request
     1. For the AVM maintainers: Once the PR is merged, run the [.Platform - Publish [moduleIndex.json]](https://github.com/Azure/bicep-registry-modules/actions/workflows/platform.publish-module-index-json.yml) workflow with the `regenIndexFromBRM` flag set. This will de-list the module so that it won't show up in the VS-Code Bicep extension going forward.
-7. Delete the module's `-owners-` and `-contributors-` GitHub teams.
+7. Delete the module's `-owners-` GitHub teams.
 
 **Terraform specific steps**
 
 4. Place the information notice - with the text below - in the `README.md` file, in the module's root.
 5. Archive the module's repository on GitHub.
-6. Keep the module's `-owners-` and `-contributors-` GitHub teams, as these will keep granting access to the source code of the module.
 
 **Deprecation information notice** (to be place in the module's repository as described above)
 

docs/content/specs-defs/includes/shared/shared/non-functional/SNFR20.md

@@ -22,69 +22,66 @@ priority: 1110
 
 All GitHub repositories that AVM module are published from and hosted within **MUST** only assign GitHub repository permissions to GitHub teams only.
 
-Each module **MUST** have separate GitHub teams assigned for module owners **AND** module contributors respectively. These GitHub teams **MUST** be created in the [Azure organization](https://github.com/orgs/Azure/teams) in GitHub.
+Each module **MUST** have a GitHub team assigned for module owners. This team **MUST** be created in the [Azure organization](https://github.com/orgs/Azure/teams) in GitHub.
 
 There **MUST NOT** be any GitHub repository permissions assigned to individual users.
 
+{{% notice style="important" %}}
+Non-FTE / external contributors (subject matter experts that aren't Microsoft employees) can't be members of the teams described in this chapter, hence, they won't gain any extra permissions on AVM repositories, therefore, they need to work in forks.
+{{% /notice %}}
+
+### Bicep
+
 {{% notice style="note" %}}
 The names for the GitHub teams for each approved module are already defined in the respective [Module Indexes]({{% siteparam base %}}/indexes/). These teams **MUST** be created (and used) for each module.
 
 - [Bicep Resource Modules]({{% siteparam base %}}/indexes/bicep/bicep-resource-modules/#module-name-telemetry-id-prefix-github-teams-for-owners)
 - [Bicep Pattern Modules]({{% siteparam base %}}/indexes/bicep/bicep-pattern-modules/#module-name-telemetry-id-prefix-github-teams-for-owners)
-- [Terraform Resource Modules]({{% siteparam base %}}/indexes/terraform/tf-resource-modules/#module-name-telemetry-id-prefix-github-teams-for-owners)
-- [Terraform Pattern Modules]({{% siteparam base %}}/indexes/terraform/tf-pattern-modules/#module-name-telemetry-id-prefix-github-teams-for-owners)
+- [Bicep Utility Modules]({{% siteparam base %}}/indexes/bicep/bicep-utility-modules/#module-name-telemetry-id-prefix-github-teams-for-owners)
 
 The `@Azure` prefix in the last column of the tables linked above represents the "Azure" GitHub organization all AVM-related repositories exist in. **DO NOT** include this segment in the team's name!
 
 {{% /notice %}}
 
-{{% notice style="important" %}}
-Non-FTE / external contributors (subject matter experts that aren't Microsoft employees) can't be members of the teams described in this chapter, hence, they won't gain any extra permissions on AVM repositories, therefore, they need to work in forks.
-{{% /notice %}}
 
-### Naming Convention
 
-The naming convention for the GitHub teams **MUST** follow the below pattern:
+#### Naming Convention
 
-- `<hyphenated module name>-module-owners-<bicep/tf>` - to grant permissions for module owners
-- `<hyphenated module name>-module-contributors-tf` - to grant permissions for module contributors (for Terraform modules only)
+The naming convention for the GitHub teams **MUST** follow the below pattern:
 
-{{% notice style="note" %}}
-The naming convention for Bicep modules is slightly different than the naming convention for their respective GitHub teams.
-{{% /notice %}}
+- `<hyphenated module name>-module-owners-bicep` - to grant permissions for module owners on Bicep modules
 
 Segments:
 
 - `<hyphenated module name>` == the AVM Module's name, with each segment separated by dashes, i.e., `avm-res-<resource provider>-<ARM resource type>`
   - See [RMNFR1]({{% siteparam base %}}/spec/RMNFR1) for AVM Resource Module Naming
   - See [PMNFR1]({{% siteparam base %}}/spec/PMNFR1) for AVM Pattern Module Naming
-- `module-owners` or `module-contributors` == the role the GitHub Team is assigned to
-- `<bicep/tf>` == the language the module is written in
+- `module-owners` == the role the GitHub Team is assigned to
+- `<bicep` == the language the module is written in
 
 Examples:
 
 - `avm-res-compute-virtualmachine-module-owners-bicep`
-- `avm-res-compute-virtualmachine-module-contributors-tf`
-
-### Add Team Members
 
-All officially documented module owner(s) **MUST** be added to the `-module-owners-` team. The `-module-owners-` team **MUST NOT** have any other members.
+{{% notice style="note" %}}
+The naming convention for Bicep modules is slightly different than the naming convention for their respective GitHub teams.
+{{% /notice %}}
 
-In case of Terraform modules, any additional module contributors whom the module owner(s) agreed to work with **MUST** be added to the `-module-contributors-` team.
+#### Add Team Members
 
-Unless explicitly requested and agreed, members of the AVM core team or any PG teams **MUST NOT** be added to the `-module-owners-` or `-module-contributors-` teams as permissions for them are granted through the teams described in [SNFR9]({{% siteparam base %}}/spec/SNFR9).
+All officially documented module owner(s) **MUST** be added to the `-module-owners-` team. The `-module-owners-` team **MUST NOT** have any other members.
 
-### Grant Permissions - Bicep
+Unless explicitly requested and agreed, members of the AVM core team or any PG teams **MUST NOT** be added to the `-module-owners-` teams as permissions for them are granted through the teams described in [SNFR9]({{% siteparam base %}}/spec/SNFR9).
 
-### Team memberships
+#### Grant permissions through team memberships
 
 {{% notice style="note" %}}
 
-In case of Bicep modules, permissions to the [BRM](https://aka.ms/BRM) repository (the repo of the Bicep Registry) are granted via assigning the `-module-owners-` and `-module-contributors-` teams to parent teams that already have the required level access configured. While it is the module owner's responsibility to initiate the addition of their teams to the respective parents, only the AVM core team can approve this parent-child relationship.
+In case of Bicep modules, permissions to the [BRM](https://aka.ms/BRM) repository (the repo of the Bicep Registry) are granted via assigning the `-module-owners-` teams to parent teams that already have the required level access configured. While it is the module owner's responsibility to initiate the addition of their team to the respective parent, only the AVM core team can approve this parent-child relationship.
 
 {{% /notice %}}
 
-Module owners **MUST** create their `-module-owners-` team and as part of the provisioning process, they **MUST** request the addition of this team to its respective parent teams (see the table below for details).
+Module owners **MUST** create their `-module-owners-` team and as part of the provisioning process, they **MUST** request the addition of this team to its respective parent team (see the table below for details).
 
 | GitHub Team Name                                     | Description                                    | Permissions | Permissions granted through                                        | Where to work?          |
 |------------------------------------------------------|------------------------------------------------|-------------|--------------------------------------------------------------------|-------------------------|
@@ -106,7 +103,7 @@ Fill in the values as follows:
 - **Team notifications**: `Enabled`
 {{% /notice %}}
 
-### CODEOWNERS file
+#### CODEOWNERS file
 
 As part of the "initial Pull Request" (that publishes the first version of the module), module owners **MUST** add an entry to the `CODEOWNERS` file in the BRM repository ([here](https://github.com/Azure/bicep-registry-modules/blob/main/.github/CODEOWNERS)).
 
@@ -124,23 +121,10 @@ Example - `CODEOWNERS` entry for the Bicep resource module of Azure Virtual Netw
 
 - `/avm/res/network/virtual-network/ @Azure/avm-res-network-virtualnetwork-module-owners-bicep @Azure/avm-module-reviewers-bicep`
 
-### Grant Permissions - Terraform
-
-Module owners **MUST** assign the `-module-owners-`and `-module-contributors-` teams the necessary permissions on their Terraform module repository per the guidance below.
+### Terraform
 
-| GitHub Team Name                       | Description                                       | Permissions | Permissions granted through | Where to work?                                                                                |
-|----------------------------------------|---------------------------------------------------|-------------|-----------------------------|-----------------------------------------------------------------------------------------------|
-| `<module name>-module-owners-tf`       | AVM Terraform Module Owners - \<module name>       | **Admin**   | Direct assignment to repo   | Module owner can decide whether they want to work in a branch local to the repo or in a fork. |
-| `<module name>-module-contributors-tf` | AVM Terraform Module Contributors - \<module name> | **Write**   | Direct assignment to repo   | Need to work in a fork.                                                                       |
-
-{{% notice style="tip" %}}
-Direct link to create a new GitHub team: [Create new team](https://github.com/orgs/Azure/new-team)
-
-Fill in the values as follows:
-
-- **Team name**: Following the naming convention described above, use the value defined in the module indexes.
-- **Description**: Follow the guidance above (see the Description column in the table above).
-- **Parent team**: Do not assign the team to any parent team.
-- **Team visibility**: `Visible`
-- **Team notifications**: `Enabled`
+{{% notice style="note" %}}
+Access management for Terraform repositories has been changed to...
 {{% /notice %}}
+
+Permissions in case of Terraform repositories are granted through...