Merge branch 'main' into fix-org-teams-parent

nickfloyd · web-flow · commit 10b2d6a0b53d · 2025-10-21T13:25:17.000-05:00
diff --git a/github/resource_github_branch_protection_v3.go b/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"},
 						},
 					},
 				},
diff --git a/github/resource_github_organization_project.go b/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,
diff --git a/github/resource_github_organization_project_test.go b/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)
 		}
diff --git a/github/resource_github_project_card.go b/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
-
 }
diff --git a/github/resource_github_project_card_test.go b/github/resource_github_project_card_test.go
@@ -2,19 +2,20 @@ package github
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"testing"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccGithubProjectCard(t *testing.T) {
+	t.Skip("Skipping test as the GitHub REST API no longer supports classic projects")
 
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 
 	t.Run("creates a project card using a note", func(t *testing.T) {
-
 		config := fmt.Sprintf(`
 
 			resource "github_organization_project" "project" {
@@ -64,11 +65,9 @@ func TestAccGithubProjectCard(t *testing.T) {
 		t.Run("with an organization account", func(t *testing.T) {
 			testCase(t, organization)
 		})
-
 	})
 
 	t.Run("creates a project card using an issue", func(t *testing.T) {
-
 		config := fmt.Sprintf(`
 
 			resource "github_repository" "test" {
@@ -97,7 +96,7 @@ func TestAccGithubProjectCard(t *testing.T) {
 			resource "github_project_card" "test" {
 				column_id    = github_project_column.test.column_id
 				content_id   = github_issue.test.issue_id
-				content_type = "Issue" 
+				content_type = "Issue"
 			}
 
 		`, randomID)
@@ -141,6 +140,5 @@ func TestAccGithubProjectCard(t *testing.T) {
 		t.Run("with an organization account", func(t *testing.T) {
 			testCase(t, organization)
 		})
-
 	})
 }
diff --git a/github/resource_github_project_column.go b/github/resource_github_project_column.go
@@ -13,6 +13,8 @@ import (
 
 func resourceGithubProjectColumn() *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: resourceGithubProjectColumnCreate,
 		Read:   resourceGithubProjectColumnRead,
 		Update: resourceGithubProjectColumnUpdate,
diff --git a/github/resource_github_project_column_test.go b/github/resource_github_project_column_test.go
@@ -12,6 +12,8 @@ import (
 )
 
 func TestAccGithubProjectColumn_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())
 	}
@@ -107,7 +109,6 @@ type testAccGithubProjectColumnExpectedAttributes struct {
 
 func testAccCheckGithubProjectColumnAttributes(column *github.ProjectColumn, want *testAccGithubProjectColumnExpectedAttributes) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-
 		if name := column.GetName(); name != want.Name {
 			return fmt.Errorf("got project column %q; want %q", name, want.Name)
 		}
diff --git a/github/resource_github_repository.go b/github/resource_github_repository.go
@@ -320,6 +320,7 @@ func resourceGithubRepository() *schema.Resource {
 			"vulnerability_alerts": {
 				Type:        schema.TypeBool,
 				Optional:    true,
+				Computed:    true,
 				Description: "Set to 'true' to enable security alerts for vulnerable dependencies. Enabling requires alerts to be enabled on the owner level. (Note for importing: GitHub enables the alerts on public repos but disables them on private repos by default). Note that vulnerability alerts have not been successfully tested on any GitHub Enterprise instance and may be unavailable in those settings.",
 			},
 			"ignore_vulnerability_alerts_during_read": {
@@ -412,7 +413,6 @@ func resourceGithubRepository() *schema.Resource {
 }
 
 func calculateVisibility(d *schema.ResourceData) string {
-
 	if value, ok := d.GetOk("visibility"); ok {
 		return value.(string)
 	}
@@ -619,6 +619,11 @@ func resourceGithubRepositoryCreate(d *schema.ResourceData, meta interface{}) er
 		}
 	}
 
+	err := updateVulnerabilityAlerts(d, client, ctx, owner, repoName)
+	if err != nil {
+		return err
+	}
+
 	return resourceGithubRepositoryUpdate(d, meta)
 }
 
@@ -817,12 +822,7 @@ func resourceGithubRepositoryUpdate(d *schema.ResourceData, meta interface{}) er
 	}
 
 	if d.HasChange("vulnerability_alerts") {
-		updateVulnerabilityAlerts := client.Repositories.DisableVulnerabilityAlerts
-		if vulnerabilityAlerts, ok := d.GetOk("vulnerability_alerts"); ok && vulnerabilityAlerts.(bool) {
-			updateVulnerabilityAlerts = client.Repositories.EnableVulnerabilityAlerts
-		}
-
-		_, err = updateVulnerabilityAlerts(ctx, owner, repoName)
+		err = updateVulnerabilityAlerts(d, client, ctx, owner, repoName)
 		if err != nil {
 			return err
 		}
@@ -957,13 +957,19 @@ func flattenPages(pages *github.Pages) []interface{} {
 		return []interface{}{}
 	}
 
-	sourceMap := make(map[string]interface{})
-	sourceMap["branch"] = pages.GetSource().GetBranch()
-	sourceMap["path"] = pages.GetSource().GetPath()
-
 	pagesMap := make(map[string]interface{})
-	pagesMap["source"] = []interface{}{sourceMap}
-	pagesMap["build_type"] = pages.GetBuildType()
+	buildType := pages.GetBuildType()
+	pagesMap["build_type"] = buildType
+
+	if buildType == "legacy" {
+		sourceMap := make(map[string]interface{})
+		sourceMap["branch"] = pages.GetSource().GetBranch()
+		sourceMap["path"] = pages.GetSource().GetPath()
+		pagesMap["source"] = []interface{}{sourceMap}
+	} else {
+		pagesMap["source"] = nil
+	}
+
 	pagesMap["url"] = pages.GetURL()
 	pagesMap["status"] = pages.GetStatus()
 	pagesMap["cname"] = pages.GetCNAME()
@@ -1038,7 +1044,8 @@ func flattenSecurityAndAnalysis(securityAndAnalysis *github.SecurityAndAnalysis)
 // resourceGithubParseFullName will return "myorg", "myrepo", true when full_name is "myorg/myrepo".
 func resourceGithubParseFullName(resourceDataLike interface {
 	GetOk(string) (interface{}, bool)
-}) (string, string, bool) {
+},
+) (string, string, bool) {
 	x, ok := resourceDataLike.GetOk("full_name")
 	if !ok {
 		return "", "", false
@@ -1062,3 +1069,13 @@ func customDiffFunction(_ context.Context, diff *schema.ResourceDiff, v interfac
 	}
 	return nil
 }
+
+func updateVulnerabilityAlerts(d *schema.ResourceData, client *github.Client, ctx context.Context, owner, repoName string) error {
+	updateVulnerabilityAlerts := client.Repositories.DisableVulnerabilityAlerts
+	if vulnerabilityAlerts, ok := d.GetOk("vulnerability_alerts"); ok && vulnerabilityAlerts.(bool) {
+		updateVulnerabilityAlerts = client.Repositories.EnableVulnerabilityAlerts
+	}
+
+	_, err := updateVulnerabilityAlerts(ctx, owner, repoName)
+	return err
+}
diff --git a/github/resource_github_repository_project.go b/github/resource_github_repository_project.go
@@ -14,6 +14,8 @@ import (
 
 func resourceGithubRepositoryProject() *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: resourceGithubRepositoryProjectCreate,
 		Read:   resourceGithubRepositoryProjectRead,
 		Update: resourceGithubRepositoryProjectUpdate,
diff --git a/github/resource_github_repository_project_test.go b/github/resource_github_repository_project_test.go
@@ -10,11 +10,11 @@ import (
 )
 
 func TestAccGithubRepositoryProject(t *testing.T) {
+	t.Skip("Skipping test as the GitHub REST API no longer supports classic projects")
 
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 
 	t.Run("creates a repository project", func(t *testing.T) {
-
 		config := fmt.Sprintf(`
 
 			resource "github_repository" "test" {
@@ -60,6 +60,5 @@ func TestAccGithubRepositoryProject(t *testing.T) {
 		t.Run("with an organization account", func(t *testing.T) {
 			testCase(t, organization)
 		})
-
 	})
 }
diff --git a/website/docs/r/organization_project.html.markdown b/website/docs/r/organization_project.html.markdown
@@ -7,6 +7,8 @@ description: |-
 
 # github_organization_project
 
+!> **Warning:** This resource no longer works as the [Projects (classic) REST API](https://docs.github.com/en/rest/projects/projects?apiVersion=2022-11-28) has been [removed](https://github.blog/changelog/2024-05-23-sunset-notice-projects-classic/) and as such has been deprecated. It will be removed in a future release.
+
 This resource allows you to create and manage projects for GitHub organization.
 
 ## Example Usage
diff --git a/website/docs/r/project_card.html.markdown b/website/docs/r/project_card.html.markdown
@@ -7,6 +7,8 @@ description: |-
 
 # github_project_card
 
+!> **Warning:** This resource no longer works as the [Projects (classic) REST API](https://docs.github.com/en/rest/projects/projects?apiVersion=2022-11-28) has been [removed](https://github.blog/changelog/2024-05-23-sunset-notice-projects-classic/) and as such has been deprecated. It will be removed in a future release.
+
 This resource allows you to create and manage cards for GitHub projects.
 
 ## Example Usage
@@ -68,11 +70,11 @@ The following arguments are supported:
 
 * `note` - (Optional) The note contents of the card. Markdown supported.
 
-* `content_id` - (Optional) [`github_issue.issue_id`](issue.html#argument-reference). 
+* `content_id` - (Optional) [`github_issue.issue_id`](issue.html#argument-reference).
 
 * `content_type` - (Optional) Must be either `Issue` or `PullRequest`
 
-**Remarks:** You must either set the `note` attribute or both `content_id` and `content_type`. 
+**Remarks:** You must either set the `note` attribute or both `content_id` and `content_type`.
 See [note example](#example-usage) or [issue example](#example-usage-adding-an-issue-to-a-project) for more information.
 
 ## Import
diff --git a/website/docs/r/project_column.html.markdown b/website/docs/r/project_column.html.markdown
@@ -7,6 +7,8 @@ description: |-
 
 # github_project_column
 
+!> **Warning:** This resource no longer works as the [Projects (classic) REST API](https://docs.github.com/en/rest/projects/projects?apiVersion=2022-11-28) has been [removed](https://github.blog/changelog/2024-05-23-sunset-notice-projects-classic/) and as such has been deprecated. It will be removed in a future release.
+
 This resource allows you to create and manage columns for GitHub projects.
 
 ## Example Usage
diff --git a/website/docs/r/repository_project.html.markdown b/website/docs/r/repository_project.html.markdown
@@ -7,6 +7,8 @@ description: |-
 
 # github_repository_project
 
+!> **Warning:** This resource no longer works as the [Projects (classic) REST API](https://docs.github.com/en/rest/projects/projects?apiVersion=2022-11-28) has been [removed](https://github.blog/changelog/2024-05-23-sunset-notice-projects-classic/) and as such has been deprecated. It will be removed in a future release.
+
 This resource allows you to create and manage projects for GitHub repository.
 
 ## Example Usage

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestAccGithubOrganizationProject_basic(t *testing.T) {`
	`16`	`+ t.Skip("Skipping test as the GitHub REST API no longer supports classic projects")`
	`17`	`+`
`16`	`18`	`if err := testAccCheckOrganization(); err != nil {`
`17`	`19`	`t.Skipf("Skipping because %s.", err.Error())`
`18`	`20`	`}`
`@@ -102,7 +104,6 @@ type testAccGithubOrganizationProjectExpectedAttributes struct {`
`102`	`104`
`103`	`105`	`func testAccCheckGithubOrganizationProjectAttributes(project github.Project, want testAccGithubOrganizationProjectExpectedAttributes) resource.TestCheckFunc {`
`104`	`106`	`return func(s *terraform.State) error {`
`105`		`-`
`106`	`107`	`if name := project.GetName(); name != want.Name {`
`107`	`108`	`return fmt.Errorf("got project %q; want %q", name, want.Name)`
`108`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ import (`
`14`	`14`
`15`	`15`	`func resourceGithubProjectCard() *schema.Resource {`
`16`	`16`	`return &schema.Resource{`
	`17`	`+ 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.",`
	`18`	`+`
`17`	`19`	`Create: resourceGithubProjectCardCreate,`
`18`	`20`	`Read: resourceGithubProjectCardRead,`
`19`	`21`	`Update: resourceGithubProjectCardUpdate,`
`@@ -184,7 +186,6 @@ func resourceGithubProjectCardDelete(d *schema.ResourceData, meta interface{}) e`
`184`	`186`	`}`
`185`	`187`
`186`	`188`	`func resourceGithubProjectCardImport(d schema.ResourceData, meta interface{}) ([]schema.ResourceData, error) {`
`187`		`-`
`188`	`189`	`cardIDStr := d.Id()`
`189`	`190`	`cardID, err := strconv.ParseInt(cardIDStr, 10, 64)`
`190`	`191`	`if err != nil {`
`@@ -205,5 +206,4 @@ func resourceGithubProjectCardImport(d *schema.ResourceData, meta interface{}) (`
`205`	`206`	`}`
`206`	`207`
`207`	`208`	`return []*schema.ResourceData{d}, nil`
`208`		`-`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func TestAccGithubProjectColumn_basic(t *testing.T) {`
	`15`	`+ t.Skip("Skipping test as the GitHub REST API no longer supports classic projects")`
	`16`	`+`
`15`	`17`	`if err := testAccCheckOrganization(); err != nil {`
`16`	`18`	`t.Skipf("Skipping because %s.", err.Error())`
`17`	`19`	`}`
`@@ -107,7 +109,6 @@ type testAccGithubProjectColumnExpectedAttributes struct {`
`107`	`109`
`108`	`110`	`func testAccCheckGithubProjectColumnAttributes(column github.ProjectColumn, want testAccGithubProjectColumnExpectedAttributes) resource.TestCheckFunc {`
`109`	`111`	`return func(s *terraform.State) error {`
`110`		`-`
`111`	`112`	`if name := column.GetName(); name != want.Name {`
`112`	`113`	`return fmt.Errorf("got project column %q; want %q", name, want.Name)`
`113`	`114`	`}`