From 18abb0f3c7400ff0f11e67ddd87aaf298756b8b2 Mon Sep 17 00:00:00 2001
From: tnm <t@ted.io>
Date: Thu, 4 Sep 2025 02:33:50 -0700
Subject: [PATCH] fix(#777): Enable GitHub Pages on existing repositories

Fixed issue where adding pages configuration to an existing repository
would fail with 404 error. The provider now correctly detects when pages
are not enabled using repo.GetHasPages() and uses EnablePages (POST)
instead of UpdatePages (PUT).

- Use repo.GetHasPages() to check if pages are enabled
- Call EnablePages for repos without pages, UpdatePages for repos with pages
- Added comprehensive test for enabling pages on existing repositories

Fixes #777
---
 github/resource_github_repository.go          |  10 +-
 .../resource_github_repository_pages_test.go  | 122 ++++++++++++++++++
 2 files changed, 126 insertions(+), 6 deletions(-)
 create mode 100644 github/resource_github_repository_pages_test.go

diff --git a/github/resource_github_repository.go b/github/resource_github_repository.go
index 00b6444c1..33dac0ea4 100644
--- a/github/resource_github_repository.go
+++ b/github/resource_github_repository.go
@@ -778,14 +778,12 @@ func resourceGithubRepositoryUpdate(d *schema.ResourceData, meta interface{}) er
 	if d.HasChange("pages") && !d.IsNewResource() {
 		opts := expandPagesUpdate(d.Get("pages").([]interface{}))
 		if opts != nil {
-			pages, res, err := client.Repositories.GetPagesInfo(ctx, owner, repoName)
-			if res.StatusCode != http.StatusNotFound && err != nil {
-				return err
-			}
-
-			if pages == nil {
+			// First check if pages are enabled on the repository
+			if !repo.GetHasPages() {
+				// Pages not enabled yet, so enable them
 				_, _, err = client.Repositories.EnablePages(ctx, owner, repoName, &github.Pages{Source: opts.Source, BuildType: opts.BuildType})
 			} else {
+				// Pages already enabled, update them
 				_, err = client.Repositories.UpdatePages(ctx, owner, repoName, opts)
 			}
 			if err != nil {
diff --git a/github/resource_github_repository_pages_test.go b/github/resource_github_repository_pages_test.go
new file mode 100644
index 000000000..834288ace
--- /dev/null
+++ b/github/resource_github_repository_pages_test.go
@@ -0,0 +1,122 @@
+package github
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccGithubRepositoryPages_EnableOnExisting(t *testing.T) {
+	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
+
+	t.Run("adds pages to an existing repository", func(t *testing.T) {
+		// Step 1: Create repo without pages
+		configWithoutPages := fmt.Sprintf(`
+			resource "github_repository" "test" {
+				name         = "tf-acc-pages-%s"
+				auto_init    = true
+				visibility   = "public"
+			}
+		`, randomID)
+
+		// Step 2: Add pages to existing repo
+		configWithPages := fmt.Sprintf(`
+			resource "github_repository" "test" {
+				name         = "tf-acc-pages-%s"
+				auto_init    = true
+				visibility   = "public"
+				pages {
+					source {
+						branch = "main"
+					}
+				}
+			}
+		`, randomID)
+
+		// Step 3: Update pages configuration
+		configWithUpdatedPages := fmt.Sprintf(`
+			resource "github_repository" "test" {
+				name         = "tf-acc-pages-%s"
+				auto_init    = true  
+				visibility   = "public"
+				pages {
+					source {
+						branch = "main"
+						path   = "/docs"
+					}
+				}
+			}
+		`, randomID)
+
+		// Step 4: Remove pages
+		configWithoutPagesAgain := fmt.Sprintf(`
+			resource "github_repository" "test" {
+				name         = "tf-acc-pages-%s"
+				auto_init    = true
+				visibility   = "public"
+			}
+		`, randomID)
+
+		testCase := func(t *testing.T, mode string) {
+			resource.Test(t, resource.TestCase{
+				PreCheck:  func() { skipUnlessMode(t, mode) },
+				Providers: testAccProviders,
+				Steps: []resource.TestStep{
+					{
+						Config: configWithoutPages,
+						Check: resource.ComposeTestCheckFunc(
+							resource.TestCheckResourceAttr(
+								"github_repository.test", "name",
+								fmt.Sprintf("tf-acc-pages-%s", randomID),
+							),
+						),
+					},
+					{
+						Config: configWithPages,
+						Check: resource.ComposeTestCheckFunc(
+							resource.TestCheckResourceAttr(
+								"github_repository.test", "pages.0.source.0.branch",
+								"main",
+							),
+							resource.TestCheckResourceAttr(
+								"github_repository.test", "pages.0.source.0.path",
+								"/",
+							),
+						),
+					},
+					{
+						Config: configWithUpdatedPages,
+						Check: resource.ComposeTestCheckFunc(
+							resource.TestCheckResourceAttr(
+								"github_repository.test", "pages.0.source.0.branch",
+								"main",
+							),
+							resource.TestCheckResourceAttr(
+								"github_repository.test", "pages.0.source.0.path",
+								"/docs",
+							),
+						),
+					},
+					{
+						Config: configWithoutPagesAgain,
+						Check: resource.ComposeTestCheckFunc(
+							resource.TestCheckNoResourceAttr(
+								"github_repository.test", "pages.0.source.0.branch",
+							),
+						),
+					},
+				},
+			})
+		}
+
+		t.Run("with an individual account", func(t *testing.T) {
+			testCase(t, individual)
+		})
+
+		t.Run("with an organization account", func(t *testing.T) {
+			testCase(t, organization)
+		})
+	})
+}
\ No newline at end of file