Simplify import ID

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Author: deiga

github/data_source_github_repository_pages_test.go

@@ -29,7 +29,6 @@ func TestAccGithubRepositoryPagesDataSource(t *testing.T) {
 			}
 
 			resource "github_repository_pages" "test" {
-				owner      = "%s"
 				repository = github_repository.test.name
 				build_type = "legacy"
 				source {
@@ -39,12 +38,11 @@ func TestAccGithubRepositoryPagesDataSource(t *testing.T) {
 			}
 
 			data "github_repository_pages" "test" {
-				owner           = "%s"
 				repository = github_repository.test.name
 
 				depends_on = [github_repository_pages.test]
 			}
-		`, repoName, baseRepoVisibility, testAccConf.owner, testAccConf.owner)
+		`, repoName, baseRepoVisibility)
 
 		resource.Test(t, resource.TestCase{
 			PreCheck:          func() { skipUnauthenticated(t) },

github/resource_github_repository_pages.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 
 	"github.com/google/go-github/v82/github"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -276,9 +277,9 @@ func resourceGithubRepositoryPagesDelete(ctx context.Context, d *schema.Resource
 }
 
 func resourceGithubRepositoryPagesImport(ctx context.Context, d *schema.ResourceData, m any) ([]*schema.ResourceData, error) {
-	owner, repoName, err := parseID2(d.Id())
-	if err != nil {
-		return nil, fmt.Errorf("invalid ID specified: supplied ID must be written as <owner>:<repository>. Original error: %w", err)
+	repoName := d.Id()
+	if strings.Contains(repoName, " ") {
+		return nil, fmt.Errorf("invalid ID specified: supplied ID must be the slug of the repository name")
 	}
 	// if err := d.Set("owner", owner); err != nil { // TODO: Add owner support
 	// 	return nil, err
@@ -288,6 +289,7 @@ func resourceGithubRepositoryPagesImport(ctx context.Context, d *schema.Resource
 	}
 
 	meta := m.(*Owner)
+	owner := meta.name
 	client := meta.v3client
 
 	repo, _, err := client.Repositories.Get(ctx, owner, repoName)

github/resource_github_repository_pages_test.go

@@ -169,7 +169,7 @@ source {
 				{
 					ResourceName:  "github_repository_pages.test",
 					ImportState:   true,
-					ImportStateId: fmt.Sprintf("%s:%s", testAccConf.owner, repoName),
+					ImportStateId: repoName,
 				},
 			},
 		})

website/docs/r/repository_pages.html.markdown

@@ -128,8 +128,8 @@ In addition to the above arguments, the following attributes are exported:
 
 ## Import
 
-GitHub repository pages can be imported using the `owner:repository` format:
+GitHub repository pages can be imported using the `repository-slug`, e.g.
 
 ```sh
-terraform import github_repository_pages.example my-org:my-repo
+terraform import github_repository_pages.example my-repo
 ```