Skip to content

fix(github_repository_file): delete error handling and codesigning #2736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickfloyd merged 9 commits into from
Nov 26, 2025
Merged

fix(github_repository_file): delete error handling and codesigning #2736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
01b47db
fix: improve error handling and define delete file options
ivanmartos Aug 20, 2025
c204c30
fix: update delete file message formatting in GitHub repository file …
ivanmartos Aug 20, 2025
ad479a3
fix: replace hardcoded random ID with dynamic generation in repositor…
ivanmartos Aug 20, 2025
85782b6
Merge branch 'main' into fix/deleteRepositoryFIle
nickfloyd Oct 21, 2025
4f7f45c
Merge branch 'main' into fix/deleteRepositoryFIle
nickfloyd Nov 10, 2025
932f19c
Merge branch 'main' into fix/deleteRepositoryFIle
nickfloyd Nov 20, 2025
edb1c67
Merge branch 'main' into fix/deleteRepositoryFIle
nickfloyd Nov 26, 2025
573fe15
addresses PR comments
nickfloyd Nov 26, 2025
fe7defe
lint fixes
nickfloyd Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions github/resource_github_repository_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,16 +455,14 @@ func resourceGithubRepositoryFileDelete(d *schema.ResourceData, meta any) error

var branch string

message := fmt.Sprintf("Delete %s", file)

if commitMessage, hasCommitMessage := d.GetOk("commit_message"); hasCommitMessage {
message = commitMessage.(string)
opts, err := resourceGithubRepositoryFileOptions(d)
if err != nil {
return err
}

sha := d.Get("sha").(string)
opts := &github.RepositoryContentFileOptions{
Message: &message,
SHA: &sha,
if *opts.Message == fmt.Sprintf("Add %s", file) {
m := fmt.Sprintf("Delete %s", file)
opts.Message = &m
}

if b, ok := d.GetOk("branch"); ok {
Expand Down Expand Up @@ -498,7 +496,7 @@ func resourceGithubRepositoryFileDelete(d *schema.ResourceData, meta any) error
opts.Branch = &branch
}

_, _, err := client.Repositories.DeleteFile(ctx, owner, repo, file, opts)
_, _, err = client.Repositories.DeleteFile(ctx, owner, repo, file, opts)
return handleArchivedRepoDelete(err, "repository file", file, owner, repo)
}

Expand Down
14 changes: 6 additions & 8 deletions github/resource_github_repository_file_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import (
)

func TestAccGithubRepositoryFile(t *testing.T) {
randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)

t.Run("creates and manages files", func(t *testing.T) {
config := fmt.Sprintf(`

Expand All @@ -31,7 +29,7 @@ func TestAccGithubRepositoryFile(t *testing.T) {
commit_author = "Terraform User"
commit_email = "terraform@example.com"
}
`, randomID)
`, acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum))
check := resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"github_repository_file.test", "content",
Expand Down Expand Up @@ -107,7 +105,7 @@ func TestAccGithubRepositoryFile(t *testing.T) {
commit_email = "terraform@example.com"
}

`, randomID)
`, acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum))

check := resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
Expand Down Expand Up @@ -196,7 +194,7 @@ func TestAccGithubRepositoryFile(t *testing.T) {
commit_author = "Terraform User"
commit_email = "terraform@example.com"
}
`, randomID)
`, acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum))

check := resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
Expand Down Expand Up @@ -272,7 +270,7 @@ func TestAccGithubRepositoryFile(t *testing.T) {
commit_email = "terraform@example.com"
autocreate_branch = false
}
`, randomID)
`, acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum))

check := resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
Expand Down Expand Up @@ -352,7 +350,7 @@ func TestAccGithubRepositoryFile(t *testing.T) {
commit_author = "Terraform User"
commit_email = "terraform@example.com"
}
`, randomID)
`, acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum))

archivedConfig := strings.Replace(config,
`auto_init = true`,
Expand Down Expand Up @@ -391,7 +389,7 @@ func TestAccGithubRepositoryFile(t *testing.T) {
auto_init = true
archived = true
}
`, randomID),
`, acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)),
},
},
})
Expand Down