feat: make repository attribute compatible with GitHub provider format (#11)

* feat: make repository attribute compatible with GitHub provider format

Change repository attribute from 'owner/repo' format to 'repo-name' format
to match GitHub official provider conventions. Owner is now configured at
the provider level via 'owner' attribute or GITHUB_OWNER environment variable.

This breaking change improves consistency with the official GitHub provider
and simplifies resource configuration.

💖 Generated with Crush
Co-Authored-By: Crush <[email protected]>

* fmt

---------

Co-authored-by: Crush <[email protected]>

Author: yumafuu

internal/githubclient/client.go

@@ -19,27 +19,28 @@ import (
 
 type Client struct {
 	*github.Client
+	Owner string
 }
 
-func NewClient(token, baseURL string) *Client {
+func NewClient(token, baseURL, owner string) *Client {
 	var tc *http.Client
 	if token != "" {
 		tc = github.NewClient(nil).WithAuthToken(token).Client()
 	}
 
 	client, _ := github.NewClient(tc).WithEnterpriseURLs(baseURL, baseURL)
-	return &Client{client}
+	return &Client{client, owner}
 }
 
-func NewClientWithApp(appID, installationID, pemFile, baseURL string) *Client {
+func NewClientWithApp(appID, installationID, pemFile, baseURL, owner string) *Client {
 	token, err := GenerateOAuthTokenFromApp(baseURL, appID, installationID, pemFile)
 	if err != nil {
 		return nil
 	}
 
 	tc := github.NewClient(nil).WithAuthToken(token).Client()
 	client, _ := github.NewClient(tc).WithEnterpriseURLs(baseURL, baseURL)
-	return &Client{client}
+	return &Client{client, owner}
 }
 
 func GenerateOAuthTokenFromApp(baseURL, appID, appInstallationID, pemData string) (string, error) {

internal/provider/provider.go

@@ -95,6 +95,18 @@ func (p *kwgithubProvider) Configure(ctx context.Context, req provider.Configure
 		baseURL = envBaseURL
 	}
 
+	owner := ""
+	if !config.Owner.IsNull() && !config.Owner.IsUnknown() {
+		owner = config.Owner.ValueString()
+	} else if envOwner := os.Getenv("GITHUB_OWNER"); envOwner != "" {
+		owner = envOwner
+	}
+
+	if owner == "" {
+		resp.Diagnostics.AddError("Missing owner", "owner must be configured either in provider configuration or via GITHUB_OWNER environment variable")
+		return
+	}
+
 	var token string
 	var client *githubclient.Client
 
@@ -131,7 +143,7 @@ func (p *kwgithubProvider) Configure(ctx context.Context, req provider.Configure
 		}
 
 		pemFile = strings.Replace(pemFile, `\n`, "\n", -1)
-		client = githubclient.NewClientWithApp(appID, installationID, pemFile, baseURL)
+		client = githubclient.NewClientWithApp(appID, installationID, pemFile, baseURL, owner)
 		if client == nil {
 			resp.Diagnostics.AddError(
 				"Failed to create GitHub App client",
@@ -150,7 +162,7 @@ func (p *kwgithubProvider) Configure(ctx context.Context, req provider.Configure
 			resp.Diagnostics.AddError("Missing authentication", "Either token or app_auth must be configured")
 			return
 		}
-		client = githubclient.NewClient(token, baseURL)
+		client = githubclient.NewClient(token, baseURL, owner)
 	}
 
 	resp.ResourceData = client

internal/provider/resource_ruleset_merge_methods.go

@@ -49,7 +49,7 @@ func (r *rulesetAllowedMergeMethodsResource) Schema(
 		Attributes: map[string]schema.Attribute{
 			"repository": schema.StringAttribute{
 				Required:    true,
-				Description: "The name of the repository (e.g., 'owner/repo').",
+				Description: "The name of the repository (e.g., 'repo-name').",
 			},
 			"ruleset_id": schema.StringAttribute{
 				Required:    true,
@@ -121,11 +121,8 @@ func (r *rulesetAllowedMergeMethodsResource) Read(
 		return
 	}
 
-	owner, repo, err := parseRepo(state.Repository.ValueString())
-	if err != nil {
-		resp.Diagnostics.AddError("Invalid repository format", err.Error())
-		return
-	}
+	owner := r.client.Owner
+	repo := state.Repository.ValueString()
 
 	rulesetID, err := parseID(state.RulesetID.ValueString())
 	if err != nil {
@@ -150,7 +147,7 @@ func (r *rulesetAllowedMergeMethodsResource) Read(
 	expectedMethods := extractMethodsFromSet(state.AllowedMergeMethods)
 	if !methodsEqual(currentMethods, expectedMethods) {
 		// Methods have been reset by GitHub, restore them
-		err = r.restoreMergeMethods(ctx, owner, repo, rulesetID, expectedMethods)
+		err = r.restoreMergeMethods(ctx, repo, rulesetID, expectedMethods)
 		if err != nil {
 			resp.Diagnostics.AddWarning(
 				"Merge methods were reset",
@@ -202,11 +199,8 @@ func (r *rulesetAllowedMergeMethodsResource) Delete(
 		return
 	}
 
-	owner, repo, err := parseRepo(state.Repository.ValueString())
-	if err != nil {
-		resp.Diagnostics.AddError("Invalid repository format", err.Error())
-		return
-	}
+	owner := r.client.Owner
+	repo := state.Repository.ValueString()
 
 	rulesetID, err := parseID(state.RulesetID.ValueString())
 	if err != nil {
@@ -251,7 +245,7 @@ func (r *rulesetAllowedMergeMethodsResource) ImportState(
 	if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
 		resp.Diagnostics.AddError(
 			"Unexpected Import Identifier",
-			fmt.Sprintf("Expected import identifier with format: owner/repo:ruleset_id. Got: %q", req.ID),
+			fmt.Sprintf("Expected import identifier with format: repo:ruleset_id. Got: %q", req.ID),
 		)
 		return
 	}
@@ -264,10 +258,8 @@ func (r *rulesetAllowedMergeMethodsResource) upsert(
 	ctx context.Context,
 	plan *rulesetAllowedMergeMethodsResourceModel,
 ) error {
-	owner, repo, err := parseRepo(plan.Repository.ValueString())
-	if err != nil {
-		return err
-	}
+	owner := r.client.Owner
+	repo := plan.Repository.ValueString()
 
 	rulesetID, err := parseID(plan.RulesetID.ValueString())
 	if err != nil {
@@ -297,14 +289,6 @@ func (r *rulesetAllowedMergeMethodsResource) upsert(
 	return err
 }
 
-func parseRepo(repo string) (string, string, error) {
-	parts := strings.Split(repo, "/")
-	if len(parts) != 2 {
-		return "", "", fmt.Errorf("invalid repository format")
-	}
-	return parts[0], parts[1], nil
-}
-
 func parseID(id string) (int64, error) {
 	var i int64
 	n, err := fmt.Sscanf(id, "%d", &i)
@@ -374,12 +358,12 @@ func methodsEqual(a, b []string) bool {
 // restoreMergeMethods restores the merge methods to the expected values
 func (r *rulesetAllowedMergeMethodsResource) restoreMergeMethods(
 	ctx context.Context,
-	owner, repo string,
+	repo string,
 	rulesetID int64,
 	expectedMethods []string,
 ) error {
 	plan := &rulesetAllowedMergeMethodsResourceModel{
-		Repository:          types.StringValue(fmt.Sprintf("%s/%s", owner, repo)),
+		Repository:          types.StringValue(repo),
 		RulesetID:           types.StringValue(fmt.Sprintf("%d", rulesetID)),
 		AllowedMergeMethods: convertToSet(expectedMethods),
 	}

internal/provider/resource_ruleset_merge_methods_test.go

@@ -58,11 +58,11 @@ func TestResourceRulesetAllowedMergeMethodsWithMock(t *testing.T) {
 	// Test upsert function directly
 	t.Run("Upsert", func(t *testing.T) {
 		resource := &rulesetAllowedMergeMethodsResource{
-			client: &githubclient.Client{Client: client},
+			client: &githubclient.Client{Client: client, Owner: "owner"},
 		}
 
 		plan := &rulesetAllowedMergeMethodsResourceModel{
-			Repository:          types.StringValue("owner/repo"),
+			Repository:          types.StringValue("repo"),
 			RulesetID:           types.StringValue("123"),
 			AllowedMergeMethods: convertToSet([]string{"merge"}),
 		}
@@ -86,13 +86,13 @@ func TestResourceRulesetAllowedMergeMethodsWithMock(t *testing.T) {
 		getCalled, putCalled = false, false
 
 		resource := &rulesetAllowedMergeMethodsResource{
-			client: &githubclient.Client{Client: client},
+			client: &githubclient.Client{Client: client, Owner: "owner"},
 		}
 
 		// Test the delete logic by calling the same upsert function
 		// that Delete would call internally (with default methods)
 		plan := &rulesetAllowedMergeMethodsResourceModel{
-			Repository:          types.StringValue("owner/repo"),
+			Repository:          types.StringValue("repo"),
 			RulesetID:           types.StringValue("123"),
 			AllowedMergeMethods: convertToSet([]string{"merge", "squash", "rebase"}), // default methods
 		}
@@ -143,43 +143,6 @@ func TestResourceRulesetAllowedMergeMethodsWithMock(t *testing.T) {
 }
 
 // Unit tests for helper functions
-func TestParseRepo(t *testing.T) {
-	tests := []struct {
-		input         string
-		expectedOwner string
-		expectedRepo  string
-		expectError   bool
-	}{
-		{"owner/repo", "owner", "repo", false},
-		{"github/terraform-provider", "github", "terraform-provider", false},
-		{"invalid", "", "", true},
-		{"owner/repo/extra", "", "", true},
-		{"", "", "", true},
-	}
-
-	for _, test := range tests {
-		t.Run(test.input, func(t *testing.T) {
-			owner, repo, err := parseRepo(test.input)
-
-			if test.expectError {
-				if err == nil {
-					t.Errorf("Expected error for input %q, but got none", test.input)
-				}
-			} else {
-				if err != nil {
-					t.Errorf("Unexpected error for input %q: %v", test.input, err)
-				}
-				if owner != test.expectedOwner {
-					t.Errorf("Expected owner %q, got %q", test.expectedOwner, owner)
-				}
-				if repo != test.expectedRepo {
-					t.Errorf("Expected repo %q, got %q", test.expectedRepo, repo)
-				}
-			}
-		})
-	}
-}
-
 func TestParseID(t *testing.T) {
 	tests := []struct {
 		input       string