The stateReason field was added in GHES ~3.4, which is far older than the earliest supported GHES version (3.14). The feature detection and conditional inclusion of stateReason is therefore unnecessary. This removes: - StateReason field from IssueFeatures struct - GHES introspection query in IssueFeatures() (only ActorIsAssignable remains, which is always false on GHES) - Conditional stateReason field inclusion in issue list - Feature detection guard in issue close - Feature detection guard in FindIssueOrPR Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
214 lines
5.8 KiB
Go
214 lines
5.8 KiB
Go
package close
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
|
|
"github.com/MakeNowJust/heredoc"
|
|
"github.com/cli/cli/v2/api"
|
|
"github.com/cli/cli/v2/internal/ghrepo"
|
|
"github.com/cli/cli/v2/pkg/cmd/issue/shared"
|
|
prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared"
|
|
"github.com/cli/cli/v2/pkg/cmdutil"
|
|
"github.com/cli/cli/v2/pkg/iostreams"
|
|
"github.com/shurcooL/githubv4"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type CloseOptions struct {
|
|
HttpClient func() (*http.Client, error)
|
|
IO *iostreams.IOStreams
|
|
BaseRepo func() (ghrepo.Interface, error)
|
|
|
|
IssueNumber int
|
|
Comment string
|
|
Reason string
|
|
DuplicateOf string
|
|
}
|
|
|
|
func NewCmdClose(f *cmdutil.Factory, runF func(*CloseOptions) error) *cobra.Command {
|
|
opts := &CloseOptions{
|
|
IO: f.IOStreams,
|
|
HttpClient: f.HttpClient,
|
|
}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "close {<number> | <url>}",
|
|
Short: "Close issue",
|
|
Example: heredoc.Doc(`
|
|
# Close issue
|
|
$ gh issue close 123
|
|
|
|
# Close issue and add a closing comment
|
|
$ gh issue close 123 --comment "Closing this issue"
|
|
|
|
# Close issue as a duplicate of issue #456
|
|
$ gh issue close 123 --duplicate-of 456
|
|
|
|
# Close issue as not planned
|
|
$ gh issue close 123 --reason "not planned"
|
|
`),
|
|
Args: cobra.ExactArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
issueNumber, baseRepo, err := shared.ParseIssueFromArg(args[0])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// If the args provided the base repo then use that directly.
|
|
if baseRepo, present := baseRepo.Value(); present {
|
|
opts.BaseRepo = func() (ghrepo.Interface, error) {
|
|
return baseRepo, nil
|
|
}
|
|
} else {
|
|
// support `-R, --repo` override
|
|
opts.BaseRepo = f.BaseRepo
|
|
}
|
|
|
|
opts.IssueNumber = issueNumber
|
|
if opts.DuplicateOf != "" {
|
|
if opts.Reason == "" {
|
|
opts.Reason = "duplicate"
|
|
} else if opts.Reason != "duplicate" {
|
|
return cmdutil.FlagErrorf("`--duplicate-of` can only be used with `--reason duplicate`")
|
|
}
|
|
}
|
|
|
|
if runF != nil {
|
|
return runF(opts)
|
|
}
|
|
return closeRun(opts)
|
|
},
|
|
}
|
|
|
|
cmd.Flags().StringVarP(&opts.Comment, "comment", "c", "", "Leave a closing comment")
|
|
cmdutil.StringEnumFlag(cmd, &opts.Reason, "reason", "r", "", []string{"completed", "not planned", "duplicate"}, "Reason for closing")
|
|
cmd.Flags().StringVar(&opts.DuplicateOf, "duplicate-of", "", "Mark as duplicate of another issue by number or URL")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func closeRun(opts *CloseOptions) error {
|
|
cs := opts.IO.ColorScheme()
|
|
closeReason := opts.Reason
|
|
if opts.DuplicateOf != "" {
|
|
if closeReason == "" {
|
|
closeReason = "duplicate"
|
|
} else if closeReason != "duplicate" {
|
|
return cmdutil.FlagErrorf("`--duplicate-of` can only be used with `--reason duplicate`")
|
|
}
|
|
}
|
|
|
|
httpClient, err := opts.HttpClient()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
baseRepo, err := opts.BaseRepo()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
issue, err := shared.FindIssueOrPR(httpClient, baseRepo, opts.IssueNumber, []string{"id", "number", "title", "state"})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if issue.State == "CLOSED" {
|
|
fmt.Fprintf(opts.IO.ErrOut, "%s Issue %s#%d (%s) is already closed\n", cs.Yellow("!"), ghrepo.FullName(baseRepo), issue.Number, issue.Title)
|
|
return nil
|
|
}
|
|
|
|
var duplicateIssueID string
|
|
if opts.DuplicateOf != "" {
|
|
if issue.IsPullRequest() {
|
|
return cmdutil.FlagErrorf("`--duplicate-of` is only supported for issues")
|
|
}
|
|
duplicateIssueNumber, duplicateRepo, err := shared.ParseIssueFromArg(opts.DuplicateOf)
|
|
if err != nil {
|
|
return cmdutil.FlagErrorf("invalid value for `--duplicate-of`: %v", err)
|
|
}
|
|
duplicateIssueRepo := baseRepo
|
|
if parsedRepo, present := duplicateRepo.Value(); present {
|
|
duplicateIssueRepo = parsedRepo
|
|
}
|
|
if ghrepo.IsSame(baseRepo, duplicateIssueRepo) && issue.Number == duplicateIssueNumber {
|
|
return cmdutil.FlagErrorf("`--duplicate-of` cannot reference the current issue")
|
|
}
|
|
duplicateIssue, err := shared.FindIssueOrPR(httpClient, duplicateIssueRepo, duplicateIssueNumber, []string{"id"})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if duplicateIssue.IsPullRequest() {
|
|
return cmdutil.FlagErrorf("`--duplicate-of` must reference an issue")
|
|
}
|
|
duplicateIssueID = duplicateIssue.ID
|
|
}
|
|
|
|
if opts.Comment != "" {
|
|
commentOpts := &prShared.CommentableOptions{
|
|
Body: opts.Comment,
|
|
HttpClient: opts.HttpClient,
|
|
InputType: prShared.InputTypeInline,
|
|
Quiet: true,
|
|
RetrieveCommentable: func() (prShared.Commentable, ghrepo.Interface, error) {
|
|
return issue, baseRepo, nil
|
|
},
|
|
}
|
|
err := prShared.CommentableRun(commentOpts)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
err = apiClose(httpClient, baseRepo, issue, closeReason, duplicateIssueID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Fprintf(opts.IO.ErrOut, "%s Closed issue %s#%d (%s)\n", cs.SuccessIconWithColor(cs.Red), ghrepo.FullName(baseRepo), issue.Number, issue.Title)
|
|
|
|
return nil
|
|
}
|
|
|
|
func apiClose(httpClient *http.Client, repo ghrepo.Interface, issue *api.Issue, reason string, duplicateIssueID string) error {
|
|
if issue.IsPullRequest() {
|
|
return api.PullRequestClose(httpClient, repo, issue.ID)
|
|
}
|
|
|
|
switch reason {
|
|
case "":
|
|
// If no reason is specified do not set it.
|
|
case "not planned":
|
|
reason = "NOT_PLANNED"
|
|
case "duplicate":
|
|
reason = "DUPLICATE"
|
|
default:
|
|
reason = "COMPLETED"
|
|
}
|
|
|
|
var mutation struct {
|
|
CloseIssue struct {
|
|
Issue struct {
|
|
ID githubv4.ID
|
|
}
|
|
} `graphql:"closeIssue(input: $input)"`
|
|
}
|
|
|
|
variables := map[string]interface{}{
|
|
"input": CloseIssueInput{
|
|
IssueID: issue.ID,
|
|
StateReason: reason,
|
|
DuplicateIssueID: duplicateIssueID,
|
|
},
|
|
}
|
|
|
|
gql := api.NewClientFromHTTP(httpClient)
|
|
return gql.Mutate(repo.RepoHost(), "IssueClose", &mutation, variables)
|
|
}
|
|
|
|
type CloseIssueInput struct {
|
|
IssueID string `json:"issueId"`
|
|
StateReason string `json:"stateReason,omitempty"`
|
|
DuplicateIssueID string `json:"duplicateIssueId,omitempty"`
|
|
}
|