fix: find correct permission

github/data_source_github_collaborators.go

@@ -179,7 +179,7 @@ func flattenGitHubCollaborators(collaborators []*github.User) ([]interface{}, er
 		result["received_events_url"] = c.GetReceivedEventsURL()
 		result["type"] = c.GetType()
 		result["site_admin"] = c.GetSiteAdmin()
-		result["permission"] = c.GetRoleName()
+		result["permission"] = getInvitationPermission(c.GetRoleName())
 		results = append(results, result)
 	}
 

github/data_source_github_repository.go

@@ -28,6 +28,11 @@ func dataSourceGithubRepository() *schema.Resource {
 				Computed:      true,
 				ConflictsWith: []string{"full_name"},
 			},
+			"only_protected_branches": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
 
 			"description": {
 				Type:     schema.TypeString,
@@ -242,7 +247,12 @@ func dataSourceGithubRepositoryRead(d *schema.ResourceData, meta interface{}) er
 	d.Set("repo_id", repo.GetID())
 	d.Set("has_projects", repo.GetHasProjects())
 
-	branches, _, err := client.Repositories.ListBranches(context.TODO(), owner, repoName, nil)
+	onlyProtectedBranches := d.Get("only_protected_branches").(bool)
+	listBranchOptions := &github.BranchListOptions{
+		Protected: &onlyProtectedBranches,
+	}
+
+	branches, _, err := client.Repositories.ListBranches(context.TODO(), owner, repoName, listBranchOptions)
 	if err != nil {
 		return err
 	}

github/resource_github_repository_collaborator.go

@@ -35,10 +35,11 @@ func resourceGithubRepositoryCollaborator() *schema.Resource {
 				ForceNew: true,
 			},
 			"permission": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-				Default:  "push",
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				Default:      "push",
+				ValidateFunc: validateValueFunc([]string{"pull", "triage", "push", "maintain", "admin"}),
 				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
 					if d.Get("permission_diff_suppression").(bool) {
 						if new == "triage" || new == "maintain" {
@@ -114,7 +115,7 @@ func resourceGithubRepositoryCollaboratorRead(d *schema.ResourceData, meta inter
 	if invitation != nil {
 		username = invitation.GetInvitee().GetLogin()
 
-		permissionName, err := getInvitationPermission(invitation)
+		permissionName := getInvitationPermission(invitation.GetPermissions())
 		if err != nil {
 			return err
 		}
@@ -142,7 +143,7 @@ func resourceGithubRepositoryCollaboratorRead(d *schema.ResourceData, meta inter
 			if strings.EqualFold(c.GetLogin(), username) {
 				d.Set("repository", repoName)
 				d.Set("username", c.GetLogin())
-				d.Set("permission", c.GetRoleName())
+				d.Set("permission", getInvitationPermission(c.GetRoleName()))
 				return nil
 			}
 		}

github/resource_github_team_repository.go

@@ -131,7 +131,7 @@ func resourceGithubTeamRepositoryRead(d *schema.ResourceData, meta interface{})
 		d.Set("team_id", teamIdString)
 	}
 	d.Set("repository", repo.GetName())
-	d.Set("permission", repo.GetRoleName())
+	d.Set("permission", getInvitationPermission(repo.GetRoleName()))
 
 	return nil
 }

github/util_permissions.go

@@ -1,37 +1,20 @@
 package github
 
-import (
-	"fmt"
-
-	"github.com/google/go-github/v45/github"
-)
-
 const (
-	pullPermission     string = "pull"
-	triagePermission   string = "triage"
-	pushPermission     string = "push"
-	maintainPermission string = "maintain"
-	adminPermission    string = "admin"
-	writePermission    string = "write"
-	readPermission     string = "read"
+	pullPermission  string = "pull"
+	pushPermission  string = "push"
+	writePermission string = "write"
+	readPermission  string = "read"
 )
 
-func getInvitationPermission(i *github.RepositoryInvitation) (string, error) {
+func getInvitationPermission(permission string) string {
 	// Permissions for some GitHub API routes are expressed as "read",
 	// "write", and "admin"; in other places, they are expressed as "pull",
 	// "push", and "admin".
-	permissions := i.GetPermissions()
-	if permissions == readPermission {
-		return pullPermission, nil
-	} else if permissions == writePermission {
-		return pushPermission, nil
-	} else if permissions == adminPermission {
-		return adminPermission, nil
-	} else if *i.Permissions == maintainPermission {
-		return maintainPermission, nil
-	} else if *i.Permissions == triagePermission {
-		return triagePermission, nil
+	if permission == readPermission {
+		return pullPermission
+	} else if permission == writePermission {
+		return pushPermission
 	}
-
-	return "", fmt.Errorf("unexpected permission value: %v", permissions)
+	return permission
 }

website/docs/d/repository.html.markdown

@@ -25,6 +25,8 @@ The following arguments are supported:
 
 * `full_name` - (Optional) Full name of the repository (in `org/name` format).
 
+* `only_protected_branches` - (Optional). If true, the `branches` attributes will be populated only with protected branches. Default: `false`.
+
 ## Attributes Reference
 
 * `node_id` - the Node ID of the repository.

website/docs/r/repository_collaborator.html.markdown

@@ -44,7 +44,7 @@ The following arguments are supported:
 * `repository` - (Required) The GitHub repository
 * `username` - (Required) The user to add to the repository as a collaborator.
 * `permission` - (Optional) The permission of the outside collaborator for the repository.
-            Must be one of `pull`, `push`, `maintain`, `triage` or `admin` or the name of an existing [custom repository role](https://docs.github.com/en/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization) within the organization for organization-owned repositories.
+            Must be one of `pull`, `push`, `maintain`, `triage` or `admin` for organization-owned repositories.
             Must be `push` for personal repositories. Defaults to `push`.
 * `permission_diff_suppression` - (Optional) Suppress plan diffs for `triage` and `maintain`.  Defaults to `false`.
 
@@ -60,4 +60,4 @@ GitHub Repository Collaborators can be imported using an ID made up of `reposito
 
 ```
 $ terraform import github_repository_collaborator.collaborator terraform:someuser
-```
+```