Merge branch 'main' into exempt-bypass

Author: nickfloyd

CONTRIBUTING.md

@@ -149,6 +149,9 @@ export GITHUB_OWNER=
 # enable testing of enterprise appliances
 export GITHUB_BASE_URL=
 
+# enable testing of GitHub Paid features, these normally also require an organization e.g. repository push rulesets
+export GITHUB_PAID_FEATURES=true
+
 # leverage helper accounts for tests requiring them
 # examples include:
 # - https://github.com/github-terraform-test-user

github/data_source_github_organization_teams.go

@@ -1,6 +1,10 @@
 package github
 
 import (
+	"context"
+	"strconv"
+
+	"github.com/google/go-github/v66/github"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/shurcooL/githubv4"
@@ -67,9 +71,18 @@ func dataSourceGithubOrganizationTeams() *schema.Resource {
 							Elem:     &schema.Schema{Type: schema.TypeString},
 						},
 						"parent": {
-							Type:     schema.TypeMap,
+							Deprecated: "Use parent_team_id and parent_team_slug instead.",
+							Type:       schema.TypeMap,
+							Computed:   true,
+							Elem:       &schema.Schema{Type: schema.TypeString},
+						},
+						"parent_team_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"parent_team_slug": {
+							Type:     schema.TypeString,
 							Computed: true,
-							Elem:     &schema.Schema{Type: schema.TypeString},
 						},
 					},
 				},
@@ -84,6 +97,7 @@ func dataSourceGithubOrganizationTeamsRead(d *schema.ResourceData, meta interfac
 		return err
 	}
 
+	clientv3 := meta.(*Owner).v3client
 	client := meta.(*Owner).v4client
 	orgName := meta.(*Owner).name
 	rootTeamsOnly := d.Get("root_teams_only").(bool)
@@ -107,7 +121,10 @@ func dataSourceGithubOrganizationTeamsRead(d *schema.ResourceData, meta interfac
 			return err
 		}
 
