Merge branch 'main' into v6

Author: kfcampbell

github/resource_github_release.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/http"
 	"strconv"
 
 	"github.com/google/go-github/v57/github"
@@ -162,6 +163,13 @@ func resourceGithubReleaseRead(d *schema.ResourceData, meta interface{}) error {
 
 	release, _, err := client.Repositories.GetRelease(ctx, owner, repository, releaseID)
 	if err != nil {
+		if ghErr, ok := err.(*github.ErrorResponse); ok {
+			if ghErr.Response.StatusCode == http.StatusNotFound {
+				log.Printf("[INFO] Removing release ID %d for repository %s from state, because it no longer exists on GitHub", releaseID, repository)
+				d.SetId("")
+				return nil
+			}
+		}
 		return err
 	}
 	transformResponseToResourceData(d, release, repository)

website/docs/r/repository_file.html.markdown

@@ -51,7 +51,7 @@ The following arguments are supported:
 
 * `commit_email` - (Optional) Committer email address to use. **NOTE:** GitHub app users may omit author and email information so GitHub can verify commits as the GitHub App. This may be useful when a branch protection rule requires signed commits.
 
-* `commit_message` - (Optional) Commit message when adding or updating the managed file.
+* `commit_message` - (Optional) The commit message when creating, updating or deleting the managed file.
 
 * `overwrite_on_create` - (Optional) Enable overwriting existing files. If set to `true` it will overwrite an existing file with the same name. If set to `false` it will fail if there is an existing file with the same name.