Merge branch 'trunk' into feat/debian-install
This commit is contained in:
Nguyễn Hồng Quân
commit
09f09879ca
17 changed files with 1757 additions and 81 deletions
|
|
@ -1,6 +1,7 @@
|
|||
package api
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/shurcooL/githubv4"
|
||||
)
|
||||
|
|
@ -47,6 +48,31 @@ type OrgTeam struct {
|
|||
Slug string
|
||||
}
|
||||
|
||||
// OrganizationTeam fetch the team in an organization with the given slug
|
||||
func OrganizationTeam(client *Client, hostname string, org string, teamSlug string) (*OrgTeam, error) {
|
||||
type responseData struct {
|
||||
Organization struct {
|
||||
Team OrgTeam `graphql:"team(slug: $teamSlug)"`
|
||||
} `graphql:"organization(login: $owner)"`
|
||||
}
|
||||
|
||||
variables := map[string]interface{}{
|
||||
"owner": githubv4.String(org),
|
||||
"teamSlug": githubv4.String(teamSlug),
|
||||
}
|
||||
|
||||
var query responseData
|
||||
err := client.Query(hostname, "OrganizationTeam", &query, variables)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if query.Organization.Team.ID == "" {
|
||||
return nil, fmt.Errorf("could not resolve to a Team with the slug of '%s'", teamSlug)
|
||||
}
|
||||
|
||||
return &query.Organization.Team, nil
|
||||
}
|
||||
|
||||
// OrganizationTeams fetches all the teams in an organization
|
||||
func OrganizationTeams(client *Client, repo ghrepo.Interface) ([]OrgTeam, error) {
|
||||
type responseData struct {
|
||||
|
|
|
|||
|
|
@ -20,6 +20,26 @@ import (
|
|||
|
||||
var remoteRE = regexp.MustCompile(`(.+)\s+(.+)\s+\((push|fetch)\)`)
|
||||
|
||||
// This regexp exists to match lines of the following form:
|
||||
// 6a6872b918c601a0e730710ad8473938a7516d30\u0000title 1\u0000Body 1\u0000\n
|
||||
// 7a6872b918c601a0e730710ad8473938a7516d31\u0000title 2\u0000Body 2\u0000
|
||||
//
|
||||
// This is the format we use when collecting commit information,
|
||||
// with null bytes as separators. Using null bytes this way allows for us
|
||||
// to easily maintain newlines that might be in the body.
|
||||
//
|
||||
// The ?m modifier is the multi-line modifier, meaning that ^ and $
|
||||
// match the beginning and end of lines, respectively.
|
||||
//
|
||||
// The [\S\s] matches any whitespace or non-whitespace character,
|
||||
// which is different from .* because it allows for newlines as well.
|
||||
//
|
||||
// The ? following .* and [\S\s] is a lazy modifier, meaning that it will
|
||||
// match as few characters as possible while still satisfying the rest of the regexp.
|
||||
// This is important because it allows us to match the first null byte after the title and body,
|
||||
// rather than the last null byte in the entire string.
|
||||
var commitLogRE = regexp.MustCompile(`(?m)^[0-9a-fA-F]{7,40}\x00.*?\x00[\S\s]*?\x00$`)
|
||||
|
||||
type errWithExitCode interface {
|
||||
ExitCode() int
|
||||
}
|
||||
|
|
@ -227,14 +247,13 @@ func (c *Client) UncommittedChangeCount(ctx context.Context) (int, error) {
|
|||
return count, nil
|
||||
}
|
||||
|
||||
func isGitSha(s string) bool {
|
||||
shaRegex := regexp.MustCompile(`^[0-9a-fA-F]{7,40}$`)
|
||||
ret := shaRegex.MatchString(s)
|
||||
return ret
|
||||
}
|
||||
|
||||
func (c *Client) Commits(ctx context.Context, baseRef, headRef string) ([]*Commit, error) {
|
||||
args := []string{"-c", "log.ShowSignature=false", "log", "--pretty=format:%H,%s,%b", "--cherry", fmt.Sprintf("%s...%s", baseRef, headRef)}
|
||||
// The formatting directive %x00 indicates that git should include the null byte as a separator.
|
||||
// We use this because it is not a valid character to include in a commit message. Previously,
|
||||
// commas were used here but when we Split on them, we would get incorrect results if commit titles
|
||||
// happened to contain them.
|
||||
// https://git-scm.com/docs/pretty-formats#Documentation/pretty-formats.txt-emx00em
|
||||
args := []string{"-c", "log.ShowSignature=false", "log", "--pretty=format:%H%x00%s%x00%b%x00", "--cherry", fmt.Sprintf("%s...%s", baseRef, headRef)}
|
||||
cmd, err := c.Command(ctx, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -243,46 +262,33 @@ func (c *Client) Commits(ctx context.Context, baseRef, headRef string) ([]*Commi
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
commits := []*Commit{}
|
||||
sha := 0
|
||||
title := 1
|
||||
body := 2
|
||||
lines := outputLines(out)
|
||||
for i := 0; i < len(lines); i++ {
|
||||
split := strings.SplitN(lines[i], ",", 3)
|
||||
if isGitSha(split[sha]) {
|
||||
c := &Commit{
|
||||
Sha: split[sha],
|
||||
Title: split[title],
|
||||
}
|
||||
commitLogs := commitLogRE.FindAllString(string(out), -1)
|
||||
for _, commitLog := range commitLogs {
|
||||
// Each line looks like this:
|
||||
// 6a6872b918c601a0e730710ad8473938a7516d30\u0000title 1\u0000Body 1\u0000\n
|
||||
|
||||
if len(split) == 2 {
|
||||
commits = append(commits, c)
|
||||
continue
|
||||
}
|
||||
// Or with an optional body:
|
||||
// 6a6872b918c601a0e730710ad8473938a7516d30\u0000title 1\u0000\u0000\n
|
||||
|
||||
c.Body = split[body]
|
||||
// This consumes all lines until the next commit and adds them to the body.
|
||||
for {
|
||||
i++
|
||||
if i >= len(lines) {
|
||||
break
|
||||
}
|
||||
// Therefore after splitting we will have:
|
||||
// ["6a6872b918c601a0e730710ad8473938a7516d30", "title 1", "Body 1", ""]
|
||||
|
||||
possibleSplit := strings.SplitN(lines[i], ",", 3)
|
||||
if len(possibleSplit) > 2 && isGitSha(possibleSplit[sha]) {
|
||||
i--
|
||||
break
|
||||
}
|
||||
c.Body += "\n"
|
||||
c.Body += lines[i]
|
||||
}
|
||||
commits = append(commits, c)
|
||||
}
|
||||
// Or with an optional body:
|
||||
// ["6a6872b918c601a0e730710ad8473938a7516d30", "title 1", "", ""]
|
||||
commitLogParts := strings.Split(commitLog, "\u0000")
|
||||
commits = append(commits, &Commit{
|
||||
Sha: commitLogParts[0],
|
||||
Title: commitLogParts[1],
|
||||
Body: commitLogParts[2],
|
||||
})
|
||||
}
|
||||
|
||||
if len(commits) == 0 {
|
||||
return nil, fmt.Errorf("could not find any commits between %s and %s", baseRef, headRef)
|
||||
}
|
||||
|
||||
return commits, nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package git
|
|||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
|
|
@ -13,6 +14,7 @@ import (
|
|||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestClientCommand(t *testing.T) {
|
||||
|
|
@ -458,29 +460,57 @@ func TestClientUncommittedChangeCount(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
type stubbedCommit struct {
|
||||
Sha string
|
||||
Title string
|
||||
Body string
|
||||
}
|
||||
|
||||
type stubbedCommitsCommandData struct {
|
||||
ExitStatus int
|
||||
|
||||
ErrMsg string
|
||||
|
||||
Commits []stubbedCommit
|
||||
}
|
||||
|
||||
func TestClientCommits(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
cmdExitStatus int
|
||||
cmdStdout string
|
||||
cmdStderr string
|
||||
wantCmdArgs string
|
||||
wantCommits []*Commit
|
||||
wantErrorMsg string
|
||||
name string
|
||||
testData stubbedCommitsCommandData
|
||||
wantCmdArgs string
|
||||
wantCommits []*Commit
|
||||
wantErrorMsg string
|
||||
}{
|
||||
{
|
||||
name: "get commits",
|
||||
cmdStdout: "6a6872b918c601a0e730710ad8473938a7516d30,testing testability test",
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H,%s,%b --cherry SHA1...SHA2`,
|
||||
name: "single commit no body",
|
||||
testData: stubbedCommitsCommandData{
|
||||
Commits: []stubbedCommit{
|
||||
{
|
||||
Sha: "6a6872b918c601a0e730710ad8473938a7516d30",
|
||||
Title: "testing testability test",
|
||||
Body: "",
|
||||
},
|
||||
},
|
||||
},
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry SHA1...SHA2`,
|
||||
wantCommits: []*Commit{{
|
||||
Sha: "6a6872b918c601a0e730710ad8473938a7516d30",
|
||||
Title: "testing testability test",
|
||||
}},
|
||||
},
|
||||
{
|
||||
name: "get commits with body",
|
||||
cmdStdout: "6a6872b918c601a0e730710ad8473938a7516d30,testing testability test,This is the body",
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H,%s,%b --cherry SHA1...SHA2`,
|
||||
name: "single commit with body",
|
||||
testData: stubbedCommitsCommandData{
|
||||
Commits: []stubbedCommit{
|
||||
{
|
||||
Sha: "6a6872b918c601a0e730710ad8473938a7516d30",
|
||||
Title: "testing testability test",
|
||||
Body: "This is the body",
|
||||
},
|
||||
},
|
||||
},
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry SHA1...SHA2`,
|
||||
wantCommits: []*Commit{{
|
||||
Sha: "6a6872b918c601a0e730710ad8473938a7516d30",
|
||||
Title: "testing testability test",
|
||||
|
|
@ -488,37 +518,175 @@ func TestClientCommits(t *testing.T) {
|
|||
}},
|
||||
},
|
||||
{
|
||||
name: "no commits between SHAs",
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H,%s,%b --cherry SHA1...SHA2`,
|
||||
name: "multiple commits with bodies",
|
||||
testData: stubbedCommitsCommandData{
|
||||
Commits: []stubbedCommit{
|
||||
{
|
||||
Sha: "6a6872b918c601a0e730710ad8473938a7516d30",
|
||||
Title: "testing testability test",
|
||||
Body: "This is the body",
|
||||
},
|
||||
{
|
||||
Sha: "7a6872b918c601a0e730710ad8473938a7516d31",
|
||||
Title: "testing testability test 2",
|
||||
Body: "This is the body 2",
|
||||
},
|
||||
},
|
||||
},
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry SHA1...SHA2`,
|
||||
wantCommits: []*Commit{
|
||||
{
|
||||
Sha: "6a6872b918c601a0e730710ad8473938a7516d30",
|
||||
Title: "testing testability test",
|
||||
Body: "This is the body",
|
||||
},
|
||||
{
|
||||
Sha: "7a6872b918c601a0e730710ad8473938a7516d31",
|
||||
Title: "testing testability test 2",
|
||||
Body: "This is the body 2",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "multiple commits mixed bodies",
|
||||
testData: stubbedCommitsCommandData{
|
||||
Commits: []stubbedCommit{
|
||||
{
|
||||
Sha: "6a6872b918c601a0e730710ad8473938a7516d30",
|
||||
Title: "testing testability test",
|
||||
},
|
||||
{
|
||||
Sha: "7a6872b918c601a0e730710ad8473938a7516d31",
|
||||
Title: "testing testability test 2",
|
||||
Body: "This is the body 2",
|
||||
},
|
||||
},
|
||||
},
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry SHA1...SHA2`,
|
||||
wantCommits: []*Commit{
|
||||
{
|
||||
Sha: "6a6872b918c601a0e730710ad8473938a7516d30",
|
||||
Title: "testing testability test",
|
||||
},
|
||||
{
|
||||
Sha: "7a6872b918c601a0e730710ad8473938a7516d31",
|
||||
Title: "testing testability test 2",
|
||||
Body: "This is the body 2",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "multiple commits newlines in bodies",
|
||||
testData: stubbedCommitsCommandData{
|
||||
Commits: []stubbedCommit{
|
||||
{
|
||||
Sha: "6a6872b918c601a0e730710ad8473938a7516d30",
|
||||
Title: "testing testability test",
|
||||
Body: "This is the body\nwith a newline",
|
||||
},
|
||||
{
|
||||
Sha: "7a6872b918c601a0e730710ad8473938a7516d31",
|
||||
Title: "testing testability test 2",
|
||||
Body: "This is the body 2",
|
||||
},
|
||||
},
|
||||
},
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry SHA1...SHA2`,
|
||||
wantCommits: []*Commit{
|
||||
{
|
||||
Sha: "6a6872b918c601a0e730710ad8473938a7516d30",
|
||||
Title: "testing testability test",
|
||||
Body: "This is the body\nwith a newline",
|
||||
},
|
||||
{
|
||||
Sha: "7a6872b918c601a0e730710ad8473938a7516d31",
|
||||
Title: "testing testability test 2",
|
||||
Body: "This is the body 2",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "no commits between SHAs",
|
||||
testData: stubbedCommitsCommandData{
|
||||
Commits: []stubbedCommit{},
|
||||
},
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry SHA1...SHA2`,
|
||||
wantErrorMsg: "could not find any commits between SHA1 and SHA2",
|
||||
},
|
||||
{
|
||||
name: "git error",
|
||||
cmdExitStatus: 1,
|
||||
cmdStderr: "git error message",
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H,%s,%b --cherry SHA1...SHA2`,
|
||||
wantErrorMsg: "failed to run git: git error message",
|
||||
name: "git error",
|
||||
testData: stubbedCommitsCommandData{
|
||||
ErrMsg: "git error message",
|
||||
ExitStatus: 1,
|
||||
},
|
||||
wantCmdArgs: `path/to/git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry SHA1...SHA2`,
|
||||
wantErrorMsg: "failed to run git: git error message",
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
cmd, cmdCtx := createCommandContext(t, tt.cmdExitStatus, tt.cmdStdout, tt.cmdStderr)
|
||||
cmd, cmdCtx := createCommitsCommandContext(t, tt.testData)
|
||||
client := Client{
|
||||
GitPath: "path/to/git",
|
||||
commandContext: cmdCtx,
|
||||
}
|
||||
commits, err := client.Commits(context.Background(), "SHA1", "SHA2")
|
||||
assert.Equal(t, tt.wantCmdArgs, strings.Join(cmd.Args[3:], " "))
|
||||
require.Equal(t, tt.wantCmdArgs, strings.Join(cmd.Args[3:], " "))
|
||||
if tt.wantErrorMsg != "" {
|
||||
assert.EqualError(t, err, tt.wantErrorMsg)
|
||||
require.EqualError(t, err, tt.wantErrorMsg)
|
||||
} else {
|
||||
assert.NoError(t, err)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
assert.Equal(t, tt.wantCommits, commits)
|
||||
require.Equal(t, tt.wantCommits, commits)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestCommitsHelperProcess(t *testing.T) {
|
||||
if os.Getenv("GH_WANT_HELPER_PROCESS") != "1" {
|
||||
return
|
||||
}
|
||||
|
||||
var td stubbedCommitsCommandData
|
||||
_ = json.Unmarshal([]byte(os.Getenv("GH_COMMITS_TEST_DATA")), &td)
|
||||
|
||||
if td.ErrMsg != "" {
|
||||
fmt.Fprint(os.Stderr, td.ErrMsg)
|
||||
} else {
|
||||
var sb strings.Builder
|
||||
for _, commit := range td.Commits {
|
||||
sb.WriteString(commit.Sha)
|
||||
sb.WriteString("\u0000")
|
||||
sb.WriteString(commit.Title)
|
||||
sb.WriteString("\u0000")
|
||||
sb.WriteString(commit.Body)
|
||||
sb.WriteString("\u0000")
|
||||
sb.WriteString("\n")
|
||||
}
|
||||
fmt.Fprint(os.Stdout, sb.String())
|
||||
}
|
||||
|
||||
os.Exit(td.ExitStatus)
|
||||
}
|
||||
|
||||
func createCommitsCommandContext(t *testing.T, testData stubbedCommitsCommandData) (*exec.Cmd, commandCtx) {
|
||||
t.Helper()
|
||||
|
||||
b, err := json.Marshal(testData)
|
||||
require.NoError(t, err)
|
||||
|
||||
cmd := exec.CommandContext(context.Background(), os.Args[0], "-test.run=TestCommitsHelperProcess", "--")
|
||||
cmd.Env = []string{
|
||||
"GH_WANT_HELPER_PROCESS=1",
|
||||
"GH_COMMITS_TEST_DATA=" + string(b),
|
||||
}
|
||||
return cmd, func(ctx context.Context, exe string, args ...string) *exec.Cmd {
|
||||
cmd.Args = append(cmd.Args, exe)
|
||||
cmd.Args = append(cmd.Args, args...)
|
||||
return cmd
|
||||
}
|
||||
}
|
||||
|
||||
func TestClientLastCommit(t *testing.T) {
|
||||
client := Client{
|
||||
RepoDir: "./fixtures/simple.git",
|
||||
|
|
|
|||
|
|
@ -515,6 +515,9 @@ func fallbackConfig() *ghConfig.Config {
|
|||
// last migration we decided to run is. Therefore, if we run a new migration,
|
||||
// this should be bumped.
|
||||
const defaultConfigStr = `
|
||||
# The default config file, auto-generated by gh. Run 'gh environment' to learn more about
|
||||
# environment variables respected by gh and their precedence.
|
||||
|
||||
# The current version of the config schema
|
||||
version: 1
|
||||
# What protocol to use when performing git operations. Supported values: ssh, https
|
||||
|
|
@ -523,7 +526,7 @@ git_protocol: https
|
|||
editor:
|
||||
# When to interactively prompt. This is a global config that cannot be overridden by hostname. Supported values: enabled, disabled
|
||||
prompt: enabled
|
||||
# A pager program to send command output to, e.g. "less". Set the value to "cat" to disable the pager.
|
||||
# A pager program to send command output to, e.g. "less". If blank, will refer to environment. Set the value to "cat" to disable the pager.
|
||||
pager:
|
||||
# Aliases allow you to create nicknames for gh commands
|
||||
aliases:
|
||||
|
|
|
|||
10
pkg/cmd/cache/list/list.go
vendored
10
pkg/cmd/cache/list/list.go
vendored
|
|
@ -28,6 +28,7 @@ type ListOptions struct {
|
|||
Order string
|
||||
Sort string
|
||||
Key string
|
||||
Ref string
|
||||
}
|
||||
|
||||
func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Command {
|
||||
|
|
@ -51,6 +52,12 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
|
|||
|
||||
# List caches that have keys matching a prefix (or that match exactly)
|
||||
$ gh cache list --key key-prefix
|
||||
|
||||
# To list caches for a specific branch, replace <branch-name> with the actual branch name
|
||||
$ gh cache list --ref refs/heads/<branch-name>
|
||||
|
||||
# To list caches for a specific pull request, replace <pr-number> with the actual pull request number
|
||||
$ gh cache list --ref refs/pull/<pr-number>/merge
|
||||
`),
|
||||
Aliases: []string{"ls"},
|
||||
Args: cobra.NoArgs,
|
||||
|
|
@ -74,6 +81,7 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
|
|||
cmdutil.StringEnumFlag(cmd, &opts.Order, "order", "O", "desc", []string{"asc", "desc"}, "Order of caches returned")
|
||||
cmdutil.StringEnumFlag(cmd, &opts.Sort, "sort", "S", "last_accessed_at", []string{"created_at", "last_accessed_at", "size_in_bytes"}, "Sort fetched caches")
|
||||
cmd.Flags().StringVarP(&opts.Key, "key", "k", "", "Filter by cache key prefix")
|
||||
cmd.Flags().StringVarP(&opts.Ref, "ref", "r", "", "Filter by ref, formatted as refs/heads/<branch name> or refs/pull/<number>/merge")
|
||||
cmdutil.AddJSONFlags(cmd, &opts.Exporter, shared.CacheFields)
|
||||
|
||||
return cmd
|
||||
|
|
@ -92,7 +100,7 @@ func listRun(opts *ListOptions) error {
|
|||
client := api.NewClientFromHTTP(httpClient)
|
||||
|
||||
opts.IO.StartProgressIndicator()
|
||||
result, err := shared.GetCaches(client, repo, shared.GetCachesOptions{Limit: opts.Limit, Sort: opts.Sort, Order: opts.Order, Key: opts.Key})
|
||||
result, err := shared.GetCaches(client, repo, shared.GetCachesOptions{Limit: opts.Limit, Sort: opts.Sort, Order: opts.Order, Key: opts.Key, Ref: opts.Ref})
|
||||
opts.IO.StopProgressIndicator()
|
||||
if err != nil {
|
||||
return fmt.Errorf("%s Failed to get caches: %w", opts.IO.ColorScheme().FailureIcon(), err)
|
||||
|
|
|
|||
36
pkg/cmd/cache/list/list_test.go
vendored
36
pkg/cmd/cache/list/list_test.go
vendored
|
|
@ -31,6 +31,7 @@ func TestNewCmdList(t *testing.T) {
|
|||
Order: "desc",
|
||||
Sort: "last_accessed_at",
|
||||
Key: "",
|
||||
Ref: "",
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -41,6 +42,7 @@ func TestNewCmdList(t *testing.T) {
|
|||
Order: "desc",
|
||||
Sort: "last_accessed_at",
|
||||
Key: "",
|
||||
Ref: "",
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -56,6 +58,7 @@ func TestNewCmdList(t *testing.T) {
|
|||
Order: "desc",
|
||||
Sort: "created_at",
|
||||
Key: "",
|
||||
Ref: "",
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -66,6 +69,7 @@ func TestNewCmdList(t *testing.T) {
|
|||
Order: "asc",
|
||||
Sort: "last_accessed_at",
|
||||
Key: "",
|
||||
Ref: "",
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -76,6 +80,18 @@ func TestNewCmdList(t *testing.T) {
|
|||
Order: "desc",
|
||||
Sort: "last_accessed_at",
|
||||
Key: "cache-key-prefix-",
|
||||
Ref: "",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "with ref",
|
||||
input: "--ref refs/heads/main",
|
||||
wants: ListOptions{
|
||||
Limit: 30,
|
||||
Order: "desc",
|
||||
Sort: "last_accessed_at",
|
||||
Key: "",
|
||||
Ref: "refs/heads/main",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -206,6 +222,26 @@ ID KEY SIZE CREATED ACCESSED
|
|||
wantErr: true,
|
||||
wantErrMsg: "No caches found in OWNER/REPO",
|
||||
},
|
||||
{
|
||||
name: "only requests caches with the provided ref",
|
||||
opts: ListOptions{
|
||||
Ref: "refs/heads/main",
|
||||
},
|
||||
stubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
func(req *http.Request) bool {
|
||||
return req.URL.Query().Get("ref") == "refs/heads/main"
|
||||
},
|
||||
httpmock.JSONResponse(shared.CachePayload{
|
||||
ActionsCaches: []shared.Cache{},
|
||||
TotalCount: 0,
|
||||
}))
|
||||
},
|
||||
// We could put anything here, we're really asserting that the key is passed
|
||||
// to the API.
|
||||
wantErr: true,
|
||||
wantErrMsg: "No caches found in OWNER/REPO",
|
||||
},
|
||||
{
|
||||
name: "displays no results",
|
||||
stubs: func(reg *httpmock.Registry) {
|
||||
|
|
|
|||
4
pkg/cmd/cache/shared/shared.go
vendored
4
pkg/cmd/cache/shared/shared.go
vendored
|
|
@ -40,6 +40,7 @@ type GetCachesOptions struct {
|
|||
Order string
|
||||
Sort string
|
||||
Key string
|
||||
Ref string
|
||||
}
|
||||
|
||||
// Return a list of caches for a repository. Pass a negative limit to request
|
||||
|
|
@ -62,6 +63,9 @@ func GetCaches(client *api.Client, repo ghrepo.Interface, opts GetCachesOptions)
|
|||
if opts.Key != "" {
|
||||
path += fmt.Sprintf("&key=%s", url.QueryEscape(opts.Key))
|
||||
}
|
||||
if opts.Ref != "" {
|
||||
path += fmt.Sprintf("&ref=%s", url.QueryEscape(opts.Ref))
|
||||
}
|
||||
|
||||
var result *CachePayload
|
||||
pagination:
|
||||
|
|
|
|||
|
|
@ -425,7 +425,7 @@ func initDefaultTitleBody(ctx CreateContext, state *shared.IssueMetadataState, u
|
|||
return err
|
||||
}
|
||||
|
||||
if useFirstCommit {
|
||||
if len(commits) == 1 || useFirstCommit {
|
||||
state.Title = commits[len(commits)-1].Title
|
||||
state.Body = commits[len(commits)-1].Body
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -627,7 +627,7 @@ func Test_createRun(t *testing.T) {
|
|||
}))
|
||||
},
|
||||
cmdStubs: func(cs *run.CommandStubber) {
|
||||
cs.Register(`git( .+)? log( .+)? origin/master\.\.\.feature`, 0, "d3476a1,commit 0\n7a6ea13,commit 1")
|
||||
cs.Register(`git( .+)? log( .+)? origin/master\.\.\.feature`, 0, "d3476a1\u0000commit 0\u0000\u0000\n7a6ea13\u0000commit 1\u0000\u0000")
|
||||
},
|
||||
promptStubs: func(pm *prompter.PrompterMock) {
|
||||
pm.MarkdownEditorFunc = func(p, d string, ba bool) (string, error) {
|
||||
|
|
@ -851,7 +851,7 @@ func Test_createRun(t *testing.T) {
|
|||
}))
|
||||
},
|
||||
cmdStubs: func(cs *run.CommandStubber) {
|
||||
cs.Register(`git -c log.ShowSignature=false log --pretty=format:%H,%s,%b --cherry origin/master...feature`, 0, "")
|
||||
cs.Register(`git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry origin/master...feature`, 0, "")
|
||||
cs.Register(`git rev-parse --show-toplevel`, 0, "")
|
||||
},
|
||||
promptStubs: func(pm *prompter.PrompterMock) {
|
||||
|
|
@ -995,6 +995,80 @@ func Test_createRun(t *testing.T) {
|
|||
},
|
||||
expectedOut: "https://github.com/OWNER/REPO/pull/12\n",
|
||||
},
|
||||
{
|
||||
name: "single commit title and body are used",
|
||||
tty: true,
|
||||
setup: func(opts *CreateOptions, t *testing.T) func() {
|
||||
opts.HeadBranch = "feature"
|
||||
return func() {}
|
||||
},
|
||||
cmdStubs: func(cs *run.CommandStubber) {
|
||||
cs.Register(
|
||||
"git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry origin/master...feature",
|
||||
0,
|
||||
"3a9b48085046d156c5acce8f3b3a0532cd706a4a\u0000first commit of pr\u0000first commit description\u0000\n",
|
||||
)
|
||||
cs.Register(`git rev-parse --show-toplevel`, 0, "")
|
||||
},
|
||||
promptStubs: func(pm *prompter.PrompterMock) {
|
||||
pm.SelectFunc = func(p, _ string, opts []string) (int, error) {
|
||||
if p == "Where should we push the 'feature' branch?" {
|
||||
return 0, nil
|
||||
} else {
|
||||
return -1, prompter.NoSuchPromptErr(p)
|
||||
}
|
||||
}
|
||||
|
||||
pm.InputFunc = func(p, d string) (string, error) {
|
||||
if p == "Title" {
|
||||
return d, nil
|
||||
} else if p == "Body" {
|
||||
return d, nil
|
||||
} else {
|
||||
return "", prompter.NoSuchPromptErr(p)
|
||||
}
|
||||
}
|
||||
|
||||
pm.MarkdownEditorFunc = func(p, d string, ba bool) (string, error) {
|
||||
if p == "Body" {
|
||||
return d, nil
|
||||
} else {
|
||||
return "", prompter.NoSuchPromptErr(p)
|
||||
}
|
||||
}
|
||||
|
||||
pm.SelectFunc = func(p, _ string, opts []string) (int, error) {
|
||||
if p == "What's next?" {
|
||||
return 0, nil
|
||||
} else {
|
||||
return -1, prompter.NoSuchPromptErr(p)
|
||||
}
|
||||
}
|
||||
},
|
||||
httpStubs: func(reg *httpmock.Registry, t *testing.T) {
|
||||
reg.Register(
|
||||
httpmock.GraphQL(`query PullRequestTemplates\b`),
|
||||
httpmock.StringResponse(`{ "data": { "repository": { "pullRequestTemplates": [] } } }`),
|
||||
)
|
||||
reg.Register(
|
||||
httpmock.GraphQL(`mutation PullRequestCreate\b`),
|
||||
httpmock.GraphQLMutation(`
|
||||
{
|
||||
"data": { "createPullRequest": { "pullRequest": {
|
||||
"URL": "https://github.com/OWNER/REPO/pull/12"
|
||||
} } }
|
||||
}
|
||||
`,
|
||||
func(input map[string]interface{}) {
|
||||
assert.Equal(t, "first commit of pr", input["title"], "pr title should be first commit message")
|
||||
assert.Equal(t, "first commit description", input["body"], "pr body should be first commit description")
|
||||
},
|
||||
),
|
||||
)
|
||||
},
|
||||
expectedOut: "https://github.com/OWNER/REPO/pull/12\n",
|
||||
expectedErrOut: "\nCreating pull request for feature into master in OWNER/REPO\n\n",
|
||||
},
|
||||
{
|
||||
name: "fill-first flag provided",
|
||||
tty: true,
|
||||
|
|
@ -1005,10 +1079,10 @@ func Test_createRun(t *testing.T) {
|
|||
},
|
||||
cmdStubs: func(cs *run.CommandStubber) {
|
||||
cs.Register(
|
||||
"git -c log.ShowSignature=false log --pretty=format:%H,%s,%b --cherry origin/master...feature",
|
||||
"git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry origin/master...feature",
|
||||
0,
|
||||
"56b6f8bb7c9e3a30093cd17e48934ce354148e80,second commit of pr\n"+
|
||||
"3a9b48085046d156c5acce8f3b3a0532cd706a4a,first commit of pr,first commit description\n",
|
||||
"56b6f8bb7c9e3a30093cd17e48934ce354148e80\u0000second commit of pr\u0000\u0000\n"+
|
||||
"3a9b48085046d156c5acce8f3b3a0532cd706a4a\u0000first commit of pr\u0000first commit description\u0000\n",
|
||||
)
|
||||
},
|
||||
httpStubs: func(reg *httpmock.Registry, t *testing.T) {
|
||||
|
|
@ -1041,20 +1115,20 @@ func Test_createRun(t *testing.T) {
|
|||
},
|
||||
cmdStubs: func(cs *run.CommandStubber) {
|
||||
cs.Register(
|
||||
"git -c log.ShowSignature=false log --pretty=format:%H,%s,%b --cherry origin/master...feature",
|
||||
"git -c log.ShowSignature=false log --pretty=format:%H%x00%s%x00%b%x00 --cherry origin/master...feature",
|
||||
0,
|
||||
"56b6f8bb7c9e3a30093cd17e48934ce354148e80,second commit of pr,second commit description\n"+
|
||||
"3a9b48085046d156c5acce8f3b3a0532cd706a4a,first commit of pr,first commit with super long description, with super long description, with super long description, with super long description.\n",
|
||||
"56b6f8bb7c9e3a30093cd17e48934ce354148e80\u0000second commit of pr\u0000second commit description\u0000\n"+
|
||||
"3a9b48085046d156c5acce8f3b3a0532cd706a4a\u0000first commit of pr\u0000first commit with super long description, with super long description, with super long description, with super long description.\u0000\n",
|
||||
)
|
||||
},
|
||||
httpStubs: func(reg *httpmock.Registry, t *testing.T) {
|
||||
reg.Register(
|
||||
httpmock.GraphQL(`mutation PullRequestCreate\b`),
|
||||
httpmock.GraphQLMutation(`
|
||||
{
|
||||
{
|
||||
"data": { "createPullRequest": { "pullRequest": {
|
||||
"URL": "https://github.com/OWNER/REPO/pull/12"
|
||||
} } }
|
||||
} } }
|
||||
}
|
||||
`,
|
||||
func(input map[string]interface{}) {
|
||||
|
|
|
|||
232
pkg/cmd/project/link/link.go
Normal file
232
pkg/cmd/project/link/link.go
Normal file
|
|
@ -0,0 +1,232 @@
|
|||
package link
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/MakeNowJust/heredoc"
|
||||
"github.com/cli/cli/v2/api"
|
||||
"github.com/cli/cli/v2/internal/config"
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/cli/cli/v2/pkg/cmd/project/shared/client"
|
||||
"github.com/cli/cli/v2/pkg/cmd/project/shared/queries"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/spf13/cobra"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type linkOpts struct {
|
||||
number int32
|
||||
host string
|
||||
owner string
|
||||
repo string
|
||||
team string
|
||||
projectID string
|
||||
projectTitle string
|
||||
repoID string
|
||||
teamID string
|
||||
}
|
||||
|
||||
type linkConfig struct {
|
||||
httpClient func() (*http.Client, error)
|
||||
config func() (config.Config, error)
|
||||
client *queries.Client
|
||||
opts linkOpts
|
||||
io *iostreams.IOStreams
|
||||
}
|
||||
|
||||
func NewCmdLink(f *cmdutil.Factory, runF func(config linkConfig) error) *cobra.Command {
|
||||
opts := linkOpts{}
|
||||
linkCmd := &cobra.Command{
|
||||
Short: "Link a project to a repository or a team",
|
||||
Use: "link [<number>] [flag]",
|
||||
Example: heredoc.Doc(`
|
||||
# link monalisa's project 1 to her repository "my_repo"
|
||||
gh project link 1 --owner monalisa --repo my_repo
|
||||
|
||||
# link monalisa's organization's project 1 to her team "my_team"
|
||||
gh project link 1 --owner my_organization --team my_team
|
||||
|
||||
# link monalisa's project 1 to the repository of current directory if neither --repo nor --team is specified
|
||||
gh project link 1
|
||||
`),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
client, err := client.New(f)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if len(args) == 1 {
|
||||
num, err := strconv.ParseInt(args[0], 10, 32)
|
||||
if err != nil {
|
||||
return cmdutil.FlagErrorf("invalid number: %v", args[0])
|
||||
}
|
||||
opts.number = int32(num)
|
||||
}
|
||||
|
||||
if opts.repo == "" && opts.team == "" {
|
||||
repo, err := f.BaseRepo()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
opts.repo = repo.RepoName()
|
||||
if opts.owner == "" {
|
||||
opts.owner = repo.RepoOwner()
|
||||
}
|
||||
}
|
||||
|
||||
if err := cmdutil.MutuallyExclusive("specify only one of `--repo` or `--team`", opts.repo != "", opts.team != ""); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err = validateRepoOrTeamFlag(&opts); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
config := linkConfig{
|
||||
httpClient: f.HttpClient,
|
||||
config: f.Config,
|
||||
client: client,
|
||||
opts: opts,
|
||||
io: f.IOStreams,
|
||||
}
|
||||
|
||||
// allow testing of the command without actually running it
|
||||
if runF != nil {
|
||||
return runF(config)
|
||||
}
|
||||
return runLink(config)
|
||||
},
|
||||
}
|
||||
|
||||
cmdutil.EnableRepoOverride(linkCmd, f)
|
||||
linkCmd.Flags().StringVar(&opts.owner, "owner", "", "Login of the owner. Use \"@me\" for the current user.")
|
||||
linkCmd.Flags().StringVarP(&opts.repo, "repo", "R", "", "The repository to be linked to this project")
|
||||
linkCmd.Flags().StringVarP(&opts.team, "team", "T", "", "The team to be linked to this project")
|
||||
|
||||
return linkCmd
|
||||
}
|
||||
|
||||
func validateRepoOrTeamFlag(opts *linkOpts) error {
|
||||
|
||||
linkedTarget := ""
|
||||
if opts.repo != "" {
|
||||
linkedTarget = opts.repo
|
||||
} else if opts.team != "" {
|
||||
linkedTarget = opts.team
|
||||
}
|
||||
|
||||
if strings.Contains(linkedTarget, "/") {
|
||||
nameArgs := strings.Split(linkedTarget, "/")
|
||||
var host, owner, name string
|
||||
|
||||
if len(nameArgs) == 2 {
|
||||
owner = nameArgs[0]
|
||||
name = nameArgs[1]
|
||||
} else if len(nameArgs) == 3 {
|
||||
host = nameArgs[0]
|
||||
owner = nameArgs[1]
|
||||
name = nameArgs[2]
|
||||
} else {
|
||||
if opts.repo != "" {
|
||||
return fmt.Errorf("expected the \"[HOST/]OWNER/REPO\" or \"REPO\" format, got \"%s\"", linkedTarget)
|
||||
} else if opts.team != "" {
|
||||
return fmt.Errorf("expected the \"[HOST/]OWNER/TEAM\" or \"TEAM\" format, got \"%s\"", linkedTarget)
|
||||
}
|
||||
}
|
||||
|
||||
if opts.owner != "" && opts.owner != owner {
|
||||
return fmt.Errorf("'%s' has different owner from '%s'", linkedTarget, opts.owner)
|
||||
}
|
||||
|
||||
opts.owner = owner
|
||||
opts.host = host
|
||||
if opts.repo != "" {
|
||||
opts.repo = name
|
||||
} else if opts.team != "" {
|
||||
opts.team = name
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func runLink(config linkConfig) error {
|
||||
canPrompt := config.io.CanPrompt()
|
||||
owner, err := config.client.NewOwner(canPrompt, config.opts.owner)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
config.opts.owner = owner.Login
|
||||
|
||||
project, err := config.client.NewProject(canPrompt, owner, config.opts.number, false)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
config.opts.projectTitle = project.Title
|
||||
config.opts.projectID = project.ID
|
||||
if config.opts.number == 0 {
|
||||
config.opts.number = project.Number
|
||||
}
|
||||
|
||||
httpClient, err := config.httpClient()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
c := api.NewClientFromHTTP(httpClient)
|
||||
|
||||
if config.opts.host == "" {
|
||||
cfg, err := config.config()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
host, _ := cfg.Authentication().DefaultHost()
|
||||
config.opts.host = host
|
||||
}
|
||||
|
||||
if config.opts.repo != "" {
|
||||
return linkRepo(c, config)
|
||||
} else if config.opts.team != "" {
|
||||
return linkTeam(c, config)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func linkRepo(c *api.Client, config linkConfig) error {
|
||||
repo, err := api.GitHubRepo(c, ghrepo.NewWithHost(config.opts.owner, config.opts.repo, config.opts.host))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
config.opts.repoID = repo.ID
|
||||
|
||||
err = config.client.LinkProjectToRepository(config.opts.projectID, config.opts.repoID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return printResults(config, config.opts.repo)
|
||||
}
|
||||
|
||||
func linkTeam(c *api.Client, config linkConfig) error {
|
||||
team, err := api.OrganizationTeam(c, config.opts.host, config.opts.owner, config.opts.team)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
config.opts.teamID = team.ID
|
||||
|
||||
err = config.client.LinkProjectToTeam(config.opts.projectID, config.opts.teamID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return printResults(config, config.opts.team)
|
||||
}
|
||||
|
||||
func printResults(config linkConfig, linkedTarget string) error {
|
||||
if !config.io.IsStdoutTTY() {
|
||||
return nil
|
||||
}
|
||||
|
||||
_, err := fmt.Fprintf(config.io.Out, "Linked '%s/%s' to project #%d '%s'\n", config.opts.owner, linkedTarget, config.opts.number, config.opts.projectTitle)
|
||||
return err
|
||||
}
|
||||
404
pkg/cmd/project/link/link_test.go
Normal file
404
pkg/cmd/project/link/link_test.go
Normal file
|
|
@ -0,0 +1,404 @@
|
|||
package link
|
||||
|
||||
import (
|
||||
"github.com/cli/cli/v2/internal/config"
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/cli/cli/v2/pkg/cmd/project/shared/queries"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/google/shlex"
|
||||
"github.com/stretchr/testify/require"
|
||||
"gopkg.in/h2non/gock.v1"
|
||||
"net/http"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestNewCmdLink(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
cli string
|
||||
wants linkOpts
|
||||
wantsErr bool
|
||||
wantsErrMsg string
|
||||
wantsExporter bool
|
||||
}{
|
||||
{
|
||||
name: "not-a-number",
|
||||
cli: "x",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "invalid number: x",
|
||||
},
|
||||
{
|
||||
name: "specify-repo-and-team",
|
||||
cli: "--repo my-repo --team my-team",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "specify only one of `--repo` or `--team`",
|
||||
},
|
||||
{
|
||||
name: "specify-nothing",
|
||||
cli: "",
|
||||
wants: linkOpts{
|
||||
owner: "OWNER",
|
||||
repo: "REPO",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "repo",
|
||||
cli: "--repo my-repo",
|
||||
wants: linkOpts{
|
||||
repo: "my-repo",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "repo-flag-contains-owner",
|
||||
cli: "--repo monalisa/my-repo",
|
||||
wants: linkOpts{
|
||||
owner: "monalisa",
|
||||
repo: "my-repo",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "repo-flag-contains-owner-and-host",
|
||||
cli: "--repo github.com/monalisa/my-repo",
|
||||
wants: linkOpts{
|
||||
host: "github.com",
|
||||
owner: "monalisa",
|
||||
repo: "my-repo",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "repo-flag-contains-wrong-format",
|
||||
cli: "--repo h/e/l/l/o",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "expected the \"[HOST/]OWNER/REPO\" or \"REPO\" format, got \"h/e/l/l/o\"",
|
||||
},
|
||||
{
|
||||
name: "repo-flag-with-owner-different-from-owner-flag",
|
||||
cli: "--repo monalisa/my-repo --owner leonardo",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "'monalisa/my-repo' has different owner from 'leonardo'",
|
||||
},
|
||||
{
|
||||
name: "team",
|
||||
cli: "--team my-team",
|
||||
wants: linkOpts{
|
||||
team: "my-team",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "team-flag-contains-owner",
|
||||
cli: "--team my-org/my-team",
|
||||
wants: linkOpts{
|
||||
owner: "my-org",
|
||||
team: "my-team",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "team-flag-contains-owner-and-host",
|
||||
cli: "--team github.com/my-org/my-team",
|
||||
wants: linkOpts{
|
||||
host: "github.com",
|
||||
owner: "my-org",
|
||||
team: "my-team",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "team-flag-contains-wrong-format",
|
||||
cli: "--team h/e/l/l/o",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "expected the \"[HOST/]OWNER/TEAM\" or \"TEAM\" format, got \"h/e/l/l/o\"",
|
||||
},
|
||||
{
|
||||
name: "team-flag-with-owner-different-from-owner-flag",
|
||||
cli: "--team my-org/my-team --owner her-org",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "'my-org/my-team' has different owner from 'her-org'",
|
||||
},
|
||||
{
|
||||
name: "number",
|
||||
cli: "123 --repo my-repo",
|
||||
wants: linkOpts{
|
||||
number: 123,
|
||||
repo: "my-repo",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "owner-with-repo-flag",
|
||||
cli: "--repo my-repo --owner monalisa",
|
||||
wants: linkOpts{
|
||||
owner: "monalisa",
|
||||
repo: "my-repo",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "owner-without-repo-flag",
|
||||
cli: "--owner monalisa",
|
||||
wants: linkOpts{
|
||||
owner: "monalisa",
|
||||
repo: "REPO",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
t.Setenv("GH_TOKEN", "auth-token")
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
ios, _, _, _ := iostreams.Test()
|
||||
f := &cmdutil.Factory{
|
||||
IOStreams: ios,
|
||||
BaseRepo: func() (ghrepo.Interface, error) {
|
||||
return ghrepo.New("OWNER", "REPO"), nil
|
||||
},
|
||||
}
|
||||
|
||||
argv, err := shlex.Split(tt.cli)
|
||||
require.NoError(t, err)
|
||||
|
||||
var gotOpts linkOpts
|
||||
cmd := NewCmdLink(f, func(config linkConfig) error {
|
||||
gotOpts = config.opts
|
||||
return nil
|
||||
})
|
||||
|
||||
cmd.SetArgs(argv)
|
||||
_, err = cmd.ExecuteC()
|
||||
if tt.wantsErr {
|
||||
require.Error(t, err)
|
||||
require.Equal(t, tt.wantsErrMsg, err.Error())
|
||||
return
|
||||
}
|
||||
require.NoError(t, err)
|
||||
|
||||
require.Equal(t, tt.wants.number, gotOpts.number)
|
||||
require.Equal(t, tt.wants.owner, gotOpts.owner)
|
||||
require.Equal(t, tt.wants.repo, gotOpts.repo)
|
||||
require.Equal(t, tt.wants.team, gotOpts.team)
|
||||
require.Equal(t, tt.wants.projectID, gotOpts.projectID)
|
||||
require.Equal(t, tt.wants.repoID, gotOpts.repoID)
|
||||
require.Equal(t, tt.wants.teamID, gotOpts.teamID)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunLink_Repo(t *testing.T) {
|
||||
defer gock.Off()
|
||||
gock.Observe(gock.DumpRequest)
|
||||
|
||||
// get user ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "query UserOrgOwner.*",
|
||||
"variables": map[string]string{
|
||||
"login": "monalisa",
|
||||
},
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"user": map[string]interface{}{
|
||||
"id": "an ID",
|
||||
"login": "monalisa",
|
||||
},
|
||||
},
|
||||
"errors": []interface{}{
|
||||
map[string]interface{}{
|
||||
"type": "NOT_FOUND",
|
||||
"path": []string{"organization"},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// get user project ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "query UserProject.*",
|
||||
"variables": map[string]interface{}{
|
||||
"login": "monalisa",
|
||||
"number": 1,
|
||||
"firstItems": 0,
|
||||
"afterItems": nil,
|
||||
"firstFields": 0,
|
||||
"afterFields": nil,
|
||||
},
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"user": map[string]interface{}{
|
||||
"projectV2": map[string]string{
|
||||
"id": "project-ID",
|
||||
"title": "first-project",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// link projectV2 to repository
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "mutation LinkProjectV2ToRepository.*",
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"linkProjectV2ToRepository": map[string]interface{}{},
|
||||
},
|
||||
})
|
||||
|
||||
// get repo ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
BodyString(`.*query RepositoryInfo.*`).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"repository": map[string]interface{}{
|
||||
"id": "repo-ID",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
ios, _, stdout, _ := iostreams.Test()
|
||||
ios.SetStdoutTTY(true)
|
||||
cfg := linkConfig{
|
||||
opts: linkOpts{
|
||||
number: 1,
|
||||
repo: "my-repo",
|
||||
owner: "monalisa",
|
||||
},
|
||||
client: queries.NewTestClient(),
|
||||
httpClient: func() (*http.Client, error) {
|
||||
return http.DefaultClient, nil
|
||||
},
|
||||
config: func() (config.Config, error) {
|
||||
return config.NewBlankConfig(), nil
|
||||
},
|
||||
io: ios,
|
||||
}
|
||||
|
||||
err := runLink(cfg)
|
||||
require.NoError(t, err)
|
||||
require.Equal(
|
||||
t,
|
||||
"Linked 'monalisa/my-repo' to project #1 'first-project'\n",
|
||||
stdout.String())
|
||||
}
|
||||
|
||||
func TestRunLink_Team(t *testing.T) {
|
||||
defer gock.Off()
|
||||
gock.Observe(gock.DumpRequest)
|
||||
|
||||
// get user ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "query UserOrgOwner.*",
|
||||
"variables": map[string]string{
|
||||
"login": "monalisa-org",
|
||||
},
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"user": map[string]interface{}{
|
||||
"id": "an ID",
|
||||
"login": "monalisa-org",
|
||||
},
|
||||
},
|
||||
"errors": []interface{}{
|
||||
map[string]interface{}{
|
||||
"type": "NOT_FOUND",
|
||||
"path": []string{"organization"},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// get user project ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "query UserProject.*",
|
||||
"variables": map[string]interface{}{
|
||||
"login": "monalisa-org",
|
||||
"number": 1,
|
||||
"firstItems": 0,
|
||||
"afterItems": nil,
|
||||
"firstFields": 0,
|
||||
"afterFields": nil,
|
||||
},
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"user": map[string]interface{}{
|
||||
"projectV2": map[string]string{
|
||||
"id": "project-ID",
|
||||
"title": "first-project",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// link projectV2 to team
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "mutation LinkProjectV2ToTeam.*",
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"linkProjectV2ToTeam": map[string]interface{}{},
|
||||
},
|
||||
})
|
||||
|
||||
// get team ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
BodyString(`.*query OrganizationTeam.*`).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"organization": map[string]interface{}{
|
||||
"team": map[string]interface{}{
|
||||
"id": "team-ID",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
ios, _, stdout, _ := iostreams.Test()
|
||||
ios.SetStdoutTTY(true)
|
||||
cfg := linkConfig{
|
||||
opts: linkOpts{
|
||||
number: 1,
|
||||
team: "my-team",
|
||||
owner: "monalisa-org",
|
||||
},
|
||||
client: queries.NewTestClient(),
|
||||
httpClient: func() (*http.Client, error) {
|
||||
return http.DefaultClient, nil
|
||||
},
|
||||
config: func() (config.Config, error) {
|
||||
return config.NewBlankConfig(), nil
|
||||
},
|
||||
io: ios,
|
||||
}
|
||||
|
||||
err := runLink(cfg)
|
||||
require.NoError(t, err)
|
||||
require.Equal(
|
||||
t,
|
||||
"Linked 'monalisa-org/my-team' to project #1 'first-project'\n",
|
||||
stdout.String())
|
||||
}
|
||||
|
|
@ -16,8 +16,10 @@ import (
|
|||
cmdItemDelete "github.com/cli/cli/v2/pkg/cmd/project/item-delete"
|
||||
cmdItemEdit "github.com/cli/cli/v2/pkg/cmd/project/item-edit"
|
||||
cmdItemList "github.com/cli/cli/v2/pkg/cmd/project/item-list"
|
||||
cmdLink "github.com/cli/cli/v2/pkg/cmd/project/link"
|
||||
cmdList "github.com/cli/cli/v2/pkg/cmd/project/list"
|
||||
cmdTemplate "github.com/cli/cli/v2/pkg/cmd/project/mark-template"
|
||||
cmdUnlink "github.com/cli/cli/v2/pkg/cmd/project/unlink"
|
||||
cmdView "github.com/cli/cli/v2/pkg/cmd/project/view"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/spf13/cobra"
|
||||
|
|
@ -43,8 +45,10 @@ func NewCmdProject(f *cmdutil.Factory) *cobra.Command {
|
|||
cmd.AddCommand(cmdClose.NewCmdClose(f, nil))
|
||||
cmd.AddCommand(cmdDelete.NewCmdDelete(f, nil))
|
||||
cmd.AddCommand(cmdEdit.NewCmdEdit(f, nil))
|
||||
cmd.AddCommand(cmdLink.NewCmdLink(f, nil))
|
||||
cmd.AddCommand(cmdView.NewCmdView(f, nil))
|
||||
cmd.AddCommand(cmdTemplate.NewCmdMarkTemplate(f, nil))
|
||||
cmd.AddCommand(cmdUnlink.NewCmdUnlink(f, nil))
|
||||
|
||||
// items
|
||||
cmd.AddCommand(cmdItemList.NewCmdList(f, nil))
|
||||
|
|
|
|||
|
|
@ -1353,6 +1353,82 @@ func (c *Client) Projects(login string, t OwnerType, limit int, fields bool) (Pr
|
|||
}
|
||||
}
|
||||
|
||||
type linkProjectToRepoMutation struct {
|
||||
LinkProjectV2ToRepository struct {
|
||||
ClientMutationId string `graphql:"clientMutationId"`
|
||||
} `graphql:"linkProjectV2ToRepository(input:$input)"`
|
||||
}
|
||||
|
||||
type linkProjectToTeamMutation struct {
|
||||
LinkProjectV2ToTeam struct {
|
||||
ClientMutationId string `graphql:"clientMutationId"`
|
||||
} `graphql:"linkProjectV2ToTeam(input:$input)"`
|
||||
}
|
||||
|
||||
type unlinkProjectFromRepoMutation struct {
|
||||
UnlinkProjectV2FromRepository struct {
|
||||
ClientMutationId string `graphql:"clientMutationId"`
|
||||
} `graphql:"unlinkProjectV2FromRepository(input:$input)"`
|
||||
}
|
||||
|
||||
type unlinkProjectFromTeamMutation struct {
|
||||
UnlinkProjectV2FromTeam struct {
|
||||
ClientMutationId string `graphql:"clientMutationId"`
|
||||
} `graphql:"unlinkProjectV2FromTeam(input:$input)"`
|
||||
}
|
||||
|
||||
// LinkProjectToRepository links a project to a repository.
|
||||
func (c *Client) LinkProjectToRepository(projectID string, repoID string) error {
|
||||
var mutation linkProjectToRepoMutation
|
||||
variables := map[string]interface{}{
|
||||
"input": githubv4.LinkProjectV2ToRepositoryInput{
|
||||
ProjectID: githubv4.String(projectID),
|
||||
RepositoryID: githubv4.ID(repoID),
|
||||
},
|
||||
}
|
||||
|
||||
return c.Mutate("LinkProjectV2ToRepository", &mutation, variables)
|
||||
}
|
||||
|
||||
// LinkProjectToTeam links a project to a team.
|
||||
func (c *Client) LinkProjectToTeam(projectID string, teamID string) error {
|
||||
var mutation linkProjectToTeamMutation
|
||||
variables := map[string]interface{}{
|
||||
"input": githubv4.LinkProjectV2ToTeamInput{
|
||||
ProjectID: githubv4.String(projectID),
|
||||
TeamID: githubv4.ID(teamID),
|
||||
},
|
||||
}
|
||||
|
||||
return c.Mutate("LinkProjectV2ToTeam", &mutation, variables)
|
||||
}
|
||||
|
||||
// UnlinkProjectFromRepository unlinks a project from a repository.
|
||||
func (c *Client) UnlinkProjectFromRepository(projectID string, repoID string) error {
|
||||
var mutation unlinkProjectFromRepoMutation
|
||||
variables := map[string]interface{}{
|
||||
"input": githubv4.UnlinkProjectV2FromRepositoryInput{
|
||||
ProjectID: githubv4.String(projectID),
|
||||
RepositoryID: githubv4.ID(repoID),
|
||||
},
|
||||
}
|
||||
|
||||
return c.Mutate("UnlinkProjectV2FromRepository", &mutation, variables)
|
||||
}
|
||||
|
||||
// UnlinkProjectFromTeam unlinks a project from a team.
|
||||
func (c *Client) UnlinkProjectFromTeam(projectID string, teamID string) error {
|
||||
var mutation unlinkProjectFromTeamMutation
|
||||
variables := map[string]interface{}{
|
||||
"input": githubv4.UnlinkProjectV2FromTeamInput{
|
||||
ProjectID: githubv4.String(projectID),
|
||||
TeamID: githubv4.ID(teamID),
|
||||
},
|
||||
}
|
||||
|
||||
return c.Mutate("UnlinkProjectV2FromTeam", &mutation, variables)
|
||||
}
|
||||
|
||||
func handleError(err error) error {
|
||||
var gerr api.GraphQLError
|
||||
if errors.As(err, &gerr) {
|
||||
|
|
|
|||
232
pkg/cmd/project/unlink/unlink.go
Normal file
232
pkg/cmd/project/unlink/unlink.go
Normal file
|
|
@ -0,0 +1,232 @@
|
|||
package unlink
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/MakeNowJust/heredoc"
|
||||
"github.com/cli/cli/v2/api"
|
||||
"github.com/cli/cli/v2/internal/config"
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/cli/cli/v2/pkg/cmd/project/shared/client"
|
||||
"github.com/cli/cli/v2/pkg/cmd/project/shared/queries"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/spf13/cobra"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type unlinkOpts struct {
|
||||
number int32
|
||||
host string
|
||||
owner string
|
||||
repo string
|
||||
team string
|
||||
projectID string
|
||||
projectTitle string
|
||||
repoID string
|
||||
teamID string
|
||||
}
|
||||
|
||||
type unlinkConfig struct {
|
||||
httpClient func() (*http.Client, error)
|
||||
config func() (config.Config, error)
|
||||
client *queries.Client
|
||||
opts unlinkOpts
|
||||
io *iostreams.IOStreams
|
||||
}
|
||||
|
||||
func NewCmdUnlink(f *cmdutil.Factory, runF func(config unlinkConfig) error) *cobra.Command {
|
||||
opts := unlinkOpts{}
|
||||
linkCmd := &cobra.Command{
|
||||
Short: "Unlink a project from a repository or a team",
|
||||
Use: "unlink [<number>] [flag]",
|
||||
Example: heredoc.Doc(`
|
||||
# unlink monalisa's project 1 from her repository "my_repo"
|
||||
gh project unlink 1 --owner monalisa --repo my_repo
|
||||
|
||||
# unlink monalisa's organization's project 1 from her team "my_team"
|
||||
gh project unlink 1 --owner my_organization --team my_team
|
||||
|
||||
# unlink monalisa's project 1 from the repository of current directory if neither --repo nor --team is specified
|
||||
gh project unlink 1
|
||||
`),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
client, err := client.New(f)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if len(args) == 1 {
|
||||
num, err := strconv.ParseInt(args[0], 10, 32)
|
||||
if err != nil {
|
||||
return cmdutil.FlagErrorf("invalid number: %v", args[0])
|
||||
}
|
||||
opts.number = int32(num)
|
||||
}
|
||||
|
||||
if opts.repo == "" && opts.team == "" {
|
||||
repo, err := f.BaseRepo()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
opts.repo = repo.RepoName()
|
||||
if opts.owner == "" {
|
||||
opts.owner = repo.RepoOwner()
|
||||
}
|
||||
}
|
||||
|
||||
if err := cmdutil.MutuallyExclusive("specify only one of `--repo` or `--team`", opts.repo != "", opts.team != ""); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err = validateRepoOrTeamFlag(&opts); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
config := unlinkConfig{
|
||||
httpClient: f.HttpClient,
|
||||
config: f.Config,
|
||||
client: client,
|
||||
opts: opts,
|
||||
io: f.IOStreams,
|
||||
}
|
||||
|
||||
// allow testing of the command without actually running it
|
||||
if runF != nil {
|
||||
return runF(config)
|
||||
}
|
||||
return runUnlink(config)
|
||||
},
|
||||
}
|
||||
|
||||
cmdutil.EnableRepoOverride(linkCmd, f)
|
||||
linkCmd.Flags().StringVar(&opts.owner, "owner", "", "Login of the owner. Use \"@me\" for the current user.")
|
||||
linkCmd.Flags().StringVarP(&opts.repo, "repo", "R", "", "The repository to be unlinked from this project")
|
||||
linkCmd.Flags().StringVarP(&opts.team, "team", "T", "", "The team to be unlinked from this project")
|
||||
|
||||
return linkCmd
|
||||
}
|
||||
|
||||
func validateRepoOrTeamFlag(opts *unlinkOpts) error {
|
||||
|
||||
unlinkedTarget := ""
|
||||
if opts.repo != "" {
|
||||
unlinkedTarget = opts.repo
|
||||
} else if opts.team != "" {
|
||||
unlinkedTarget = opts.team
|
||||
}
|
||||
|
||||
if strings.Contains(unlinkedTarget, "/") {
|
||||
nameArgs := strings.Split(unlinkedTarget, "/")
|
||||
var host, owner, name string
|
||||
|
||||
if len(nameArgs) == 2 {
|
||||
owner = nameArgs[0]
|
||||
name = nameArgs[1]
|
||||
} else if len(nameArgs) == 3 {
|
||||
host = nameArgs[0]
|
||||
owner = nameArgs[1]
|
||||
name = nameArgs[2]
|
||||
} else {
|
||||
if opts.repo != "" {
|
||||
return fmt.Errorf("expected the \"[HOST/]OWNER/REPO\" or \"REPO\" format, got \"%s\"", unlinkedTarget)
|
||||
} else if opts.team != "" {
|
||||
return fmt.Errorf("expected the \"[HOST/]OWNER/TEAM\" or \"TEAM\" format, got \"%s\"", unlinkedTarget)
|
||||
}
|
||||
}
|
||||
|
||||
if opts.owner != "" && opts.owner != owner {
|
||||
return fmt.Errorf("'%s' has different owner from '%s'", unlinkedTarget, opts.owner)
|
||||
}
|
||||
|
||||
opts.owner = owner
|
||||
opts.host = host
|
||||
if opts.repo != "" {
|
||||
opts.repo = name
|
||||
} else if opts.team != "" {
|
||||
opts.team = name
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func runUnlink(config unlinkConfig) error {
|
||||
canPrompt := config.io.CanPrompt()
|
||||
owner, err := config.client.NewOwner(canPrompt, config.opts.owner)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
config.opts.owner = owner.Login
|
||||
|
||||
project, err := config.client.NewProject(canPrompt, owner, config.opts.number, false)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
config.opts.projectTitle = project.Title
|
||||
config.opts.projectID = project.ID
|
||||
if config.opts.number == 0 {
|
||||
config.opts.number = project.Number
|
||||
}
|
||||
|
||||
httpClient, err := config.httpClient()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
c := api.NewClientFromHTTP(httpClient)
|
||||
|
||||
if config.opts.host == "" {
|
||||
cfg, err := config.config()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
host, _ := cfg.Authentication().DefaultHost()
|
||||
config.opts.host = host
|
||||
}
|
||||
|
||||
if config.opts.repo != "" {
|
||||
return unlinkRepo(c, config)
|
||||
} else if config.opts.team != "" {
|
||||
return unlinkTeam(c, config)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func unlinkRepo(c *api.Client, config unlinkConfig) error {
|
||||
repo, err := api.GitHubRepo(c, ghrepo.NewWithHost(config.opts.owner, config.opts.repo, config.opts.host))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
config.opts.repoID = repo.ID
|
||||
|
||||
err = config.client.UnlinkProjectFromRepository(config.opts.projectID, config.opts.repoID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return printResults(config, config.opts.repo)
|
||||
}
|
||||
|
||||
func unlinkTeam(c *api.Client, config unlinkConfig) error {
|
||||
team, err := api.OrganizationTeam(c, config.opts.host, config.opts.owner, config.opts.team)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
config.opts.teamID = team.ID
|
||||
|
||||
err = config.client.UnlinkProjectFromTeam(config.opts.projectID, config.opts.teamID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return printResults(config, config.opts.team)
|
||||
}
|
||||
|
||||
func printResults(config unlinkConfig, linkedTarget string) error {
|
||||
if !config.io.IsStdoutTTY() {
|
||||
return nil
|
||||
}
|
||||
|
||||
_, err := fmt.Fprintf(config.io.Out, "Unlinked '%s/%s' from project #%d '%s'\n", config.opts.owner, linkedTarget, config.opts.number, config.opts.projectTitle)
|
||||
return err
|
||||
}
|
||||
404
pkg/cmd/project/unlink/unlink_test.go
Normal file
404
pkg/cmd/project/unlink/unlink_test.go
Normal file
|
|
@ -0,0 +1,404 @@
|
|||
package unlink
|
||||
|
||||
import (
|
||||
"github.com/cli/cli/v2/internal/config"
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/cli/cli/v2/pkg/cmd/project/shared/queries"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/google/shlex"
|
||||
"github.com/stretchr/testify/require"
|
||||
"gopkg.in/h2non/gock.v1"
|
||||
"net/http"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestNewCmdUnlink(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
cli string
|
||||
wants unlinkOpts
|
||||
wantsErr bool
|
||||
wantsErrMsg string
|
||||
wantsExporter bool
|
||||
}{
|
||||
{
|
||||
name: "not-a-number",
|
||||
cli: "x",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "invalid number: x",
|
||||
},
|
||||
{
|
||||
name: "specify-repo-and-team",
|
||||
cli: "--repo my-repo --team my-team",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "specify only one of `--repo` or `--team`",
|
||||
},
|
||||
{
|
||||
name: "specify-nothing",
|
||||
cli: "",
|
||||
wants: unlinkOpts{
|
||||
repo: "REPO",
|
||||
owner: "OWNER",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "repo",
|
||||
cli: "--repo my-repo",
|
||||
wants: unlinkOpts{
|
||||
repo: "my-repo",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "repo-flag-contains-owner",
|
||||
cli: "--repo monalisa/my-repo",
|
||||
wants: unlinkOpts{
|
||||
owner: "monalisa",
|
||||
repo: "my-repo",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "repo-flag-contains-owner-and-host",
|
||||
cli: "--repo github.com/monalisa/my-repo",
|
||||
wants: unlinkOpts{
|
||||
host: "github.com",
|
||||
owner: "monalisa",
|
||||
repo: "my-repo",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "repo-flag-contains-wrong-format",
|
||||
cli: "--repo h/e/l/l/o",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "expected the \"[HOST/]OWNER/REPO\" or \"REPO\" format, got \"h/e/l/l/o\"",
|
||||
},
|
||||
{
|
||||
name: "repo-flag-with-owner-different-from-owner-flag",
|
||||
cli: "--repo monalisa/my-repo --owner leonardo",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "'monalisa/my-repo' has different owner from 'leonardo'",
|
||||
},
|
||||
{
|
||||
name: "team",
|
||||
cli: "--team my-team",
|
||||
wants: unlinkOpts{
|
||||
team: "my-team",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "team-flag-contains-owner",
|
||||
cli: "--team my-org/my-team",
|
||||
wants: unlinkOpts{
|
||||
owner: "my-org",
|
||||
team: "my-team",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "team-flag-contains-owner-and-host",
|
||||
cli: "--team github.com/my-org/my-team",
|
||||
wants: unlinkOpts{
|
||||
host: "github.com",
|
||||
owner: "my-org",
|
||||
team: "my-team",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "team-flag-contains-wrong-format",
|
||||
cli: "--team h/e/l/l/o",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "expected the \"[HOST/]OWNER/TEAM\" or \"TEAM\" format, got \"h/e/l/l/o\"",
|
||||
},
|
||||
{
|
||||
name: "team-flag-with-owner-different-from-owner-flag",
|
||||
cli: "--team my-org/my-team --owner her-org",
|
||||
wantsErr: true,
|
||||
wantsErrMsg: "'my-org/my-team' has different owner from 'her-org'",
|
||||
},
|
||||
{
|
||||
name: "number",
|
||||
cli: "123 --repo my-repo",
|
||||
wants: unlinkOpts{
|
||||
number: 123,
|
||||
repo: "my-repo",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "owner-with-repo-flag",
|
||||
cli: "--repo my-repo --owner monalisa",
|
||||
wants: unlinkOpts{
|
||||
owner: "monalisa",
|
||||
repo: "my-repo",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "owner-without-repo-flag",
|
||||
cli: "--owner monalisa",
|
||||
wants: unlinkOpts{
|
||||
owner: "monalisa",
|
||||
repo: "REPO",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
t.Setenv("GH_TOKEN", "auth-token")
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
ios, _, _, _ := iostreams.Test()
|
||||
f := &cmdutil.Factory{
|
||||
IOStreams: ios,
|
||||
BaseRepo: func() (ghrepo.Interface, error) {
|
||||
return ghrepo.New("OWNER", "REPO"), nil
|
||||
},
|
||||
}
|
||||
|
||||
argv, err := shlex.Split(tt.cli)
|
||||
require.NoError(t, err)
|
||||
|
||||
var gotOpts unlinkOpts
|
||||
cmd := NewCmdUnlink(f, func(config unlinkConfig) error {
|
||||
gotOpts = config.opts
|
||||
return nil
|
||||
})
|
||||
|
||||
cmd.SetArgs(argv)
|
||||
_, err = cmd.ExecuteC()
|
||||
if tt.wantsErr {
|
||||
require.Error(t, err)
|
||||
require.Equal(t, tt.wantsErrMsg, err.Error())
|
||||
return
|
||||
}
|
||||
require.NoError(t, err)
|
||||
|
||||
require.Equal(t, tt.wants.number, gotOpts.number)
|
||||
require.Equal(t, tt.wants.owner, gotOpts.owner)
|
||||
require.Equal(t, tt.wants.repo, gotOpts.repo)
|
||||
require.Equal(t, tt.wants.team, gotOpts.team)
|
||||
require.Equal(t, tt.wants.projectID, gotOpts.projectID)
|
||||
require.Equal(t, tt.wants.repoID, gotOpts.repoID)
|
||||
require.Equal(t, tt.wants.teamID, gotOpts.teamID)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunUnlink_Repo(t *testing.T) {
|
||||
defer gock.Off()
|
||||
gock.Observe(gock.DumpRequest)
|
||||
|
||||
// get user ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "query UserOrgOwner.*",
|
||||
"variables": map[string]string{
|
||||
"login": "monalisa",
|
||||
},
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"user": map[string]interface{}{
|
||||
"id": "an ID",
|
||||
"login": "monalisa",
|
||||
},
|
||||
},
|
||||
"errors": []interface{}{
|
||||
map[string]interface{}{
|
||||
"type": "NOT_FOUND",
|
||||
"path": []string{"organization"},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// get user project ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "query UserProject.*",
|
||||
"variables": map[string]interface{}{
|
||||
"login": "monalisa",
|
||||
"number": 1,
|
||||
"firstItems": 0,
|
||||
"afterItems": nil,
|
||||
"firstFields": 0,
|
||||
"afterFields": nil,
|
||||
},
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"user": map[string]interface{}{
|
||||
"projectV2": map[string]string{
|
||||
"id": "project-ID",
|
||||
"title": "first-project",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// unlink projectV2 from repository
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "mutation UnlinkProjectV2FromRepository.*",
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"unlinkProjectV2FromRepository": map[string]interface{}{},
|
||||
},
|
||||
})
|
||||
|
||||
// get repo ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
BodyString(`.*query RepositoryInfo.*`).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"repository": map[string]interface{}{
|
||||
"id": "repo-ID",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
ios, _, stdout, _ := iostreams.Test()
|
||||
ios.SetStdoutTTY(true)
|
||||
cfg := unlinkConfig{
|
||||
opts: unlinkOpts{
|
||||
number: 1,
|
||||
repo: "my-repo",
|
||||
owner: "monalisa",
|
||||
},
|
||||
client: queries.NewTestClient(),
|
||||
httpClient: func() (*http.Client, error) {
|
||||
return http.DefaultClient, nil
|
||||
},
|
||||
config: func() (config.Config, error) {
|
||||
return config.NewBlankConfig(), nil
|
||||
},
|
||||
io: ios,
|
||||
}
|
||||
|
||||
err := runUnlink(cfg)
|
||||
require.NoError(t, err)
|
||||
require.Equal(
|
||||
t,
|
||||
"Unlinked 'monalisa/my-repo' from project #1 'first-project'\n",
|
||||
stdout.String())
|
||||
}
|
||||
|
||||
func TestRunUnlink_Team(t *testing.T) {
|
||||
defer gock.Off()
|
||||
gock.Observe(gock.DumpRequest)
|
||||
|
||||
// get user ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "query UserOrgOwner.*",
|
||||
"variables": map[string]string{
|
||||
"login": "monalisa-org",
|
||||
},
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"user": map[string]interface{}{
|
||||
"id": "an ID",
|
||||
"login": "monalisa-org",
|
||||
},
|
||||
},
|
||||
"errors": []interface{}{
|
||||
map[string]interface{}{
|
||||
"type": "NOT_FOUND",
|
||||
"path": []string{"organization"},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// get user project ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "query UserProject.*",
|
||||
"variables": map[string]interface{}{
|
||||
"login": "monalisa-org",
|
||||
"number": 1,
|
||||
"firstItems": 0,
|
||||
"afterItems": nil,
|
||||
"firstFields": 0,
|
||||
"afterFields": nil,
|
||||
},
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"user": map[string]interface{}{
|
||||
"projectV2": map[string]string{
|
||||
"id": "project-ID",
|
||||
"title": "first-project",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// unlink projectV2 from team
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
MatchType("json").
|
||||
JSON(map[string]interface{}{
|
||||
"query": "mutation UnlinkProjectV2FromTeam.*",
|
||||
}).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"unlinkProjectV2FromTeam": map[string]interface{}{},
|
||||
},
|
||||
})
|
||||
|
||||
// get team ID
|
||||
gock.New("https://api.github.com").
|
||||
Post("/graphql").
|
||||
BodyString(`.*query OrganizationTeam.*`).
|
||||
Reply(200).
|
||||
JSON(map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"organization": map[string]interface{}{
|
||||
"team": map[string]interface{}{
|
||||
"id": "team-ID",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
ios, _, stdout, _ := iostreams.Test()
|
||||
ios.SetStdoutTTY(true)
|
||||
cfg := unlinkConfig{
|
||||
opts: unlinkOpts{
|
||||
number: 1,
|
||||
team: "my-team",
|
||||
owner: "monalisa-org",
|
||||
},
|
||||
client: queries.NewTestClient(),
|
||||
httpClient: func() (*http.Client, error) {
|
||||
return http.DefaultClient, nil
|
||||
},
|
||||
config: func() (config.Config, error) {
|
||||
return config.NewBlankConfig(), nil
|
||||
},
|
||||
io: ios,
|
||||
}
|
||||
|
||||
err := runUnlink(cfg)
|
||||
require.NoError(t, err)
|
||||
require.Equal(
|
||||
t,
|
||||
"Unlinked 'monalisa-org/my-team' from project #1 'first-project'\n",
|
||||
stdout.String())
|
||||
}
|
||||
|
|
@ -236,16 +236,15 @@ func gardenRun(opts *GardenOptions) error {
|
|||
}
|
||||
}()
|
||||
|
||||
mainLoop:
|
||||
for {
|
||||
oldX := player.X
|
||||
oldY := player.Y
|
||||
|
||||
d := <-dirc
|
||||
if d == Quit {
|
||||
break mainLoop
|
||||
break
|
||||
} else if !player.move(d) {
|
||||
continue mainLoop
|
||||
continue
|
||||
}
|
||||
|
||||
underPlayer := garden[player.Y][player.X]
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ func setVariable(client *api.Client, host string, opts setOptions) setResult {
|
|||
return result
|
||||
} else if errors.As(err, &postErr) && postErr.StatusCode == 409 {
|
||||
// Server will return a 409 if variable already exists
|
||||
result.Operation = createdOperation
|
||||
result.Operation = updatedOperation
|
||||
err = patchRepoVariable(client, opts.Repository, opts.Key, opts.Value)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue