Merge branch 'main' into refactor/migrate-resource-github-issue-label-to-tflog-and-context

Author: slymanmrcan

.golangci.yml

@@ -12,7 +12,7 @@ linters:
     - errcheck
     - errname
     - errorlint
-    # - forcetypeassert TODO: Re-enable when we can fix the issues
+    # - forcetypeassert # TODO: Re-enable when we can fix the issues
     - godot
     - govet
     - ineffassign

docs/resources/repository_collaborators.md

@@ -25,9 +25,7 @@ Teams will be added to the repository on apply, and removed if removed from the
 
 ## Personal Repositories
 
-For personal repositories, collaborators can only be granted [write](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/repository-access-and-collaboration/permission-levels-for-a-personal-account-repository#collaborator-access-for-a-repository-owned-by-a-personal-account) permission.
-
-!> If the repository owner is not added as a collaborator with admin access, the provider will churn this resource on every plan/apply. To prevent this, ensure that the repository owner is included in the set of user collaborators.
+For personal repositories, non-owner collaborators can only be granted [write](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/repository-access-and-collaboration/permission-levels-for-a-personal-account-repository#collaborator-access-for-a-repository-owned-by-a-personal-account) permission. Owners will be ignored unless they are explicitly added, in which case they must be granted `admin` permission.
 
 ## Users
 
@@ -86,6 +84,7 @@ resource "github_repository_collaborators" "some_repo_collaborators" {
 
 - `id` (String) The ID of this resource.
 - `invitation_ids` (Map of String) Map of usernames to invitation ID for users that haven't yet accepted their invitation to become a collaborator. This is only set on read, and is used internally to track pending invitations for users that aren't yet collaborators.
+- `owner_configured` (Boolean) Indicates whether the owner of a personal repository is configured as a collaborator.
 - `repository_id` (Number) ID of the repository.
 
 <a id="nestedblock--ignore_team"></a>

github/resource_github_issue_label.go

@@ -13,9 +13,9 @@ import (
 
 func resourceGithubIssueLabel() *schema.Resource {
 	return &schema.Resource{
-		CreateContext: resourceGithubIssueLabelCreateOrUpdate,
+		CreateContext: resourceGithubIssueLabelCreate,
 		ReadContext:   resourceGithubIssueLabelRead,
-		UpdateContext: resourceGithubIssueLabelCreateOrUpdate,
+		UpdateContext: resourceGithubIssueLabelUpdate,
 		DeleteContext: resourceGithubIssueLabelDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
@@ -61,17 +61,15 @@ func resourceGithubIssueLabel() *schema.Resource {
 	}
 }
 
-// resourceGithubIssueLabelCreateOrUpdate idempotently creates or updates an
-// issue label. Issue labels are keyed off of their "name", so pre-existing
-// issue labels result in a 422 HTTP error if they exist outside of Terraform.
-// Normally this would not be an issue, except new repositories are created with
-// a "default" set of labels, and those labels easily conflict with custom ones.
+// resourceGithubIssueLabelCreate idempotently creates an issue label.
+// Issue labels are keyed off of their "name", so pre-existing issue labels
+// result in a 422 HTTP error if they exist outside of Terraform. Normally this
+// would not be an issue, except new repositories are created with a "default"
+// set of labels, and those labels can conflict with custom ones.
 //
-// This function will first check if the label exists, and then issue an update,
-// otherwise it will create. This is also advantageous in that we get to use the
-// same function for two schema funcs.
-
-func resourceGithubIssueLabelCreateOrUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+// This function first checks if the label exists and updates it if present;
+// otherwise it creates a new label.
+func resourceGithubIssueLabelCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	orgName := meta.(*Owner).name
 	repoName := d.Get("repository").(string)
@@ -82,69 +80,59 @@ func resourceGithubIssueLabelCreateOrUpdate(ctx context.Context, d *schema.Resou
 		Name:  new(name),
 		Color: new(color),
 	}
-	if !d.IsNewResource() {
-		ctx = context.WithValue(ctx, ctxId, d.Id())
-	}
-
-	// Pull out the original name. If we already have a resource, this is the
-	// parsed ID. If not, it's the value given to the resource.
-	var originalName string
-	if d.Id() == "" {
-		originalName = name
-	} else {
-		var err error
-		_, originalName, err = parseID2(d.Id())
-		if err != nil {
-			return diag.FromErr(err)
-		}
-	}
-
-	existing, resp, err := client.Issues.GetLabel(ctx,
-		orgName, repoName, originalName)
+	existing, resp, err := client.Issues.GetLabel(ctx, orgName, repoName, name)
 	if err != nil {
 		if resp == nil || resp.StatusCode != http.StatusNotFound {
 			return diag.FromErr(err)
 		}
 	}
-
 	if existing != nil {
 		label.Description = new(d.Get("description").(string))
 
-		// Pull out the original name. If we already have a resource, this is the
-		// parsed ID. If not, it's the value given to the resource.
-		var originalName string
-		if d.Id() == "" {
-			originalName = name
-		} else {
-			var err error
-			_, originalName, err = parseID2(d.Id())
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-
-		_, _, err := client.Issues.EditLabel(ctx,
-			orgName, repoName, originalName, label)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		_, _, err = client.Issues.EditLabel(ctx, orgName, repoName, name, label)
 	} else {
 		if v, ok := d.GetOk("description"); ok {
 			label.Description = new(v.(string))
 		}
 
-		_, _, err := client.Issues.CreateLabel(ctx,
-			orgName, repoName, label)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		_, _, err = client.Issues.CreateLabel(ctx, orgName, repoName, label)
+	}
+	if err != nil {
+		return diag.FromErr(err)
 	}
-
 	d.SetId(buildTwoPartID(repoName, name))
+	return nil
 
-	return resourceGithubIssueLabelRead(ctx, d, meta)
 }
+func resourceGithubIssueLabelUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+	client := meta.(*Owner).v3client
+	orgName := meta.(*Owner).name
+	repoName := d.Get("repository").(string)
+	name := d.Get("name").(string)
+	color := d.Get("color").(string)
+
+	ctx = context.WithValue(ctx, ctxId, d.Id())
+
+	_, originalName, err := parseID2(d.Id())
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	label := &github.Label{
+		Name:        new(name),
+		Color:       new(color),
+		Description: new(d.Get("description").(string)),
+	}
+
+	_, _, err = client.Issues.EditLabel(ctx, orgName, repoName, originalName, label)
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
+	d.SetId(buildTwoPartID(repoName, name))
+	return nil
+
+}
 func resourceGithubIssueLabelRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	repoName, name, err := parseID2(d.Id())
@@ -200,7 +188,6 @@ func resourceGithubIssueLabelRead(ctx context.Context, d *schema.ResourceData, m
 
 	return nil
 }
-
 func resourceGithubIssueLabelDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client