-		additionalTeams := flattenGitHubTeams(query)
+		additionalTeams, err := flattenGitHubTeams(clientv3, meta.(*Owner).StopContext, orgName, query)
+		if err != nil {
+			return err
+		}
 		teams = append(teams, additionalTeams...)
 
 		if !query.Organization.Teams.PageInfo.HasNextPage {
@@ -125,11 +142,11 @@ func dataSourceGithubOrganizationTeamsRead(d *schema.ResourceData, meta interfac
 	return nil
 }
 
-func flattenGitHubTeams(tq TeamsQuery) []interface{} {
+func flattenGitHubTeams(client *github.Client, ctx context.Context, org string, tq TeamsQuery) ([]interface{}, error) {
 	teams := tq.Organization.Teams.Nodes
 
 	if len(teams) == 0 {
-		return make([]interface{}, 0)
+		return make([]interface{}, 0), nil
 	}
 
 	flatTeams := make([]interface{}, len(teams))
@@ -152,6 +169,18 @@ func flattenGitHubTeams(tq TeamsQuery) []interface{} {
 
 		t["members"] = flatMembers
 
+		var parentTeamId string
+		if len(team.Parent.Slug) != 0 {
+			parentTeam, _, err := client.Teams.GetTeamBySlug(ctx, org, string(team.Parent.Slug))
+			if err != nil {
+				return nil, err
+			}
+			parentTeamId = strconv.FormatInt(parentTeam.GetID(), 10)
+		}
+
+		t["parent_team_id"] = parentTeamId
+		t["parent_team_slug"] = team.Parent.Slug
+
 		parentTeam := make(map[string]interface{})
 		parentTeam["id"] = team.Parent.ID
 		parentTeam["slug"] = team.Parent.Slug
@@ -171,5 +200,5 @@ func flattenGitHubTeams(tq TeamsQuery) []interface{} {
 		flatTeams[i] = t
 	}
 
-	return flatTeams
+	return flatTeams, nil
 }

github/data_source_github_team.go

@@ -43,9 +43,10 @@ func dataSourceGithubTeam() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 			"repositories": {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
+				Deprecated: "Use repositories_detailed instead.",
+				Type:       schema.TypeList,
+				Computed:   true,
+				Elem:       &schema.Schema{Type: schema.TypeString},
 			},
 			"repositories_detailed": {
 				Type:     schema.TypeList,
@@ -56,6 +57,10 @@ func dataSourceGithubTeam() *schema.Resource {
 							Type:     schema.TypeInt,
 							Computed: true,
 						},
+						"repo_name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 						"role_name": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -168,7 +173,7 @@ func dataSourceGithubTeamRead(d *schema.ResourceData, meta interface{}) error {
 			}
 		}
 
-		repositories_detailed = make([]interface{}, 0, resultsPerPage) //removed this from the loop
+		repositories_detailed = make([]interface{}, 0, resultsPerPage) // removed this from the loop
 
 		for {
 			repository, resp, err := client.Teams.ListTeamReposByID(ctx, orgId, team.GetID(), &options.ListOptions)
@@ -180,6 +185,7 @@ func dataSourceGithubTeamRead(d *schema.ResourceData, meta interface{}) error {
 				repositories = append(repositories, v.GetName())
 				repositories_detailed = append(repositories_detailed, map[string]interface{}{
 					"repo_id":   v.GetID(),
+					"repo_name": v.GetName(),
 					"role_name": v.GetRoleName(),
 				})
 			}

github/provider_utils.go

@@ -9,6 +9,7 @@ import (
 
 var testCollaborator = os.Getenv("GITHUB_TEST_COLLABORATOR")
 var isEnterprise = os.Getenv("ENTERPRISE_ACCOUNT")
+var isPaidPlan = os.Getenv("GITHUB_PAID_FEATURES")
 var testEnterprise = os.Getenv("ENTERPRISE_SLUG")
 var testOrganization = testOrganizationFunc()
 var testOwner = os.Getenv("GITHUB_OWNER")

github/resource_github_branch_protection_v3.go

@@ -59,6 +59,7 @@ func resourceGithubBranchProtectionV3() *schema.Resource {
 						"contexts": {
 							Type:       schema.TypeSet,
 							Optional:   true,
+							Computed:   true,
 							Deprecated: "GitHub is deprecating the use of `contexts`. Use a `checks` array instead.",
 							Elem: &schema.Schema{
 								Type: schema.TypeString,
@@ -67,10 +68,12 @@ func resourceGithubBranchProtectionV3() *schema.Resource {
 						"checks": {
 							Type:        schema.TypeSet,
 							Optional:    true,
+							Computed:    true,
 							Description: "The list of status checks to require in order to merge into this branch. No status checks are required by default. Checks should be strings containing the 'context' and 'app_id' like so 'context:app_id'",
 							Elem: &schema.Schema{
 								Type: schema.TypeString,
 							},
+							ConflictsWith: []string{"required_status_checks.0.contexts"},
 						},
 					},
 				},

github/resource_github_organization_project.go

@@ -13,6 +13,8 @@ import (
 
 func resourceGithubOrganizationProject() *schema.Resource {
 	return &schema.Resource{
+		DeprecationMessage: "This resource is deprecated as the API endpoints for classic projects have been removed. This resource no longer works and will be removed in a future version.",
+
 		Create: resourceGithubOrganizationProjectCreate,
 		Read:   resourceGithubOrganizationProjectRead,
 		Update: resourceGithubOrganizationProjectUpdate,

github/resource_github_organization_project_test.go

@@ -13,6 +13,8 @@ import (
 )
 
 func TestAccGithubOrganizationProject_basic(t *testing.T) {
+	t.Skip("Skipping test as the GitHub REST API no longer supports classic projects")
+
 	if err := testAccCheckOrganization(); err != nil {
 		t.Skipf("Skipping because %s.", err.Error())
 	}
@@ -102,7 +104,6 @@ type testAccGithubOrganizationProjectExpectedAttributes struct {
 
 func testAccCheckGithubOrganizationProjectAttributes(project *github.Project, want *testAccGithubOrganizationProjectExpectedAttributes) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-
 		if name := project.GetName(); name != want.Name {
 			return fmt.Errorf("got project %q; want %q", name, want.Name)
 		}

github/resource_github_organization_ruleset.go

@@ -261,6 +261,12 @@ func resourceGithubOrganizationRuleset() *schema.Resource {
 										Optional:    true,
 										Description: "Whether pull requests targeting a matching branch must be tested with the latest code. This setting will not take effect unless at least one status check is enabled. Defaults to `false`.",
 									},
+									"do_not_enforce_on_create": {
+										Type:        schema.TypeBool,
+										Optional:    true,
+										Description: "Allow repositories and branches to be created if a check would otherwise prohibit it.",
+										Default:     false,
+									},
 								},
 							},
 						},

github/resource_github_organization_ruleset_test.go

@@ -60,6 +60,7 @@ func TestGithubOrganizationRulesets(t *testing.T) {
 						}
 
 						strict_required_status_checks_policy = true
+						do_not_enforce_on_create             = true
 					}
 
 					required_workflows {
@@ -251,6 +252,7 @@ func TestGithubOrganizationRulesets(t *testing.T) {
 						}
 
 						strict_required_status_checks_policy = true
+						do_not_enforce_on_create             = true
 					}
 
 					branch_name_pattern {

github/resource_github_project_card.go

@@ -14,6 +14,8 @@ import (
 
 func resourceGithubProjectCard() *schema.Resource {
 	return &schema.Resource{
+		DeprecationMessage: "This resource is deprecated as the API endpoints for classic projects have been removed. This resource no longer works and will be removed in a future version.",
+
 		Create: resourceGithubProjectCardCreate,
 		Read:   resourceGithubProjectCardRead,
 		Update: resourceGithubProjectCardUpdate,
@@ -184,7 +186,6 @@ func resourceGithubProjectCardDelete(d *schema.ResourceData, meta interface{}) e
 }
 
 func resourceGithubProjectCardImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
-
 	cardIDStr := d.Id()
 	cardID, err := strconv.ParseInt(cardIDStr, 10, 64)
 	if err != nil {
@@ -205,5 +206,4 @@ func resourceGithubProjectCardImport(d *schema.ResourceData, meta interface{}) (
 	}
 
 	return []*schema.ResourceData{d}, nil
-
 }