diff --git a/.goreleaser.yml b/.goreleaser.yml index 32951cd4c..4c5f62a06 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -15,7 +15,7 @@ builds: binary: bin/gh main: ./cmd/gh ldflags: - - -s -w -X github.com/cli/cli/internal/build.Version={{.Version}} -X github.com/cli/cli/internal/build.Date={{time "2006-01-02"}} + - -s -w -X github.com/cli/cli/v2/internal/build.Version={{.Version}} -X github.com/cli/cli/v2/internal/build.Date={{time "2006-01-02"}} - -X main.updaterEnabled=cli/cli id: macos goos: [darwin] diff --git a/api/client.go b/api/client.go index c11a7f7ed..a5741a42e 100644 --- a/api/client.go +++ b/api/client.go @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "github.com/cli/cli/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghinstance" "github.com/henvic/httpretty" "github.com/shurcooL/graphql" ) diff --git a/api/client_test.go b/api/client_test.go index fae0350b6..50665fddb 100644 --- a/api/client_test.go +++ b/api/client_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/pkg/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/api/queries_issue.go b/api/queries_issue.go index c67ad3bcc..d035e6ad8 100644 --- a/api/queries_issue.go +++ b/api/queries_issue.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/internal/ghrepo" "github.com/shurcooL/githubv4" ) diff --git a/api/queries_org.go b/api/queries_org.go index a47963aea..6f6dda100 100644 --- a/api/queries_org.go +++ b/api/queries_org.go @@ -3,7 +3,7 @@ package api import ( "context" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/internal/ghrepo" "github.com/shurcooL/githubv4" ) diff --git a/api/queries_pr.go b/api/queries_pr.go index 799776882..1e060b1da 100644 --- a/api/queries_pr.go +++ b/api/queries_pr.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/set" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/set" "github.com/shurcooL/githubv4" "golang.org/x/sync/errgroup" ) diff --git a/api/queries_pr_review.go b/api/queries_pr_review.go index 53eac3e78..bd345e977 100644 --- a/api/queries_pr_review.go +++ b/api/queries_pr_review.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/internal/ghrepo" "github.com/shurcooL/githubv4" ) diff --git a/api/queries_pr_test.go b/api/queries_pr_test.go index 537c71268..0d692b451 100644 --- a/api/queries_pr_test.go +++ b/api/queries_pr_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/api/queries_repo.go b/api/queries_repo.go index 2587fde1c..b1e41370d 100644 --- a/api/queries_repo.go +++ b/api/queries_repo.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/internal/ghrepo" "github.com/shurcooL/githubv4" ) diff --git a/api/queries_repo_test.go b/api/queries_repo_test.go index 50a2067f1..5fadf7cfc 100644 --- a/api/queries_repo_test.go +++ b/api/queries_repo_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/httpmock" ) func Test_RepoMetadata(t *testing.T) { diff --git a/cmd/gen-docs/main.go b/cmd/gen-docs/main.go index bfd4a12d0..22c4c95f9 100644 --- a/cmd/gen-docs/main.go +++ b/cmd/gen-docs/main.go @@ -6,10 +6,10 @@ import ( "path/filepath" "strings" - "github.com/cli/cli/internal/docs" - "github.com/cli/cli/pkg/cmd/root" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/docs" + "github.com/cli/cli/v2/pkg/cmd/root" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/pflag" ) diff --git a/cmd/gh/main.go b/cmd/gh/main.go index 05b4596b5..e2958a2e3 100644 --- a/cmd/gh/main.go +++ b/cmd/gh/main.go @@ -13,18 +13,18 @@ import ( surveyCore "github.com/AlecAivazis/survey/v2/core" "github.com/AlecAivazis/survey/v2/terminal" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/build" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/internal/update" - "github.com/cli/cli/pkg/cmd/alias/expand" - "github.com/cli/cli/pkg/cmd/factory" - "github.com/cli/cli/pkg/cmd/root" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/build" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/internal/update" + "github.com/cli/cli/v2/pkg/cmd/alias/expand" + "github.com/cli/cli/v2/pkg/cmd/factory" + "github.com/cli/cli/v2/pkg/cmd/root" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/utils" "github.com/cli/safeexec" "github.com/mattn/go-colorable" "github.com/mgutz/ansi" diff --git a/cmd/gh/main_test.go b/cmd/gh/main_test.go index 819cb2fb6..b428ff4b3 100644 --- a/cmd/gh/main_test.go +++ b/cmd/gh/main_test.go @@ -7,7 +7,7 @@ import ( "net" "testing" - "github.com/cli/cli/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/context/context.go b/context/context.go index 4c1a64c73..d549dc04c 100644 --- a/context/context.go +++ b/context/context.go @@ -6,11 +6,11 @@ import ( "sort" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/api" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" ) // cap the number of git remotes looked up, since the user might have an diff --git a/context/remote.go b/context/remote.go index 5ddfe38c9..b88f1cfa3 100644 --- a/context/remote.go +++ b/context/remote.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghrepo" ) // Remotes represents a set of git remotes diff --git a/context/remote_test.go b/context/remote_test.go index e9259b446..2f0fc50bb 100644 --- a/context/remote_test.go +++ b/context/remote_test.go @@ -4,8 +4,8 @@ import ( "net/url" "testing" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghrepo" "github.com/stretchr/testify/assert" ) diff --git a/git/git.go b/git/git.go index db80f6e31..9e3fe86fe 100644 --- a/git/git.go +++ b/git/git.go @@ -13,7 +13,7 @@ import ( "runtime" "strings" - "github.com/cli/cli/internal/run" + "github.com/cli/cli/v2/internal/run" "github.com/cli/safeexec" ) diff --git a/git/git_test.go b/git/git_test.go index 685b4d1c0..c43ad50c2 100644 --- a/git/git_test.go +++ b/git/git_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/cli/cli/internal/run" + "github.com/cli/cli/v2/internal/run" ) func setGitDir(t *testing.T, dir string) { diff --git a/git/remote.go b/git/remote.go index a4291b40f..f9dfbc4bd 100644 --- a/git/remote.go +++ b/git/remote.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/cli/cli/internal/run" + "github.com/cli/cli/v2/internal/run" ) var remoteRE = regexp.MustCompile(`(.+)\s+(.+)\s+\((push|fetch)\)`) diff --git a/git/ssh_config.go b/git/ssh_config.go index 7f2778fd9..a4e234a02 100644 --- a/git/ssh_config.go +++ b/git/ssh_config.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/cli/cli/internal/config" + "github.com/cli/cli/v2/internal/config" ) var ( diff --git a/go.mod b/go.mod index 05098173d..1de8b09f9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cli/cli +module github.com/cli/cli/v2 go 1.16 diff --git a/internal/authflow/flow.go b/internal/authflow/flow.go index aa878bd32..a2875c506 100644 --- a/internal/authflow/flow.go +++ b/internal/authflow/flow.go @@ -8,10 +8,10 @@ import ( "os" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/cli/oauth" ) diff --git a/internal/config/from_env.go b/internal/config/from_env.go index b2b02b39f..6373f1691 100644 --- a/internal/config/from_env.go +++ b/internal/config/from_env.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/cli/cli/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghinstance" ) const ( diff --git a/internal/config/from_file.go b/internal/config/from_file.go index f5a97930f..080143df4 100644 --- a/internal/config/from_file.go +++ b/internal/config/from_file.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/cli/cli/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghinstance" "gopkg.in/yaml.v3" ) diff --git a/internal/ghrepo/repo.go b/internal/ghrepo/repo.go index 84125a5b9..77ed0b140 100644 --- a/internal/ghrepo/repo.go +++ b/internal/ghrepo/repo.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghinstance" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghinstance" ) // Interface describes an object that represents a GitHub repository diff --git a/internal/update/update.go b/internal/update/update.go index f525544e9..6228ec359 100644 --- a/internal/update/update.go +++ b/internal/update/update.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" "github.com/hashicorp/go-version" "gopkg.in/yaml.v3" ) diff --git a/internal/update/update_test.go b/internal/update/update_test.go index 15759c500..282bd185f 100644 --- a/internal/update/update_test.go +++ b/internal/update/update_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/pkg/httpmock" ) func TestCheckForUpdate(t *testing.T) { diff --git a/pkg/cmd/actions/actions.go b/pkg/cmd/actions/actions.go index 350a96b15..1ce0dc233 100644 --- a/pkg/cmd/actions/actions.go +++ b/pkg/cmd/actions/actions.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/alias/alias.go b/pkg/cmd/alias/alias.go index 8c50d6ff9..46d7e2bc8 100644 --- a/pkg/cmd/alias/alias.go +++ b/pkg/cmd/alias/alias.go @@ -2,10 +2,10 @@ package alias import ( "github.com/MakeNowJust/heredoc" - deleteCmd "github.com/cli/cli/pkg/cmd/alias/delete" - listCmd "github.com/cli/cli/pkg/cmd/alias/list" - setCmd "github.com/cli/cli/pkg/cmd/alias/set" - "github.com/cli/cli/pkg/cmdutil" + deleteCmd "github.com/cli/cli/v2/pkg/cmd/alias/delete" + listCmd "github.com/cli/cli/v2/pkg/cmd/alias/list" + setCmd "github.com/cli/cli/v2/pkg/cmd/alias/set" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/alias/delete/delete.go b/pkg/cmd/alias/delete/delete.go index f8ee065c4..85372d181 100644 --- a/pkg/cmd/alias/delete/delete.go +++ b/pkg/cmd/alias/delete/delete.go @@ -3,9 +3,9 @@ package delete import ( "fmt" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/alias/delete/delete_test.go b/pkg/cmd/alias/delete/delete_test.go index 6348b361c..ae9e69307 100644 --- a/pkg/cmd/alias/delete/delete_test.go +++ b/pkg/cmd/alias/delete/delete_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/alias/expand/expand.go b/pkg/cmd/alias/expand/expand.go index e48262298..f67a93942 100644 --- a/pkg/cmd/alias/expand/expand.go +++ b/pkg/cmd/alias/expand/expand.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/findsh" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/findsh" "github.com/google/shlex" ) diff --git a/pkg/cmd/alias/expand/expand_test.go b/pkg/cmd/alias/expand/expand_test.go index b9535f7c7..33af4b073 100644 --- a/pkg/cmd/alias/expand/expand_test.go +++ b/pkg/cmd/alias/expand/expand_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" + "github.com/cli/cli/v2/internal/config" ) func TestExpandAlias(t *testing.T) { diff --git a/pkg/cmd/alias/list/list.go b/pkg/cmd/alias/list/list.go index a8576db5c..85609e7a4 100644 --- a/pkg/cmd/alias/list/list.go +++ b/pkg/cmd/alias/list/list.go @@ -5,10 +5,10 @@ import ( "sort" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/alias/list/list_test.go b/pkg/cmd/alias/list/list_test.go index b058a04ce..88943841c 100644 --- a/pkg/cmd/alias/list/list_test.go +++ b/pkg/cmd/alias/list/list_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/cmd/alias/set/set.go b/pkg/cmd/alias/set/set.go index 961ba32a7..22f8d4c73 100644 --- a/pkg/cmd/alias/set/set.go +++ b/pkg/cmd/alias/set/set.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/alias/set/set_test.go b/pkg/cmd/alias/set/set_test.go index 1d9a50515..e68ae88aa 100644 --- a/pkg/cmd/alias/set/set_test.go +++ b/pkg/cmd/alias/set/set_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/extensions" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/extensions" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" diff --git a/pkg/cmd/api/api.go b/pkg/cmd/api/api.go index b08c1ec6d..d68b0d773 100644 --- a/pkg/cmd/api/api.go +++ b/pkg/cmd/api/api.go @@ -17,14 +17,14 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/export" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/jsoncolor" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/export" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/jsoncolor" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/api/api_test.go b/pkg/cmd/api/api_test.go index 1a28c671d..daed26926 100644 --- a/pkg/cmd/api/api_test.go +++ b/pkg/cmd/api/api_test.go @@ -13,12 +13,12 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/export" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/export" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/api/http.go b/pkg/cmd/api/http.go index 974373e69..c056f312a 100644 --- a/pkg/cmd/api/http.go +++ b/pkg/cmd/api/http.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/cli/cli/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghinstance" ) func httpRequest(client *http.Client, hostname string, method string, p string, params interface{}, headers []string) (*http.Response, error) { diff --git a/pkg/cmd/auth/auth.go b/pkg/cmd/auth/auth.go index 6909f99f8..99d335a8d 100644 --- a/pkg/cmd/auth/auth.go +++ b/pkg/cmd/auth/auth.go @@ -1,12 +1,12 @@ package auth import ( - gitCredentialCmd "github.com/cli/cli/pkg/cmd/auth/gitcredential" - authLoginCmd "github.com/cli/cli/pkg/cmd/auth/login" - authLogoutCmd "github.com/cli/cli/pkg/cmd/auth/logout" - authRefreshCmd "github.com/cli/cli/pkg/cmd/auth/refresh" - authStatusCmd "github.com/cli/cli/pkg/cmd/auth/status" - "github.com/cli/cli/pkg/cmdutil" + gitCredentialCmd "github.com/cli/cli/v2/pkg/cmd/auth/gitcredential" + authLoginCmd "github.com/cli/cli/v2/pkg/cmd/auth/login" + authLogoutCmd "github.com/cli/cli/v2/pkg/cmd/auth/logout" + authRefreshCmd "github.com/cli/cli/v2/pkg/cmd/auth/refresh" + authStatusCmd "github.com/cli/cli/v2/pkg/cmd/auth/status" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/auth/gitcredential/helper.go b/pkg/cmd/auth/gitcredential/helper.go index 4f80afbe7..8d1ab7ff3 100644 --- a/pkg/cmd/auth/gitcredential/helper.go +++ b/pkg/cmd/auth/gitcredential/helper.go @@ -6,8 +6,8 @@ import ( "net/url" "strings" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/auth/gitcredential/helper_test.go b/pkg/cmd/auth/gitcredential/helper_test.go index c8f449526..7e30ec495 100644 --- a/pkg/cmd/auth/gitcredential/helper_test.go +++ b/pkg/cmd/auth/gitcredential/helper_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/iostreams" ) type tinyConfig map[string]string diff --git a/pkg/cmd/auth/login/login.go b/pkg/cmd/auth/login/login.go index 995405021..ad6aec33d 100644 --- a/pkg/cmd/auth/login/login.go +++ b/pkg/cmd/auth/login/login.go @@ -9,12 +9,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/pkg/cmd/auth/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/pkg/cmd/auth/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/auth/login/login_test.go b/pkg/cmd/auth/login/login_test.go index 17a2ade62..c3cde03cf 100644 --- a/pkg/cmd/auth/login/login_test.go +++ b/pkg/cmd/auth/login/login_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/auth/logout/logout.go b/pkg/cmd/auth/logout/logout.go index 8ad1263a9..670c4cc45 100644 --- a/pkg/cmd/auth/logout/logout.go +++ b/pkg/cmd/auth/logout/logout.go @@ -7,11 +7,11 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/auth/logout/logout_test.go b/pkg/cmd/auth/logout/logout_test.go index 03b439ac0..a5d46ef09 100644 --- a/pkg/cmd/auth/logout/logout_test.go +++ b/pkg/cmd/auth/logout/logout_test.go @@ -6,11 +6,11 @@ import ( "regexp" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/auth/refresh/refresh.go b/pkg/cmd/auth/refresh/refresh.go index 2763679f8..a756c30b1 100644 --- a/pkg/cmd/auth/refresh/refresh.go +++ b/pkg/cmd/auth/refresh/refresh.go @@ -6,12 +6,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/authflow" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmd/auth/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/authflow" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmd/auth/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/auth/refresh/refresh_test.go b/pkg/cmd/auth/refresh/refresh_test.go index e11592e23..02941cd9b 100644 --- a/pkg/cmd/auth/refresh/refresh_test.go +++ b/pkg/cmd/auth/refresh/refresh_test.go @@ -4,11 +4,11 @@ import ( "bytes" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/auth/shared/git_credential.go b/pkg/cmd/auth/shared/git_credential.go index 7c5e048d9..57a9b8429 100644 --- a/pkg/cmd/auth/shared/git_credential.go +++ b/pkg/cmd/auth/shared/git_credential.go @@ -9,9 +9,9 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" ) diff --git a/pkg/cmd/auth/shared/git_credential_test.go b/pkg/cmd/auth/shared/git_credential_test.go index 5a0b8b10b..58fe3988a 100644 --- a/pkg/cmd/auth/shared/git_credential_test.go +++ b/pkg/cmd/auth/shared/git_credential_test.go @@ -3,7 +3,7 @@ package shared import ( "testing" - "github.com/cli/cli/internal/run" + "github.com/cli/cli/v2/internal/run" ) func TestGitCredentialSetup_configureExisting(t *testing.T) { diff --git a/pkg/cmd/auth/shared/login_flow.go b/pkg/cmd/auth/shared/login_flow.go index 42369c466..0bac49b35 100644 --- a/pkg/cmd/auth/shared/login_flow.go +++ b/pkg/cmd/auth/shared/login_flow.go @@ -7,11 +7,11 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/authflow" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/authflow" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" ) type iconfig interface { diff --git a/pkg/cmd/auth/shared/login_flow_test.go b/pkg/cmd/auth/shared/login_flow_test.go index 521616dfa..530e34045 100644 --- a/pkg/cmd/auth/shared/login_flow_test.go +++ b/pkg/cmd/auth/shared/login_flow_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/auth/shared/oauth_scopes.go b/pkg/cmd/auth/shared/oauth_scopes.go index 20dbf9a83..35619ea7b 100644 --- a/pkg/cmd/auth/shared/oauth_scopes.go +++ b/pkg/cmd/auth/shared/oauth_scopes.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" ) type MissingScopesError struct { diff --git a/pkg/cmd/auth/shared/oauth_scopes_test.go b/pkg/cmd/auth/shared/oauth_scopes_test.go index 0f6bd9f32..450416c18 100644 --- a/pkg/cmd/auth/shared/oauth_scopes_test.go +++ b/pkg/cmd/auth/shared/oauth_scopes_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/pkg/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/auth/shared/ssh_keys.go b/pkg/cmd/auth/shared/ssh_keys.go index 9fddef288..97f5174e4 100644 --- a/pkg/cmd/auth/shared/ssh_keys.go +++ b/pkg/cmd/auth/shared/ssh_keys.go @@ -9,10 +9,10 @@ import ( "runtime" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmd/ssh-key/add" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmd/ssh-key/add" + "github.com/cli/cli/v2/pkg/prompt" "github.com/cli/safeexec" ) diff --git a/pkg/cmd/auth/status/status.go b/pkg/cmd/auth/status/status.go index 2be0813c0..f84004c87 100644 --- a/pkg/cmd/auth/status/status.go +++ b/pkg/cmd/auth/status/status.go @@ -6,11 +6,11 @@ import ( "net/http" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmd/auth/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmd/auth/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/auth/status/status_test.go b/pkg/cmd/auth/status/status_test.go index 2e4261981..07d32c422 100644 --- a/pkg/cmd/auth/status/status_test.go +++ b/pkg/cmd/auth/status/status_test.go @@ -6,10 +6,10 @@ import ( "regexp" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/browse/browse.go b/pkg/cmd/browse/browse.go index 6677e5d45..fdb500cbf 100644 --- a/pkg/cmd/browse/browse.go +++ b/pkg/cmd/browse/browse.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/browse/browse_test.go b/pkg/cmd/browse/browse_test.go index e89863b89..bf3349c3c 100644 --- a/pkg/cmd/browse/browse_test.go +++ b/pkg/cmd/browse/browse_test.go @@ -5,10 +5,10 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/completion/completion.go b/pkg/cmd/completion/completion.go index ecfa6ef65..e711d6db6 100644 --- a/pkg/cmd/completion/completion.go +++ b/pkg/cmd/completion/completion.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/completion/completion_test.go b/pkg/cmd/completion/completion_test.go index 3ce03f9b6..06b3d2f27 100644 --- a/pkg/cmd/completion/completion_test.go +++ b/pkg/cmd/completion/completion_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/config/config.go b/pkg/cmd/config/config.go index d5621605f..c011ddcf0 100644 --- a/pkg/cmd/config/config.go +++ b/pkg/cmd/config/config.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/cli/cli/internal/config" - cmdGet "github.com/cli/cli/pkg/cmd/config/get" - cmdSet "github.com/cli/cli/pkg/cmd/config/set" - "github.com/cli/cli/pkg/cmdutil" + "github.com/cli/cli/v2/internal/config" + cmdGet "github.com/cli/cli/v2/pkg/cmd/config/get" + cmdSet "github.com/cli/cli/v2/pkg/cmd/config/set" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/config/get/get.go b/pkg/cmd/config/get/get.go index a3ce55176..3a5634458 100644 --- a/pkg/cmd/config/get/get.go +++ b/pkg/cmd/config/get/get.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/config/get/get_test.go b/pkg/cmd/config/get/get_test.go index 1e2104dbd..7c5efa9be 100644 --- a/pkg/cmd/config/get/get_test.go +++ b/pkg/cmd/config/get/get_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/config/set/set.go b/pkg/cmd/config/set/set.go index d1a2d5c59..38a23c899 100644 --- a/pkg/cmd/config/set/set.go +++ b/pkg/cmd/config/set/set.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/config/set/set_test.go b/pkg/cmd/config/set/set_test.go index 56efc2ebd..cdd2e7c94 100644 --- a/pkg/cmd/config/set/set_test.go +++ b/pkg/cmd/config/set/set_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/extension/command.go b/pkg/cmd/extension/command.go index 0b4e5fdd7..0ea822e8c 100644 --- a/pkg/cmd/extension/command.go +++ b/pkg/cmd/extension/command.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/extensions" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/extensions" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/extension/command_test.go b/pkg/cmd/extension/command_test.go index 30833b723..9dc46b3ba 100644 --- a/pkg/cmd/extension/command_test.go +++ b/pkg/cmd/extension/command_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/extensions" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/extensions" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/extension/manager.go b/pkg/cmd/extension/manager.go index c7a62ccbf..b488704e5 100644 --- a/pkg/cmd/extension/manager.go +++ b/pkg/cmd/extension/manager.go @@ -14,9 +14,9 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/extensions" - "github.com/cli/cli/pkg/findsh" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/extensions" + "github.com/cli/cli/v2/pkg/findsh" "github.com/cli/safeexec" ) diff --git a/pkg/cmd/factory/default.go b/pkg/cmd/factory/default.go index 40fac08f9..961883b12 100644 --- a/pkg/cmd/factory/default.go +++ b/pkg/cmd/factory/default.go @@ -6,14 +6,14 @@ import ( "net/http" "os" - "github.com/cli/cli/api" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/extension" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/extension" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" ) func New(appVersion string) *cmdutil.Factory { diff --git a/pkg/cmd/factory/default_test.go b/pkg/cmd/factory/default_test.go index 03ea29153..d181628e7 100644 --- a/pkg/cmd/factory/default_test.go +++ b/pkg/cmd/factory/default_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/factory/http.go b/pkg/cmd/factory/http.go index 28dac1ed6..fd61f2dc7 100644 --- a/pkg/cmd/factory/http.go +++ b/pkg/cmd/factory/http.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/httpunix" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/httpunix" + "github.com/cli/cli/v2/pkg/iostreams" ) var timezoneNames = map[int]string{ diff --git a/pkg/cmd/factory/http_test.go b/pkg/cmd/factory/http_test.go index b02a914f8..1505d1b65 100644 --- a/pkg/cmd/factory/http_test.go +++ b/pkg/cmd/factory/http_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/cmd/factory/remote_resolver.go b/pkg/cmd/factory/remote_resolver.go index 0de709c29..44cd0242d 100644 --- a/pkg/cmd/factory/remote_resolver.go +++ b/pkg/cmd/factory/remote_resolver.go @@ -6,11 +6,11 @@ import ( "net/url" "sort" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/pkg/set" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/pkg/set" ) type remoteResolver struct { diff --git a/pkg/cmd/factory/remote_resolver_test.go b/pkg/cmd/factory/remote_resolver_test.go index ac4843f10..6d0b2dc6c 100644 --- a/pkg/cmd/factory/remote_resolver_test.go +++ b/pkg/cmd/factory/remote_resolver_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/gist/clone/clone.go b/pkg/cmd/gist/clone/clone.go index 7a20a650d..460e6fa1d 100644 --- a/pkg/cmd/gist/clone/clone.go +++ b/pkg/cmd/gist/clone/clone.go @@ -5,10 +5,10 @@ import ( "net/http" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/pkg/cmd/gist/clone/clone_test.go b/pkg/cmd/gist/clone/clone_test.go index f1e5b6d4d..1be434cc8 100644 --- a/pkg/cmd/gist/clone/clone_test.go +++ b/pkg/cmd/gist/clone/clone_test.go @@ -5,12 +5,12 @@ import ( "strings" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/gist/create/create.go b/pkg/cmd/gist/create/create.go index afd72851d..e58bff8d0 100644 --- a/pkg/cmd/gist/create/create.go +++ b/pkg/cmd/gist/create/create.go @@ -14,12 +14,12 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmd/gist/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmd/gist/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/gist/create/create_test.go b/pkg/cmd/gist/create/create_test.go index b454b1598..bbcc42707 100644 --- a/pkg/cmd/gist/create/create_test.go +++ b/pkg/cmd/gist/create/create_test.go @@ -10,12 +10,12 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmd/gist/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmd/gist/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/gist/delete/delete.go b/pkg/cmd/gist/delete/delete.go index 7490efedd..ce07093b0 100644 --- a/pkg/cmd/gist/delete/delete.go +++ b/pkg/cmd/gist/delete/delete.go @@ -5,11 +5,11 @@ import ( "net/http" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmd/gist/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmd/gist/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/gist/delete/delete_test.go b/pkg/cmd/gist/delete/delete_test.go index cf8bcb077..0d98a44c2 100644 --- a/pkg/cmd/gist/delete/delete_test.go +++ b/pkg/cmd/gist/delete/delete_test.go @@ -5,12 +5,12 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmd/gist/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmd/gist/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/gist/edit/edit.go b/pkg/cmd/gist/edit/edit.go index 8e24ef202..174b326cd 100644 --- a/pkg/cmd/gist/edit/edit.go +++ b/pkg/cmd/gist/edit/edit.go @@ -12,13 +12,13 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmd/gist/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/pkg/surveyext" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmd/gist/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/pkg/surveyext" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/gist/edit/edit_test.go b/pkg/cmd/gist/edit/edit_test.go index 82f7da744..cac99b923 100644 --- a/pkg/cmd/gist/edit/edit_test.go +++ b/pkg/cmd/gist/edit/edit_test.go @@ -8,12 +8,12 @@ import ( "path/filepath" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmd/gist/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmd/gist/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/gist/gist.go b/pkg/cmd/gist/gist.go index df7e0f575..3b0d5711c 100644 --- a/pkg/cmd/gist/gist.go +++ b/pkg/cmd/gist/gist.go @@ -2,13 +2,13 @@ package gist import ( "github.com/MakeNowJust/heredoc" - gistCloneCmd "github.com/cli/cli/pkg/cmd/gist/clone" - gistCreateCmd "github.com/cli/cli/pkg/cmd/gist/create" - gistDeleteCmd "github.com/cli/cli/pkg/cmd/gist/delete" - gistEditCmd "github.com/cli/cli/pkg/cmd/gist/edit" - gistListCmd "github.com/cli/cli/pkg/cmd/gist/list" - gistViewCmd "github.com/cli/cli/pkg/cmd/gist/view" - "github.com/cli/cli/pkg/cmdutil" + gistCloneCmd "github.com/cli/cli/v2/pkg/cmd/gist/clone" + gistCreateCmd "github.com/cli/cli/v2/pkg/cmd/gist/create" + gistDeleteCmd "github.com/cli/cli/v2/pkg/cmd/gist/delete" + gistEditCmd "github.com/cli/cli/v2/pkg/cmd/gist/edit" + gistListCmd "github.com/cli/cli/v2/pkg/cmd/gist/list" + gistViewCmd "github.com/cli/cli/v2/pkg/cmd/gist/view" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/gist/list/list.go b/pkg/cmd/gist/list/list.go index befb60e8c..374f15852 100644 --- a/pkg/cmd/gist/list/list.go +++ b/pkg/cmd/gist/list/list.go @@ -6,12 +6,12 @@ import ( "strings" "time" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmd/gist/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/text" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmd/gist/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/text" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/gist/list/list_test.go b/pkg/cmd/gist/list/list_test.go index 1c153892a..121db8de7 100644 --- a/pkg/cmd/gist/list/list_test.go +++ b/pkg/cmd/gist/list/list_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/gist/shared/shared.go b/pkg/cmd/gist/shared/shared.go index 1eac50d32..14424ed97 100644 --- a/pkg/cmd/gist/shared/shared.go +++ b/pkg/cmd/gist/shared/shared.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" "github.com/gabriel-vasile/mimetype" "github.com/shurcooL/githubv4" "github.com/shurcooL/graphql" diff --git a/pkg/cmd/gist/view/view.go b/pkg/cmd/gist/view/view.go index 131fa6e82..7e1a7ae93 100644 --- a/pkg/cmd/gist/view/view.go +++ b/pkg/cmd/gist/view/view.go @@ -8,15 +8,15 @@ import ( "time" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/pkg/cmd/gist/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/markdown" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/pkg/text" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/pkg/cmd/gist/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/markdown" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/pkg/text" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/gist/view/view_test.go b/pkg/cmd/gist/view/view_test.go index 9154bb4e7..148f5808b 100644 --- a/pkg/cmd/gist/view/view_test.go +++ b/pkg/cmd/gist/view/view_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/pkg/cmd/gist/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/pkg/cmd/gist/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/issue/close/close.go b/pkg/cmd/issue/close/close.go index a90f99e13..95d56b51d 100644 --- a/pkg/cmd/issue/close/close.go +++ b/pkg/cmd/issue/close/close.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/issue/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "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/issue/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/issue/close/close_test.go b/pkg/cmd/issue/close/close_test.go index 35c2fe10f..80d1e5366 100644 --- a/pkg/cmd/issue/close/close_test.go +++ b/pkg/cmd/issue/close/close_test.go @@ -7,12 +7,12 @@ import ( "regexp" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/issue/comment/comment.go b/pkg/cmd/issue/comment/comment.go index c25b9ccf5..b9426aa4f 100644 --- a/pkg/cmd/issue/comment/comment.go +++ b/pkg/cmd/issue/comment/comment.go @@ -4,11 +4,11 @@ import ( "net/http" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - issueShared "github.com/cli/cli/pkg/cmd/issue/shared" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + issueShared "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/spf13/cobra" ) diff --git a/pkg/cmd/issue/comment/comment_test.go b/pkg/cmd/issue/comment/comment_test.go index 8e1fa9ad6..066130024 100644 --- a/pkg/cmd/issue/comment/comment_test.go +++ b/pkg/cmd/issue/comment/comment_test.go @@ -8,11 +8,11 @@ import ( "path/filepath" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/issue/create/create.go b/pkg/cmd/issue/create/create.go index 258313b79..455a1f2d6 100644 --- a/pkg/cmd/issue/create/create.go +++ b/pkg/cmd/issue/create/create.go @@ -6,14 +6,14 @@ import ( "net/http" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "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/pr/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/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/issue/create/create_test.go b/pkg/cmd/issue/create/create_test.go index f3d70b575..f8d948999 100644 --- a/pkg/cmd/issue/create/create_test.go +++ b/pkg/cmd/issue/create/create_test.go @@ -11,15 +11,15 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/issue/delete/delete.go b/pkg/cmd/issue/delete/delete.go index 9b3edfbb4..fa0332d5f 100644 --- a/pkg/cmd/issue/delete/delete.go +++ b/pkg/cmd/issue/delete/delete.go @@ -2,17 +2,18 @@ package delete import ( "fmt" - "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/issue/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/spf13/cobra" "net/http" "strconv" + + "github.com/AlecAivazis/survey/v2" + "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/issue/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/spf13/cobra" ) type DeleteOptions struct { diff --git a/pkg/cmd/issue/delete/delete_test.go b/pkg/cmd/issue/delete/delete_test.go index 51122abf5..5c91b39c7 100644 --- a/pkg/cmd/issue/delete/delete_test.go +++ b/pkg/cmd/issue/delete/delete_test.go @@ -2,18 +2,18 @@ package delete import ( "bytes" - "github.com/cli/cli/pkg/prompt" "io/ioutil" "net/http" "regexp" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/issue/edit/edit.go b/pkg/cmd/issue/edit/edit.go index 53707e1f2..a88623d46 100644 --- a/pkg/cmd/issue/edit/edit.go +++ b/pkg/cmd/issue/edit/edit.go @@ -6,12 +6,12 @@ import ( "net/http" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - shared "github.com/cli/cli/pkg/cmd/issue/shared" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + shared "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" ) diff --git a/pkg/cmd/issue/edit/edit_test.go b/pkg/cmd/issue/edit/edit_test.go index 50b6389bd..acc3b62fa 100644 --- a/pkg/cmd/issue/edit/edit_test.go +++ b/pkg/cmd/issue/edit/edit_test.go @@ -8,11 +8,11 @@ import ( "path/filepath" "testing" - "github.com/cli/cli/internal/ghrepo" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/issue/issue.go b/pkg/cmd/issue/issue.go index 0a0ef63d1..6531aa43e 100644 --- a/pkg/cmd/issue/issue.go +++ b/pkg/cmd/issue/issue.go @@ -2,17 +2,17 @@ package issue import ( "github.com/MakeNowJust/heredoc" - cmdClose "github.com/cli/cli/pkg/cmd/issue/close" - cmdComment "github.com/cli/cli/pkg/cmd/issue/comment" - cmdCreate "github.com/cli/cli/pkg/cmd/issue/create" - cmdDelete "github.com/cli/cli/pkg/cmd/issue/delete" - cmdEdit "github.com/cli/cli/pkg/cmd/issue/edit" - cmdList "github.com/cli/cli/pkg/cmd/issue/list" - cmdReopen "github.com/cli/cli/pkg/cmd/issue/reopen" - cmdStatus "github.com/cli/cli/pkg/cmd/issue/status" - cmdTransfer "github.com/cli/cli/pkg/cmd/issue/transfer" - cmdView "github.com/cli/cli/pkg/cmd/issue/view" - "github.com/cli/cli/pkg/cmdutil" + cmdClose "github.com/cli/cli/v2/pkg/cmd/issue/close" + cmdComment "github.com/cli/cli/v2/pkg/cmd/issue/comment" + cmdCreate "github.com/cli/cli/v2/pkg/cmd/issue/create" + cmdDelete "github.com/cli/cli/v2/pkg/cmd/issue/delete" + cmdEdit "github.com/cli/cli/v2/pkg/cmd/issue/edit" + cmdList "github.com/cli/cli/v2/pkg/cmd/issue/list" + cmdReopen "github.com/cli/cli/v2/pkg/cmd/issue/reopen" + cmdStatus "github.com/cli/cli/v2/pkg/cmd/issue/status" + cmdTransfer "github.com/cli/cli/v2/pkg/cmd/issue/transfer" + cmdView "github.com/cli/cli/v2/pkg/cmd/issue/view" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/issue/list/http.go b/pkg/cmd/issue/list/http.go index 2794be45f..905615256 100644 --- a/pkg/cmd/issue/list/http.go +++ b/pkg/cmd/issue/list/http.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared" ) func listIssues(client *api.Client, repo ghrepo.Interface, filters prShared.FilterOptions, limit int) (*api.IssuesAndTotalCount, error) { diff --git a/pkg/cmd/issue/list/http_test.go b/pkg/cmd/issue/list/http_test.go index c5374b909..67895f5b9 100644 --- a/pkg/cmd/issue/list/http_test.go +++ b/pkg/cmd/issue/list/http_test.go @@ -5,12 +5,11 @@ import ( "io/ioutil" "testing" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/httpmock" "github.com/stretchr/testify/assert" - - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/httpmock" ) func TestIssueList(t *testing.T) { diff --git a/pkg/cmd/issue/list/list.go b/pkg/cmd/issue/list/list.go index 69a18ae09..48d76d23e 100644 --- a/pkg/cmd/issue/list/list.go +++ b/pkg/cmd/issue/list/list.go @@ -7,15 +7,15 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - issueShared "github.com/cli/cli/pkg/cmd/issue/shared" - "github.com/cli/cli/pkg/cmd/pr/shared" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + issueShared "github.com/cli/cli/v2/pkg/cmd/issue/shared" + "github.com/cli/cli/v2/pkg/cmd/pr/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/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/issue/list/list_test.go b/pkg/cmd/issue/list/list_test.go index b32bc37f2..cce2849f9 100644 --- a/pkg/cmd/issue/list/list_test.go +++ b/pkg/cmd/issue/list/list_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/issue/reopen/reopen.go b/pkg/cmd/issue/reopen/reopen.go index 8c57a157c..bef037bd7 100644 --- a/pkg/cmd/issue/reopen/reopen.go +++ b/pkg/cmd/issue/reopen/reopen.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/issue/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "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/issue/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/issue/reopen/reopen_test.go b/pkg/cmd/issue/reopen/reopen_test.go index e2604baaa..3c67f8f81 100644 --- a/pkg/cmd/issue/reopen/reopen_test.go +++ b/pkg/cmd/issue/reopen/reopen_test.go @@ -7,12 +7,12 @@ import ( "regexp" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/issue/shared/display.go b/pkg/cmd/issue/shared/display.go index 94b7d4cb0..953a82595 100644 --- a/pkg/cmd/issue/shared/display.go +++ b/pkg/cmd/issue/shared/display.go @@ -6,11 +6,11 @@ import ( "strings" "time" - "github.com/cli/cli/api" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/text" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/text" + "github.com/cli/cli/v2/utils" ) func PrintIssues(io *iostreams.IOStreams, prefix string, totalCount int, issues []api.Issue) { diff --git a/pkg/cmd/issue/shared/lookup.go b/pkg/cmd/issue/shared/lookup.go index 6e716f6da..d0c1126da 100644 --- a/pkg/cmd/issue/shared/lookup.go +++ b/pkg/cmd/issue/shared/lookup.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" ) func IssueFromArg(apiClient *api.Client, baseRepoFn func() (ghrepo.Interface, error), arg string) (*api.Issue, ghrepo.Interface, error) { diff --git a/pkg/cmd/issue/shared/lookup_test.go b/pkg/cmd/issue/shared/lookup_test.go index a34c1fbb5..942762720 100644 --- a/pkg/cmd/issue/shared/lookup_test.go +++ b/pkg/cmd/issue/shared/lookup_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/httpmock" ) func TestIssueFromArg(t *testing.T) { diff --git a/pkg/cmd/issue/status/status.go b/pkg/cmd/issue/status/status.go index d68e2223d..d9a380000 100644 --- a/pkg/cmd/issue/status/status.go +++ b/pkg/cmd/issue/status/status.go @@ -4,13 +4,13 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - issueShared "github.com/cli/cli/pkg/cmd/issue/shared" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + issueShared "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/spf13/cobra" ) diff --git a/pkg/cmd/issue/status/status_test.go b/pkg/cmd/issue/status/status_test.go index 6087abe1a..8681aa7ee 100644 --- a/pkg/cmd/issue/status/status_test.go +++ b/pkg/cmd/issue/status/status_test.go @@ -7,12 +7,12 @@ import ( "regexp" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" ) diff --git a/pkg/cmd/issue/transfer/transfer.go b/pkg/cmd/issue/transfer/transfer.go index 4aafe1245..61202a814 100644 --- a/pkg/cmd/issue/transfer/transfer.go +++ b/pkg/cmd/issue/transfer/transfer.go @@ -5,13 +5,13 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/issue/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/issue/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/shurcooL/githubv4" "github.com/shurcooL/graphql" "github.com/spf13/cobra" diff --git a/pkg/cmd/issue/transfer/transfer_test.go b/pkg/cmd/issue/transfer/transfer_test.go index 44b9ff112..adadccb2f 100644 --- a/pkg/cmd/issue/transfer/transfer_test.go +++ b/pkg/cmd/issue/transfer/transfer_test.go @@ -6,12 +6,12 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/issue/view/http.go b/pkg/cmd/issue/view/http.go index c4f87d677..bacd37148 100644 --- a/pkg/cmd/issue/view/http.go +++ b/pkg/cmd/issue/view/http.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" "github.com/shurcooL/githubv4" "github.com/shurcooL/graphql" ) diff --git a/pkg/cmd/issue/view/view.go b/pkg/cmd/issue/view/view.go index 8821ba099..b607a2dfb 100644 --- a/pkg/cmd/issue/view/view.go +++ b/pkg/cmd/issue/view/view.go @@ -8,15 +8,15 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - issueShared "github.com/cli/cli/pkg/cmd/issue/shared" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/markdown" - "github.com/cli/cli/pkg/set" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + issueShared "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/cli/cli/v2/pkg/markdown" + "github.com/cli/cli/v2/pkg/set" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/issue/view/view_test.go b/pkg/cmd/issue/view/view_test.go index 01ec824fc..196ede530 100644 --- a/pkg/cmd/issue/view/view_test.go +++ b/pkg/cmd/issue/view/view_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/pr/checkout/checkout.go b/pkg/cmd/pr/checkout/checkout.go index 651a7b3f4..6847d4626 100644 --- a/pkg/cmd/pr/checkout/checkout.go +++ b/pkg/cmd/pr/checkout/checkout.go @@ -7,15 +7,15 @@ import ( "os/exec" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "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/cli/safeexec" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/checkout/checkout_test.go b/pkg/cmd/pr/checkout/checkout_test.go index 7386cf2fc..9a90c4cbf 100644 --- a/pkg/cmd/pr/checkout/checkout_test.go +++ b/pkg/cmd/pr/checkout/checkout_test.go @@ -8,17 +8,17 @@ import ( "strings" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/pr/checks/checks.go b/pkg/cmd/pr/checks/checks.go index b21631820..36b59bb96 100644 --- a/pkg/cmd/pr/checks/checks.go +++ b/pkg/cmd/pr/checks/checks.go @@ -7,11 +7,11 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/internal/ghrepo" + "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/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/checks/checks_test.go b/pkg/cmd/pr/checks/checks_test.go index 0a189bd4d..36c5ac7f5 100644 --- a/pkg/cmd/pr/checks/checks_test.go +++ b/pkg/cmd/pr/checks/checks_test.go @@ -7,12 +7,12 @@ import ( "os" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "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/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/pr/close/close.go b/pkg/cmd/pr/close/close.go index 2c9442ecb..1e3b1333d 100644 --- a/pkg/cmd/pr/close/close.go +++ b/pkg/cmd/pr/close/close.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/git" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/git" + "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/spf13/cobra" ) diff --git a/pkg/cmd/pr/close/close_test.go b/pkg/cmd/pr/close/close_test.go index c94fe83f3..a91431243 100644 --- a/pkg/cmd/pr/close/close_test.go +++ b/pkg/cmd/pr/close/close_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/pr/comment/comment.go b/pkg/cmd/pr/comment/comment.go index 85845259c..084849450 100644 --- a/pkg/cmd/pr/comment/comment.go +++ b/pkg/cmd/pr/comment/comment.go @@ -4,9 +4,9 @@ import ( "errors" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/comment/comment_test.go b/pkg/cmd/pr/comment/comment_test.go index 859a57069..74703574f 100644 --- a/pkg/cmd/pr/comment/comment_test.go +++ b/pkg/cmd/pr/comment/comment_test.go @@ -8,12 +8,12 @@ import ( "path/filepath" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/pr/create/create.go b/pkg/cmd/pr/create/create.go index b2b40c65a..3664f910c 100644 --- a/pkg/cmd/pr/create/create.go +++ b/pkg/cmd/pr/create/create.go @@ -11,16 +11,16 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "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/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/create/create_test.go b/pkg/cmd/pr/create/create_test.go index a19208892..2b2d19e46 100644 --- a/pkg/cmd/pr/create/create_test.go +++ b/pkg/cmd/pr/create/create_test.go @@ -10,19 +10,19 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmd/pr/shared" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/pr/diff/diff.go b/pkg/cmd/pr/diff/diff.go index fa040a4aa..5f8f43d46 100644 --- a/pkg/cmd/pr/diff/diff.go +++ b/pkg/cmd/pr/diff/diff.go @@ -10,10 +10,10 @@ import ( "syscall" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "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/spf13/cobra" ) diff --git a/pkg/cmd/pr/diff/diff_test.go b/pkg/cmd/pr/diff/diff_test.go index e98690f93..adf45a123 100644 --- a/pkg/cmd/pr/diff/diff_test.go +++ b/pkg/cmd/pr/diff/diff_test.go @@ -6,14 +6,14 @@ import ( "net/http" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/context" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/go-cmp/cmp" "github.com/google/shlex" "github.com/stretchr/testify/assert" diff --git a/pkg/cmd/pr/edit/edit.go b/pkg/cmd/pr/edit/edit.go index 32b1161bf..ecbcceb42 100644 --- a/pkg/cmd/pr/edit/edit.go +++ b/pkg/cmd/pr/edit/edit.go @@ -6,12 +6,12 @@ import ( "net/http" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - shared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + shared "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" ) diff --git a/pkg/cmd/pr/edit/edit_test.go b/pkg/cmd/pr/edit/edit_test.go index 12203b99a..6dcbdbe20 100644 --- a/pkg/cmd/pr/edit/edit_test.go +++ b/pkg/cmd/pr/edit/edit_test.go @@ -8,12 +8,12 @@ import ( "path/filepath" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - shared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + shared "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/pr/list/http.go b/pkg/cmd/pr/list/http.go index 0f24e972d..621853aaf 100644 --- a/pkg/cmd/pr/list/http.go +++ b/pkg/cmd/pr/list/http.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/githubsearch" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/githubsearch" ) func listPullRequests(httpClient *http.Client, repo ghrepo.Interface, filters prShared.FilterOptions, limit int) (*api.PullRequestAndTotalCount, error) { diff --git a/pkg/cmd/pr/list/http_test.go b/pkg/cmd/pr/list/http_test.go index 17168f62b..bdb136100 100644 --- a/pkg/cmd/pr/list/http_test.go +++ b/pkg/cmd/pr/list/http_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" - "github.com/cli/cli/internal/ghrepo" - prShared "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/internal/ghrepo" + prShared "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/httpmock" ) func Test_listPullRequests(t *testing.T) { diff --git a/pkg/cmd/pr/list/list.go b/pkg/cmd/pr/list/list.go index a7dd5886b..15c943541 100644 --- a/pkg/cmd/pr/list/list.go +++ b/pkg/cmd/pr/list/list.go @@ -7,13 +7,13 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/text" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "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/cli/cli/v2/pkg/text" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/list/list_test.go b/pkg/cmd/pr/list/list_test.go index 56c5c8a26..a912e4cb6 100644 --- a/pkg/cmd/pr/list/list_test.go +++ b/pkg/cmd/pr/list/list_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/pr/merge/http.go b/pkg/cmd/pr/merge/http.go index ad1a9a78a..d33370938 100644 --- a/pkg/cmd/pr/merge/http.go +++ b/pkg/cmd/pr/merge/http.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" "github.com/shurcooL/githubv4" "github.com/shurcooL/graphql" ) diff --git a/pkg/cmd/pr/merge/merge.go b/pkg/cmd/pr/merge/merge.go index 3badf352c..f34bfac94 100644 --- a/pkg/cmd/pr/merge/merge.go +++ b/pkg/cmd/pr/merge/merge.go @@ -7,14 +7,14 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/pkg/surveyext" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "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/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/pkg/surveyext" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/merge/merge_test.go b/pkg/cmd/pr/merge/merge_test.go index cd0e61b68..6d1f50558 100644 --- a/pkg/cmd/pr/merge/merge_test.go +++ b/pkg/cmd/pr/merge/merge_test.go @@ -12,15 +12,15 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/pr/pr.go b/pkg/cmd/pr/pr.go index 3be067636..da58ad124 100644 --- a/pkg/cmd/pr/pr.go +++ b/pkg/cmd/pr/pr.go @@ -2,21 +2,21 @@ package pr import ( "github.com/MakeNowJust/heredoc" - cmdCheckout "github.com/cli/cli/pkg/cmd/pr/checkout" - cmdChecks "github.com/cli/cli/pkg/cmd/pr/checks" - cmdClose "github.com/cli/cli/pkg/cmd/pr/close" - cmdComment "github.com/cli/cli/pkg/cmd/pr/comment" - cmdCreate "github.com/cli/cli/pkg/cmd/pr/create" - cmdDiff "github.com/cli/cli/pkg/cmd/pr/diff" - cmdEdit "github.com/cli/cli/pkg/cmd/pr/edit" - cmdList "github.com/cli/cli/pkg/cmd/pr/list" - cmdMerge "github.com/cli/cli/pkg/cmd/pr/merge" - cmdReady "github.com/cli/cli/pkg/cmd/pr/ready" - cmdReopen "github.com/cli/cli/pkg/cmd/pr/reopen" - cmdReview "github.com/cli/cli/pkg/cmd/pr/review" - cmdStatus "github.com/cli/cli/pkg/cmd/pr/status" - cmdView "github.com/cli/cli/pkg/cmd/pr/view" - "github.com/cli/cli/pkg/cmdutil" + cmdCheckout "github.com/cli/cli/v2/pkg/cmd/pr/checkout" + cmdChecks "github.com/cli/cli/v2/pkg/cmd/pr/checks" + cmdClose "github.com/cli/cli/v2/pkg/cmd/pr/close" + cmdComment "github.com/cli/cli/v2/pkg/cmd/pr/comment" + cmdCreate "github.com/cli/cli/v2/pkg/cmd/pr/create" + cmdDiff "github.com/cli/cli/v2/pkg/cmd/pr/diff" + cmdEdit "github.com/cli/cli/v2/pkg/cmd/pr/edit" + cmdList "github.com/cli/cli/v2/pkg/cmd/pr/list" + cmdMerge "github.com/cli/cli/v2/pkg/cmd/pr/merge" + cmdReady "github.com/cli/cli/v2/pkg/cmd/pr/ready" + cmdReopen "github.com/cli/cli/v2/pkg/cmd/pr/reopen" + cmdReview "github.com/cli/cli/v2/pkg/cmd/pr/review" + cmdStatus "github.com/cli/cli/v2/pkg/cmd/pr/status" + cmdView "github.com/cli/cli/v2/pkg/cmd/pr/view" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/ready/ready.go b/pkg/cmd/pr/ready/ready.go index 6f4212057..f024ea574 100644 --- a/pkg/cmd/pr/ready/ready.go +++ b/pkg/cmd/pr/ready/ready.go @@ -6,10 +6,10 @@ import ( "net/http" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "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/spf13/cobra" ) diff --git a/pkg/cmd/pr/ready/ready_test.go b/pkg/cmd/pr/ready/ready_test.go index b4a39d452..72556da34 100644 --- a/pkg/cmd/pr/ready/ready_test.go +++ b/pkg/cmd/pr/ready/ready_test.go @@ -6,13 +6,13 @@ import ( "net/http" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/pr/reopen/reopen.go b/pkg/cmd/pr/reopen/reopen.go index 2750d1cec..df747a2dc 100644 --- a/pkg/cmd/pr/reopen/reopen.go +++ b/pkg/cmd/pr/reopen/reopen.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "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/spf13/cobra" ) diff --git a/pkg/cmd/pr/reopen/reopen_test.go b/pkg/cmd/pr/reopen/reopen_test.go index f04db2c06..f0c87e1ba 100644 --- a/pkg/cmd/pr/reopen/reopen_test.go +++ b/pkg/cmd/pr/reopen/reopen_test.go @@ -6,13 +6,13 @@ import ( "net/http" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/pr/review/review.go b/pkg/cmd/pr/review/review.go index 06452149f..64d9187fa 100644 --- a/pkg/cmd/pr/review/review.go +++ b/pkg/cmd/pr/review/review.go @@ -7,14 +7,14 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/markdown" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/pkg/surveyext" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "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/cli/cli/v2/pkg/markdown" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/pkg/surveyext" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/review/review_test.go b/pkg/cmd/pr/review/review_test.go index de65e471c..75ae8c200 100644 --- a/pkg/cmd/pr/review/review_test.go +++ b/pkg/cmd/pr/review/review_test.go @@ -9,16 +9,16 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/context" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/pr/shared/commentable.go b/pkg/cmd/pr/shared/commentable.go index c2e65453e..73f27b935 100644 --- a/pkg/cmd/pr/shared/commentable.go +++ b/pkg/cmd/pr/shared/commentable.go @@ -8,13 +8,13 @@ import ( "net/http" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/surveyext" - "github.com/cli/cli/utils" + "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/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/surveyext" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/shared/comments.go b/pkg/cmd/pr/shared/comments.go index caa2f5a91..86b52b68c 100644 --- a/pkg/cmd/pr/shared/comments.go +++ b/pkg/cmd/pr/shared/comments.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/markdown" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/markdown" + "github.com/cli/cli/v2/utils" ) type Comment interface { diff --git a/pkg/cmd/pr/shared/display.go b/pkg/cmd/pr/shared/display.go index 061fb9664..092dfc368 100644 --- a/pkg/cmd/pr/shared/display.go +++ b/pkg/cmd/pr/shared/display.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" ) func StateTitleWithColor(cs *iostreams.ColorScheme, pr api.PullRequest) string { diff --git a/pkg/cmd/pr/shared/editable.go b/pkg/cmd/pr/shared/editable.go index abcfc9b43..8037c5aec 100644 --- a/pkg/cmd/pr/shared/editable.go +++ b/pkg/cmd/pr/shared/editable.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/set" - "github.com/cli/cli/pkg/surveyext" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/set" + "github.com/cli/cli/v2/pkg/surveyext" ) type Editable struct { diff --git a/pkg/cmd/pr/shared/finder.go b/pkg/cmd/pr/shared/finder.go index 7b90e146c..40d2d4aad 100644 --- a/pkg/cmd/pr/shared/finder.go +++ b/pkg/cmd/pr/shared/finder.go @@ -11,13 +11,13 @@ import ( "strconv" "strings" - "github.com/cli/cli/api" - remotes "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/set" + "github.com/cli/cli/v2/api" + remotes "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/set" "github.com/shurcooL/githubv4" "github.com/shurcooL/graphql" "golang.org/x/sync/errgroup" diff --git a/pkg/cmd/pr/shared/finder_test.go b/pkg/cmd/pr/shared/finder_test.go index 488e470ff..e5e0ec22d 100644 --- a/pkg/cmd/pr/shared/finder_test.go +++ b/pkg/cmd/pr/shared/finder_test.go @@ -6,10 +6,10 @@ import ( "net/url" "testing" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/httpmock" ) func TestFind(t *testing.T) { diff --git a/pkg/cmd/pr/shared/params.go b/pkg/cmd/pr/shared/params.go index 0c0da79f2..92096e9d8 100644 --- a/pkg/cmd/pr/shared/params.go +++ b/pkg/cmd/pr/shared/params.go @@ -5,9 +5,9 @@ import ( "net/url" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/githubsearch" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/githubsearch" "github.com/google/shlex" ) diff --git a/pkg/cmd/pr/shared/params_test.go b/pkg/cmd/pr/shared/params_test.go index 85dd9fa9e..fa41ac307 100644 --- a/pkg/cmd/pr/shared/params_test.go +++ b/pkg/cmd/pr/shared/params_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/pr/shared/preserve.go b/pkg/cmd/pr/shared/preserve.go index 6d3c32965..948f81236 100644 --- a/pkg/cmd/pr/shared/preserve.go +++ b/pkg/cmd/pr/shared/preserve.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" ) func PreserveInput(io *iostreams.IOStreams, state *IssueMetadataState, createErr *error) func() { diff --git a/pkg/cmd/pr/shared/preserve_test.go b/pkg/cmd/pr/shared/preserve_test.go index 6b6e348d0..ead81a32b 100644 --- a/pkg/cmd/pr/shared/preserve_test.go +++ b/pkg/cmd/pr/shared/preserve_test.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "testing" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/pr/shared/reaction_groups.go b/pkg/cmd/pr/shared/reaction_groups.go index caf972672..3448ace24 100644 --- a/pkg/cmd/pr/shared/reaction_groups.go +++ b/pkg/cmd/pr/shared/reaction_groups.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/cli/cli/api" + "github.com/cli/cli/v2/api" ) func ReactionGroupList(rgs api.ReactionGroups) string { diff --git a/pkg/cmd/pr/shared/state.go b/pkg/cmd/pr/shared/state.go index 930a69fcc..6467777f7 100644 --- a/pkg/cmd/pr/shared/state.go +++ b/pkg/cmd/pr/shared/state.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/cli/cli/api" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/pkg/iostreams" ) type metadataStateType int diff --git a/pkg/cmd/pr/shared/survey.go b/pkg/cmd/pr/shared/survey.go index 15c930002..5b04801ae 100644 --- a/pkg/cmd/pr/shared/survey.go +++ b/pkg/cmd/pr/shared/survey.go @@ -5,13 +5,13 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/api" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/githubtemplate" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/pkg/surveyext" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/githubtemplate" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/pkg/surveyext" ) type Action int diff --git a/pkg/cmd/pr/shared/survey_test.go b/pkg/cmd/pr/shared/survey_test.go index a500040d3..a28d96198 100644 --- a/pkg/cmd/pr/shared/survey_test.go +++ b/pkg/cmd/pr/shared/survey_test.go @@ -3,10 +3,10 @@ package shared import ( "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/pr/shared/templates.go b/pkg/cmd/pr/shared/templates.go index be2d08db2..62281ee7c 100644 --- a/pkg/cmd/pr/shared/templates.go +++ b/pkg/cmd/pr/shared/templates.go @@ -7,12 +7,12 @@ import ( "time" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/api" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/githubtemplate" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/githubtemplate" + "github.com/cli/cli/v2/pkg/prompt" "github.com/shurcooL/githubv4" "github.com/shurcooL/graphql" ) diff --git a/pkg/cmd/pr/shared/templates_test.go b/pkg/cmd/pr/shared/templates_test.go index 903f52c75..5ef0d7f72 100644 --- a/pkg/cmd/pr/shared/templates_test.go +++ b/pkg/cmd/pr/shared/templates_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/prompt" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/pr/status/status.go b/pkg/cmd/pr/status/status.go index d8c458981..a28e88b00 100644 --- a/pkg/cmd/pr/status/status.go +++ b/pkg/cmd/pr/status/status.go @@ -8,15 +8,15 @@ import ( "strconv" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/text" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "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/cli/cli/v2/pkg/text" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/status/status_test.go b/pkg/cmd/pr/status/status_test.go index bc4f4e4f9..58256c6b2 100644 --- a/pkg/cmd/pr/status/status_test.go +++ b/pkg/cmd/pr/status/status_test.go @@ -8,14 +8,14 @@ import ( "strings" "testing" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" ) diff --git a/pkg/cmd/pr/view/view.go b/pkg/cmd/pr/view/view.go index 1aa1b589c..b62022d5e 100644 --- a/pkg/cmd/pr/view/view.go +++ b/pkg/cmd/pr/view/view.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/markdown" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "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/cli/cli/v2/pkg/markdown" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pr/view/view_test.go b/pkg/cmd/pr/view/view_test.go index 7de09f02b..d08f072d8 100644 --- a/pkg/cmd/pr/view/view_test.go +++ b/pkg/cmd/pr/view/view_test.go @@ -9,14 +9,14 @@ import ( "os" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmd/pr/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmd/pr/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/release/create/create.go b/pkg/cmd/release/create/create.go index 2394804ff..d787d185b 100644 --- a/pkg/cmd/release/create/create.go +++ b/pkg/cmd/release/create/create.go @@ -10,16 +10,16 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmd/release/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/pkg/surveyext" - "github.com/cli/cli/pkg/text" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmd/release/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/pkg/surveyext" + "github.com/cli/cli/v2/pkg/text" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/release/create/create_test.go b/pkg/cmd/release/create/create_test.go index 46b7fc4be..84a8ac1f2 100644 --- a/pkg/cmd/release/create/create_test.go +++ b/pkg/cmd/release/create/create_test.go @@ -11,11 +11,11 @@ import ( "path/filepath" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/release/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/release/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/release/create/http.go b/pkg/cmd/release/create/http.go index b8c838579..78c9a0f23 100644 --- a/pkg/cmd/release/create/http.go +++ b/pkg/cmd/release/create/http.go @@ -7,10 +7,10 @@ import ( "io/ioutil" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/release/shared" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/release/shared" ) func createRelease(httpClient *http.Client, repo ghrepo.Interface, params map[string]interface{}) (*shared.Release, error) { diff --git a/pkg/cmd/release/delete/delete.go b/pkg/cmd/release/delete/delete.go index c880f9d58..944320ec2 100644 --- a/pkg/cmd/release/delete/delete.go +++ b/pkg/cmd/release/delete/delete.go @@ -5,12 +5,12 @@ import ( "net/http" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/release/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/release/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/release/delete/delete_test.go b/pkg/cmd/release/delete/delete_test.go index baeb1a379..aefe986db 100644 --- a/pkg/cmd/release/delete/delete_test.go +++ b/pkg/cmd/release/delete/delete_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/release/download/download.go b/pkg/cmd/release/download/download.go index d8c28e289..97f4c3e7a 100644 --- a/pkg/cmd/release/download/download.go +++ b/pkg/cmd/release/download/download.go @@ -8,11 +8,11 @@ import ( "path/filepath" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/release/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/release/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/release/download/download_test.go b/pkg/cmd/release/download/download_test.go index 9fa8677c6..2c2aa5891 100644 --- a/pkg/cmd/release/download/download_test.go +++ b/pkg/cmd/release/download/download_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/release/list/http.go b/pkg/cmd/release/list/http.go index 8aae95674..7ee3b4f12 100644 --- a/pkg/cmd/release/list/http.go +++ b/pkg/cmd/release/list/http.go @@ -5,8 +5,8 @@ import ( "net/http" "time" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" "github.com/shurcooL/githubv4" "github.com/shurcooL/graphql" ) diff --git a/pkg/cmd/release/list/list.go b/pkg/cmd/release/list/list.go index caaab772d..5d0320406 100644 --- a/pkg/cmd/release/list/list.go +++ b/pkg/cmd/release/list/list.go @@ -5,11 +5,11 @@ import ( "net/http" "time" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/text" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/text" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/release/list/list_test.go b/pkg/cmd/release/list/list_test.go index 8f17dc6ce..95e4bcf7f 100644 --- a/pkg/cmd/release/list/list_test.go +++ b/pkg/cmd/release/list/list_test.go @@ -9,10 +9,10 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/release/release.go b/pkg/cmd/release/release.go index facd0a1e3..01132404e 100644 --- a/pkg/cmd/release/release.go +++ b/pkg/cmd/release/release.go @@ -1,13 +1,13 @@ package release import ( - cmdCreate "github.com/cli/cli/pkg/cmd/release/create" - cmdDelete "github.com/cli/cli/pkg/cmd/release/delete" - cmdDownload "github.com/cli/cli/pkg/cmd/release/download" - cmdList "github.com/cli/cli/pkg/cmd/release/list" - cmdUpload "github.com/cli/cli/pkg/cmd/release/upload" - cmdView "github.com/cli/cli/pkg/cmd/release/view" - "github.com/cli/cli/pkg/cmdutil" + cmdCreate "github.com/cli/cli/v2/pkg/cmd/release/create" + cmdDelete "github.com/cli/cli/v2/pkg/cmd/release/delete" + cmdDownload "github.com/cli/cli/v2/pkg/cmd/release/download" + cmdList "github.com/cli/cli/v2/pkg/cmd/release/list" + cmdUpload "github.com/cli/cli/v2/pkg/cmd/release/upload" + cmdView "github.com/cli/cli/v2/pkg/cmd/release/view" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/release/shared/fetch.go b/pkg/cmd/release/shared/fetch.go index a964f9068..12e52ef7e 100644 --- a/pkg/cmd/release/shared/fetch.go +++ b/pkg/cmd/release/shared/fetch.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" ) var ReleaseFields = []string{ diff --git a/pkg/cmd/release/shared/upload.go b/pkg/cmd/release/shared/upload.go index e2d68ac48..f88369417 100644 --- a/pkg/cmd/release/shared/upload.go +++ b/pkg/cmd/release/shared/upload.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/cli/cli/api" + "github.com/cli/cli/v2/api" ) type AssetForUpload struct { diff --git a/pkg/cmd/release/upload/upload.go b/pkg/cmd/release/upload/upload.go index 79e67f7ea..dac790923 100644 --- a/pkg/cmd/release/upload/upload.go +++ b/pkg/cmd/release/upload/upload.go @@ -6,11 +6,11 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/release/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/release/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/release/view/view.go b/pkg/cmd/release/view/view.go index 0a3867aeb..ae7d10e97 100644 --- a/pkg/cmd/release/view/view.go +++ b/pkg/cmd/release/view/view.go @@ -8,12 +8,12 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/release/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/markdown" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/release/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/markdown" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/release/view/view_test.go b/pkg/cmd/release/view/view_test.go index dba25b680..3deee6963 100644 --- a/pkg/cmd/release/view/view_test.go +++ b/pkg/cmd/release/view/view_test.go @@ -9,10 +9,10 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/repo/clone/clone.go b/pkg/cmd/repo/clone/clone.go index 5a2c3b68d..9dc6ddc73 100644 --- a/pkg/cmd/repo/clone/clone.go +++ b/pkg/cmd/repo/clone/clone.go @@ -6,12 +6,12 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/pkg/cmd/repo/clone/clone_test.go b/pkg/cmd/repo/clone/clone_test.go index 4e0aaff9f..3d91e282d 100644 --- a/pkg/cmd/repo/clone/clone_test.go +++ b/pkg/cmd/repo/clone/clone_test.go @@ -5,12 +5,12 @@ import ( "strings" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/repo/create/create.go b/pkg/cmd/repo/create/create.go index efe90e007..a99e471cc 100644 --- a/pkg/cmd/repo/create/create.go +++ b/pkg/cmd/repo/create/create.go @@ -9,15 +9,15 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/repo/create/create_test.go b/pkg/cmd/repo/create/create_test.go index eba1e7c1f..b9b10f43d 100644 --- a/pkg/cmd/repo/create/create_test.go +++ b/pkg/cmd/repo/create/create_test.go @@ -8,13 +8,13 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/repo/create/http.go b/pkg/cmd/repo/create/http.go index 5233c8931..1cc6a47a6 100644 --- a/pkg/cmd/repo/create/http.go +++ b/pkg/cmd/repo/create/http.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/cli/cli/api" + "github.com/cli/cli/v2/api" ) // repoCreateInput is input parameters for the repoCreate method diff --git a/pkg/cmd/repo/create/http_test.go b/pkg/cmd/repo/create/http_test.go index 9a0f9b227..1a1ae1f0b 100644 --- a/pkg/cmd/repo/create/http_test.go +++ b/pkg/cmd/repo/create/http_test.go @@ -4,8 +4,8 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/repo/credits/credits.go b/pkg/cmd/repo/credits/credits.go index e792b54d6..37390bcb1 100644 --- a/pkg/cmd/repo/credits/credits.go +++ b/pkg/cmd/repo/credits/credits.go @@ -13,11 +13,11 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/repo/fork/fork.go b/pkg/cmd/repo/fork/fork.go index a83000e0a..4134a7ba2 100644 --- a/pkg/cmd/repo/fork/fork.go +++ b/pkg/cmd/repo/fork/fork.go @@ -8,16 +8,16 @@ import ( "strings" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/pkg/cmd/repo/fork/fork_test.go b/pkg/cmd/repo/fork/fork_test.go index 1eb42943d..775152440 100644 --- a/pkg/cmd/repo/fork/fork_test.go +++ b/pkg/cmd/repo/fork/fork_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/repo/garden/garden.go b/pkg/cmd/repo/garden/garden.go index ec2a2e2f5..c649b5394 100644 --- a/pkg/cmd/repo/garden/garden.go +++ b/pkg/cmd/repo/garden/garden.go @@ -12,12 +12,12 @@ import ( "strconv" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" "golang.org/x/term" ) diff --git a/pkg/cmd/repo/garden/http.go b/pkg/cmd/repo/garden/http.go index d466cf155..ebb9390de 100644 --- a/pkg/cmd/repo/garden/http.go +++ b/pkg/cmd/repo/garden/http.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" ) func getCommits(client *http.Client, repo ghrepo.Interface, maxCommits int) ([]*Commit, error) { diff --git a/pkg/cmd/repo/list/http.go b/pkg/cmd/repo/list/http.go index 4c2ca50b3..fa5319304 100644 --- a/pkg/cmd/repo/list/http.go +++ b/pkg/cmd/repo/list/http.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/pkg/githubsearch" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/pkg/githubsearch" "github.com/shurcooL/githubv4" ) diff --git a/pkg/cmd/repo/list/http_test.go b/pkg/cmd/repo/list/http_test.go index fcbb028e6..854a89e82 100644 --- a/pkg/cmd/repo/list/http_test.go +++ b/pkg/cmd/repo/list/http_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/pkg/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/cmd/repo/list/list.go b/pkg/cmd/repo/list/list.go index 98f171c9a..7387ca84d 100644 --- a/pkg/cmd/repo/list/list.go +++ b/pkg/cmd/repo/list/list.go @@ -6,12 +6,12 @@ import ( "strings" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/text" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/text" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/repo/list/list_test.go b/pkg/cmd/repo/list/list_test.go index e40646aeb..accc84f9d 100644 --- a/pkg/cmd/repo/list/list_test.go +++ b/pkg/cmd/repo/list/list_test.go @@ -8,11 +8,11 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmd/repo/repo.go b/pkg/cmd/repo/repo.go index 26e856ffd..252c322e9 100644 --- a/pkg/cmd/repo/repo.go +++ b/pkg/cmd/repo/repo.go @@ -2,15 +2,15 @@ package repo import ( "github.com/MakeNowJust/heredoc" - repoCloneCmd "github.com/cli/cli/pkg/cmd/repo/clone" - repoCreateCmd "github.com/cli/cli/pkg/cmd/repo/create" - creditsCmd "github.com/cli/cli/pkg/cmd/repo/credits" - repoForkCmd "github.com/cli/cli/pkg/cmd/repo/fork" - gardenCmd "github.com/cli/cli/pkg/cmd/repo/garden" - repoListCmd "github.com/cli/cli/pkg/cmd/repo/list" - repoSyncCmd "github.com/cli/cli/pkg/cmd/repo/sync" - repoViewCmd "github.com/cli/cli/pkg/cmd/repo/view" - "github.com/cli/cli/pkg/cmdutil" + repoCloneCmd "github.com/cli/cli/v2/pkg/cmd/repo/clone" + repoCreateCmd "github.com/cli/cli/v2/pkg/cmd/repo/create" + creditsCmd "github.com/cli/cli/v2/pkg/cmd/repo/credits" + repoForkCmd "github.com/cli/cli/v2/pkg/cmd/repo/fork" + gardenCmd "github.com/cli/cli/v2/pkg/cmd/repo/garden" + repoListCmd "github.com/cli/cli/v2/pkg/cmd/repo/list" + repoSyncCmd "github.com/cli/cli/v2/pkg/cmd/repo/sync" + repoViewCmd "github.com/cli/cli/v2/pkg/cmd/repo/view" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/repo/sync/git.go b/pkg/cmd/repo/sync/git.go index 9976a923b..ffb9a4179 100644 --- a/pkg/cmd/repo/sync/git.go +++ b/pkg/cmd/repo/sync/git.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/cli/cli/git" + "github.com/cli/cli/v2/git" ) type gitClient interface { diff --git a/pkg/cmd/repo/sync/http.go b/pkg/cmd/repo/sync/http.go index 70c3e9a7e..2c1e967ce 100644 --- a/pkg/cmd/repo/sync/http.go +++ b/pkg/cmd/repo/sync/http.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" ) type commit struct { diff --git a/pkg/cmd/repo/sync/sync.go b/pkg/cmd/repo/sync/sync.go index a77020fe0..c4dc72695 100644 --- a/pkg/cmd/repo/sync/sync.go +++ b/pkg/cmd/repo/sync/sync.go @@ -7,12 +7,12 @@ import ( "regexp" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/context" - gitpkg "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/context" + gitpkg "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/repo/sync/sync_test.go b/pkg/cmd/repo/sync/sync_test.go index d2127e66c..a3cc62fe6 100644 --- a/pkg/cmd/repo/sync/sync_test.go +++ b/pkg/cmd/repo/sync/sync_test.go @@ -6,12 +6,12 @@ import ( "net/http" "testing" - "github.com/cli/cli/context" - "github.com/cli/cli/git" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/git" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/repo/view/http.go b/pkg/cmd/repo/view/http.go index 3ef1dc784..dee1df677 100644 --- a/pkg/cmd/repo/view/http.go +++ b/pkg/cmd/repo/view/http.go @@ -6,8 +6,8 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" ) var NotFoundError = errors.New("not found") diff --git a/pkg/cmd/repo/view/view.go b/pkg/cmd/repo/view/view.go index e1d90d108..38524f1a2 100644 --- a/pkg/cmd/repo/view/view.go +++ b/pkg/cmd/repo/view/view.go @@ -10,13 +10,13 @@ import ( "text/template" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/markdown" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/markdown" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/repo/view/view_test.go b/pkg/cmd/repo/view/view_test.go index 66a8b3133..e7d814cb4 100644 --- a/pkg/cmd/repo/view/view_test.go +++ b/pkg/cmd/repo/view/view_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/internal/run" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/internal/run" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/root/help.go b/pkg/cmd/root/help.go index 51b36142b..e9eb0703e 100644 --- a/pkg/cmd/root/help.go +++ b/pkg/cmd/root/help.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/text" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/text" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/pkg/cmd/root/help_reference.go b/pkg/cmd/root/help_reference.go index ce0cd875a..73070e0e9 100644 --- a/pkg/cmd/root/help_reference.go +++ b/pkg/cmd/root/help_reference.go @@ -6,8 +6,8 @@ import ( "io" "strings" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/markdown" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/markdown" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/root/help_topic_test.go b/pkg/cmd/root/help_topic_test.go index 3aba4bdf3..c5c51408f 100644 --- a/pkg/cmd/root/help_topic_test.go +++ b/pkg/cmd/root/help_topic_test.go @@ -3,7 +3,7 @@ package root import ( "testing" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/root/root.go b/pkg/cmd/root/root.go index acab8bc6b..f24c29211 100644 --- a/pkg/cmd/root/root.go +++ b/pkg/cmd/root/root.go @@ -4,27 +4,27 @@ import ( "net/http" "github.com/MakeNowJust/heredoc" - actionsCmd "github.com/cli/cli/pkg/cmd/actions" - aliasCmd "github.com/cli/cli/pkg/cmd/alias" - apiCmd "github.com/cli/cli/pkg/cmd/api" - authCmd "github.com/cli/cli/pkg/cmd/auth" - browseCmd "github.com/cli/cli/pkg/cmd/browse" - completionCmd "github.com/cli/cli/pkg/cmd/completion" - configCmd "github.com/cli/cli/pkg/cmd/config" - extensionCmd "github.com/cli/cli/pkg/cmd/extension" - "github.com/cli/cli/pkg/cmd/factory" - gistCmd "github.com/cli/cli/pkg/cmd/gist" - issueCmd "github.com/cli/cli/pkg/cmd/issue" - prCmd "github.com/cli/cli/pkg/cmd/pr" - releaseCmd "github.com/cli/cli/pkg/cmd/release" - repoCmd "github.com/cli/cli/pkg/cmd/repo" - creditsCmd "github.com/cli/cli/pkg/cmd/repo/credits" - runCmd "github.com/cli/cli/pkg/cmd/run" - secretCmd "github.com/cli/cli/pkg/cmd/secret" - sshKeyCmd "github.com/cli/cli/pkg/cmd/ssh-key" - versionCmd "github.com/cli/cli/pkg/cmd/version" - workflowCmd "github.com/cli/cli/pkg/cmd/workflow" - "github.com/cli/cli/pkg/cmdutil" + actionsCmd "github.com/cli/cli/v2/pkg/cmd/actions" + aliasCmd "github.com/cli/cli/v2/pkg/cmd/alias" + apiCmd "github.com/cli/cli/v2/pkg/cmd/api" + authCmd "github.com/cli/cli/v2/pkg/cmd/auth" + browseCmd "github.com/cli/cli/v2/pkg/cmd/browse" + completionCmd "github.com/cli/cli/v2/pkg/cmd/completion" + configCmd "github.com/cli/cli/v2/pkg/cmd/config" + extensionCmd "github.com/cli/cli/v2/pkg/cmd/extension" + "github.com/cli/cli/v2/pkg/cmd/factory" + gistCmd "github.com/cli/cli/v2/pkg/cmd/gist" + issueCmd "github.com/cli/cli/v2/pkg/cmd/issue" + prCmd "github.com/cli/cli/v2/pkg/cmd/pr" + releaseCmd "github.com/cli/cli/v2/pkg/cmd/release" + repoCmd "github.com/cli/cli/v2/pkg/cmd/repo" + creditsCmd "github.com/cli/cli/v2/pkg/cmd/repo/credits" + runCmd "github.com/cli/cli/v2/pkg/cmd/run" + secretCmd "github.com/cli/cli/v2/pkg/cmd/secret" + sshKeyCmd "github.com/cli/cli/v2/pkg/cmd/ssh-key" + versionCmd "github.com/cli/cli/v2/pkg/cmd/version" + workflowCmd "github.com/cli/cli/v2/pkg/cmd/workflow" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/run/download/download.go b/pkg/cmd/run/download/download.go index 2b4e8a093..263264311 100644 --- a/pkg/cmd/run/download/download.go +++ b/pkg/cmd/run/download/download.go @@ -7,11 +7,11 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/pkg/set" + "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/pkg/set" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/run/download/download_test.go b/pkg/cmd/run/download/download_test.go index d42b95a3d..fb306162e 100644 --- a/pkg/cmd/run/download/download_test.go +++ b/pkg/cmd/run/download/download_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/pkg/cmd/run/download/http.go b/pkg/cmd/run/download/http.go index 6d37adde2..a158ba3ff 100644 --- a/pkg/cmd/run/download/http.go +++ b/pkg/cmd/run/download/http.go @@ -8,9 +8,9 @@ import ( "net/http" "os" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/run/shared" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/run/shared" ) type apiPlatform struct { diff --git a/pkg/cmd/run/download/http_test.go b/pkg/cmd/run/download/http_test.go index a8e96153f..2752d88ad 100644 --- a/pkg/cmd/run/download/http_test.go +++ b/pkg/cmd/run/download/http_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/cmd/run/list/list.go b/pkg/cmd/run/list/list.go index 9cc9b5f38..103b39196 100644 --- a/pkg/cmd/run/list/list.go +++ b/pkg/cmd/run/list/list.go @@ -5,13 +5,13 @@ import ( "net/http" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/run/shared" - workflowShared "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/run/shared" + workflowShared "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/run/list/list_test.go b/pkg/cmd/run/list/list_test.go index 681eb64cd..ab9ecf8f7 100644 --- a/pkg/cmd/run/list/list_test.go +++ b/pkg/cmd/run/list/list_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/run/shared" - workflowShared "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/run/shared" + workflowShared "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/run/rerun/rerun.go b/pkg/cmd/run/rerun/rerun.go index 16f940213..7f43d66df 100644 --- a/pkg/cmd/run/rerun/rerun.go +++ b/pkg/cmd/run/rerun/rerun.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/run/rerun/rerun_test.go b/pkg/cmd/run/rerun/rerun_test.go index ac5e6f632..11c5ff983 100644 --- a/pkg/cmd/run/rerun/rerun_test.go +++ b/pkg/cmd/run/rerun/rerun_test.go @@ -6,12 +6,12 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/run/run.go b/pkg/cmd/run/run.go index d61e350d3..1fc1b6fb9 100644 --- a/pkg/cmd/run/run.go +++ b/pkg/cmd/run/run.go @@ -1,12 +1,12 @@ package run import ( - cmdDownload "github.com/cli/cli/pkg/cmd/run/download" - cmdList "github.com/cli/cli/pkg/cmd/run/list" - cmdRerun "github.com/cli/cli/pkg/cmd/run/rerun" - cmdView "github.com/cli/cli/pkg/cmd/run/view" - cmdWatch "github.com/cli/cli/pkg/cmd/run/watch" - "github.com/cli/cli/pkg/cmdutil" + cmdDownload "github.com/cli/cli/v2/pkg/cmd/run/download" + cmdList "github.com/cli/cli/v2/pkg/cmd/run/list" + cmdRerun "github.com/cli/cli/v2/pkg/cmd/run/rerun" + cmdView "github.com/cli/cli/v2/pkg/cmd/run/view" + cmdWatch "github.com/cli/cli/v2/pkg/cmd/run/watch" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/run/shared/artifacts.go b/pkg/cmd/run/shared/artifacts.go index ff3490719..ab480b56a 100644 --- a/pkg/cmd/run/shared/artifacts.go +++ b/pkg/cmd/run/shared/artifacts.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" ) type Artifact struct { diff --git a/pkg/cmd/run/shared/presentation.go b/pkg/cmd/run/shared/presentation.go index c483bafe3..90f0fe6d0 100644 --- a/pkg/cmd/run/shared/presentation.go +++ b/pkg/cmd/run/shared/presentation.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/iostreams" ) func RenderRunHeader(cs *iostreams.ColorScheme, run Run, ago, prNumber string) string { diff --git a/pkg/cmd/run/shared/shared.go b/pkg/cmd/run/shared/shared.go index 4fcf73250..fc5bbc7bf 100644 --- a/pkg/cmd/run/shared/shared.go +++ b/pkg/cmd/run/shared/shared.go @@ -9,10 +9,10 @@ import ( "time" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" ) const ( diff --git a/pkg/cmd/run/shared/shared_test.go b/pkg/cmd/run/shared/shared_test.go index 0b7cf8db1..53d941069 100644 --- a/pkg/cmd/run/shared/shared_test.go +++ b/pkg/cmd/run/shared/shared_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/httpmock" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/run/view/view.go b/pkg/cmd/run/view/view.go index 5dba471fc..966bb6dbf 100644 --- a/pkg/cmd/run/view/view.go +++ b/pkg/cmd/run/view/view.go @@ -16,14 +16,14 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/run/view/view_test.go b/pkg/cmd/run/view/view_test.go index 4e284b354..7b61d3b2f 100644 --- a/pkg/cmd/run/view/view_test.go +++ b/pkg/cmd/run/view/view_test.go @@ -11,12 +11,12 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/run/watch/watch.go b/pkg/cmd/run/watch/watch.go index 17efccae1..8f62c1e9e 100644 --- a/pkg/cmd/run/watch/watch.go +++ b/pkg/cmd/run/watch/watch.go @@ -8,12 +8,12 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/run/watch/watch_test.go b/pkg/cmd/run/watch/watch_test.go index 8b02ea24d..d5384af91 100644 --- a/pkg/cmd/run/watch/watch_test.go +++ b/pkg/cmd/run/watch/watch_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/secret/list/list.go b/pkg/cmd/secret/list/list.go index c2f814782..f138628df 100644 --- a/pkg/cmd/secret/list/list.go +++ b/pkg/cmd/secret/list/list.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghinstance" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/secret/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghinstance" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/secret/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/secret/list/list_test.go b/pkg/cmd/secret/list/list_test.go index 42504a961..277e4328c 100644 --- a/pkg/cmd/secret/list/list_test.go +++ b/pkg/cmd/secret/list/list_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/secret/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/test" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/secret/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/test" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/secret/remove/remove.go b/pkg/cmd/secret/remove/remove.go index fea4415ee..8e1c4570b 100644 --- a/pkg/cmd/secret/remove/remove.go +++ b/pkg/cmd/secret/remove/remove.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "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/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/secret/remove/remove_test.go b/pkg/cmd/secret/remove/remove_test.go index b47703049..565a8f742 100644 --- a/pkg/cmd/secret/remove/remove_test.go +++ b/pkg/cmd/secret/remove/remove_test.go @@ -6,11 +6,11 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/secret/secret.go b/pkg/cmd/secret/secret.go index dc04fc85c..a02bc3d4d 100644 --- a/pkg/cmd/secret/secret.go +++ b/pkg/cmd/secret/secret.go @@ -2,12 +2,11 @@ package secret import ( "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/pkg/cmdutil" + cmdList "github.com/cli/cli/v2/pkg/cmd/secret/list" + cmdRemove "github.com/cli/cli/v2/pkg/cmd/secret/remove" + cmdSet "github.com/cli/cli/v2/pkg/cmd/secret/set" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" - - cmdList "github.com/cli/cli/pkg/cmd/secret/list" - cmdRemove "github.com/cli/cli/pkg/cmd/secret/remove" - cmdSet "github.com/cli/cli/pkg/cmd/secret/set" ) func NewCmdSecret(f *cmdutil.Factory) *cobra.Command { diff --git a/pkg/cmd/secret/set/http.go b/pkg/cmd/secret/set/http.go index b0626e92e..671b8c9fe 100644 --- a/pkg/cmd/secret/set/http.go +++ b/pkg/cmd/secret/set/http.go @@ -8,9 +8,9 @@ import ( "sort" "strings" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/secret/shared" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/secret/shared" ) type SecretPayload struct { diff --git a/pkg/cmd/secret/set/set.go b/pkg/cmd/secret/set/set.go index cee46063b..47fe26fc6 100644 --- a/pkg/cmd/secret/set/set.go +++ b/pkg/cmd/secret/set/set.go @@ -12,13 +12,13 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/secret/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "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/secret/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/spf13/cobra" "golang.org/x/crypto/nacl/box" ) diff --git a/pkg/cmd/secret/set/set_test.go b/pkg/cmd/secret/set/set_test.go index adea1c894..a1fa19ac8 100644 --- a/pkg/cmd/secret/set/set_test.go +++ b/pkg/cmd/secret/set/set_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/secret/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/secret/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/ssh-key/add/add.go b/pkg/cmd/ssh-key/add/add.go index 80d03ae5b..72da863de 100644 --- a/pkg/cmd/ssh-key/add/add.go +++ b/pkg/cmd/ssh-key/add/add.go @@ -7,9 +7,9 @@ import ( "net/http" "os" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/ssh-key/add/add_test.go b/pkg/cmd/ssh-key/add/add_test.go index 82073ad3a..183e42ce5 100644 --- a/pkg/cmd/ssh-key/add/add_test.go +++ b/pkg/cmd/ssh-key/add/add_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/ssh-key/add/http.go b/pkg/cmd/ssh-key/add/http.go index 5a71a9a41..c85b00c2a 100644 --- a/pkg/cmd/ssh-key/add/http.go +++ b/pkg/cmd/ssh-key/add/http.go @@ -8,8 +8,8 @@ import ( "io/ioutil" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" ) var scopesError = errors.New("insufficient OAuth scopes") diff --git a/pkg/cmd/ssh-key/list/http.go b/pkg/cmd/ssh-key/list/http.go index 2b6613593..9a6d6fc0e 100644 --- a/pkg/cmd/ssh-key/list/http.go +++ b/pkg/cmd/ssh-key/list/http.go @@ -8,8 +8,8 @@ import ( "net/http" "time" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghinstance" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghinstance" ) var scopesError = errors.New("insufficient OAuth scopes") diff --git a/pkg/cmd/ssh-key/list/list.go b/pkg/cmd/ssh-key/list/list.go index e86abc9f8..fc35cf650 100644 --- a/pkg/cmd/ssh-key/list/list.go +++ b/pkg/cmd/ssh-key/list/list.go @@ -6,10 +6,10 @@ import ( "net/http" "time" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/ssh-key/list/list_test.go b/pkg/cmd/ssh-key/list/list_test.go index 283f95df9..04905d277 100644 --- a/pkg/cmd/ssh-key/list/list_test.go +++ b/pkg/cmd/ssh-key/list/list_test.go @@ -7,9 +7,9 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" ) func TestListRun(t *testing.T) { diff --git a/pkg/cmd/ssh-key/ssh-key.go b/pkg/cmd/ssh-key/ssh-key.go index 93b819d13..d28e82d07 100644 --- a/pkg/cmd/ssh-key/ssh-key.go +++ b/pkg/cmd/ssh-key/ssh-key.go @@ -1,9 +1,9 @@ package key import ( - cmdAdd "github.com/cli/cli/pkg/cmd/ssh-key/add" - cmdList "github.com/cli/cli/pkg/cmd/ssh-key/list" - "github.com/cli/cli/pkg/cmdutil" + cmdAdd "github.com/cli/cli/v2/pkg/cmd/ssh-key/add" + cmdList "github.com/cli/cli/v2/pkg/cmd/ssh-key/list" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/version/version.go b/pkg/cmd/version/version.go index d473ab0b2..ec1c1e597 100644 --- a/pkg/cmd/version/version.go +++ b/pkg/cmd/version/version.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/cli/cli/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/workflow/disable/disable.go b/pkg/cmd/workflow/disable/disable.go index 725c13f1a..5869b3201 100644 --- a/pkg/cmd/workflow/disable/disable.go +++ b/pkg/cmd/workflow/disable/disable.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/workflow/disable/disable_test.go b/pkg/cmd/workflow/disable/disable_test.go index 98ba36c14..1057da6a9 100644 --- a/pkg/cmd/workflow/disable/disable_test.go +++ b/pkg/cmd/workflow/disable/disable_test.go @@ -6,12 +6,12 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/workflow/enable/enable.go b/pkg/cmd/workflow/enable/enable.go index 2e2abdc76..f0d9e077d 100644 --- a/pkg/cmd/workflow/enable/enable.go +++ b/pkg/cmd/workflow/enable/enable.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/workflow/enable/enable_test.go b/pkg/cmd/workflow/enable/enable_test.go index 5da4d8660..fb0e703bb 100644 --- a/pkg/cmd/workflow/enable/enable_test.go +++ b/pkg/cmd/workflow/enable/enable_test.go @@ -6,12 +6,12 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/workflow/list/list.go b/pkg/cmd/workflow/list/list.go index 94291bcc7..87ebb4c01 100644 --- a/pkg/cmd/workflow/list/list.go +++ b/pkg/cmd/workflow/list/list.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/workflow/list/list_test.go b/pkg/cmd/workflow/list/list_test.go index f234be159..fdf171814 100644 --- a/pkg/cmd/workflow/list/list_test.go +++ b/pkg/cmd/workflow/list/list_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/workflow/run/run.go b/pkg/cmd/workflow/run/run.go index 1d0370242..0ab3f1749 100644 --- a/pkg/cmd/workflow/run/run.go +++ b/pkg/cmd/workflow/run/run.go @@ -13,12 +13,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/spf13/cobra" "gopkg.in/yaml.v3" ) diff --git a/pkg/cmd/workflow/run/run_test.go b/pkg/cmd/workflow/run/run_test.go index 49693faef..196f1850d 100644 --- a/pkg/cmd/workflow/run/run_test.go +++ b/pkg/cmd/workflow/run/run_test.go @@ -9,13 +9,13 @@ import ( "net/http" "testing" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/workflow/shared/shared.go b/pkg/cmd/workflow/shared/shared.go index 75da4d01c..4c3660fdc 100644 --- a/pkg/cmd/workflow/shared/shared.go +++ b/pkg/cmd/workflow/shared/shared.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" ) const ( diff --git a/pkg/cmd/workflow/view/http.go b/pkg/cmd/workflow/view/http.go index 9565047a3..c85da2c97 100644 --- a/pkg/cmd/workflow/view/http.go +++ b/pkg/cmd/workflow/view/http.go @@ -3,10 +3,10 @@ package view import ( "fmt" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - runShared "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + runShared "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" ) type workflowRuns struct { diff --git a/pkg/cmd/workflow/view/view.go b/pkg/cmd/workflow/view/view.go index 14ce6c69d..dc38ed42c 100644 --- a/pkg/cmd/workflow/view/view.go +++ b/pkg/cmd/workflow/view/view.go @@ -7,14 +7,14 @@ import ( "strings" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/api" - "github.com/cli/cli/internal/ghrepo" - runShared "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/markdown" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/api" + "github.com/cli/cli/v2/internal/ghrepo" + runShared "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/markdown" + "github.com/cli/cli/v2/utils" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/workflow/view/view_test.go b/pkg/cmd/workflow/view/view_test.go index 005b5c1f2..44f92310a 100644 --- a/pkg/cmd/workflow/view/view_test.go +++ b/pkg/cmd/workflow/view/view_test.go @@ -7,13 +7,13 @@ import ( "testing" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/internal/ghrepo" - runShared "github.com/cli/cli/pkg/cmd/run/shared" - "github.com/cli/cli/pkg/cmd/workflow/shared" - "github.com/cli/cli/pkg/cmdutil" - "github.com/cli/cli/pkg/httpmock" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/prompt" + "github.com/cli/cli/v2/internal/ghrepo" + runShared "github.com/cli/cli/v2/pkg/cmd/run/shared" + "github.com/cli/cli/v2/pkg/cmd/workflow/shared" + "github.com/cli/cli/v2/pkg/cmdutil" + "github.com/cli/cli/v2/pkg/httpmock" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/prompt" "github.com/google/shlex" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/workflow/workflow.go b/pkg/cmd/workflow/workflow.go index 4af1fdc99..964034840 100644 --- a/pkg/cmd/workflow/workflow.go +++ b/pkg/cmd/workflow/workflow.go @@ -1,12 +1,12 @@ package workflow import ( - cmdDisable "github.com/cli/cli/pkg/cmd/workflow/disable" - cmdEnable "github.com/cli/cli/pkg/cmd/workflow/enable" - cmdList "github.com/cli/cli/pkg/cmd/workflow/list" - cmdRun "github.com/cli/cli/pkg/cmd/workflow/run" - cmdView "github.com/cli/cli/pkg/cmd/workflow/view" - "github.com/cli/cli/pkg/cmdutil" + cmdDisable "github.com/cli/cli/v2/pkg/cmd/workflow/disable" + cmdEnable "github.com/cli/cli/v2/pkg/cmd/workflow/enable" + cmdList "github.com/cli/cli/v2/pkg/cmd/workflow/list" + cmdRun "github.com/cli/cli/v2/pkg/cmd/workflow/run" + cmdView "github.com/cli/cli/v2/pkg/cmd/workflow/view" + "github.com/cli/cli/v2/pkg/cmdutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmdutil/auth_check.go b/pkg/cmdutil/auth_check.go index df40390fd..3da9cfcfd 100644 --- a/pkg/cmdutil/auth_check.go +++ b/pkg/cmdutil/auth_check.go @@ -1,7 +1,7 @@ package cmdutil import ( - "github.com/cli/cli/internal/config" + "github.com/cli/cli/v2/internal/config" "github.com/spf13/cobra" ) diff --git a/pkg/cmdutil/auth_check_test.go b/pkg/cmdutil/auth_check_test.go index 2798750f0..adbfac992 100644 --- a/pkg/cmdutil/auth_check_test.go +++ b/pkg/cmdutil/auth_check_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/cli/cli/internal/config" + "github.com/cli/cli/v2/internal/config" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmdutil/factory.go b/pkg/cmdutil/factory.go index 254d2f2df..2430a2150 100644 --- a/pkg/cmdutil/factory.go +++ b/pkg/cmdutil/factory.go @@ -3,11 +3,11 @@ package cmdutil import ( "net/http" - "github.com/cli/cli/context" - "github.com/cli/cli/internal/config" - "github.com/cli/cli/internal/ghrepo" - "github.com/cli/cli/pkg/extensions" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/context" + "github.com/cli/cli/v2/internal/config" + "github.com/cli/cli/v2/internal/ghrepo" + "github.com/cli/cli/v2/pkg/extensions" + "github.com/cli/cli/v2/pkg/iostreams" ) type Browser interface { diff --git a/pkg/cmdutil/json_flags.go b/pkg/cmdutil/json_flags.go index 48d899b92..8b7ed4dd7 100644 --- a/pkg/cmdutil/json_flags.go +++ b/pkg/cmdutil/json_flags.go @@ -10,10 +10,10 @@ import ( "sort" "strings" - "github.com/cli/cli/pkg/export" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/jsoncolor" - "github.com/cli/cli/pkg/set" + "github.com/cli/cli/v2/pkg/export" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/jsoncolor" + "github.com/cli/cli/v2/pkg/set" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/pkg/cmdutil/json_flags_test.go b/pkg/cmdutil/json_flags_test.go index 33fedd2a1..fcc7f9ccb 100644 --- a/pkg/cmdutil/json_flags_test.go +++ b/pkg/cmdutil/json_flags_test.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "testing" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/iostreams" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cmdutil/legacy.go b/pkg/cmdutil/legacy.go index 57cdf855b..19400f1cc 100644 --- a/pkg/cmdutil/legacy.go +++ b/pkg/cmdutil/legacy.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/cli/cli/internal/config" + "github.com/cli/cli/v2/internal/config" ) // TODO: consider passing via Factory diff --git a/pkg/cmdutil/repo_override.go b/pkg/cmdutil/repo_override.go index bdbe3a518..f0550e2d7 100644 --- a/pkg/cmdutil/repo_override.go +++ b/pkg/cmdutil/repo_override.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/v2/internal/ghrepo" "github.com/spf13/cobra" ) diff --git a/pkg/export/template.go b/pkg/export/template.go index 67e26949d..6e1d6f699 100644 --- a/pkg/export/template.go +++ b/pkg/export/template.go @@ -11,9 +11,9 @@ import ( "text/template" "time" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/text" - "github.com/cli/cli/utils" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/text" + "github.com/cli/cli/v2/utils" "github.com/mgutz/ansi" ) diff --git a/pkg/export/template_test.go b/pkg/export/template_test.go index 389403683..fc44a1275 100644 --- a/pkg/export/template_test.go +++ b/pkg/export/template_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/MakeNowJust/heredoc" - "github.com/cli/cli/pkg/iostreams" + "github.com/cli/cli/v2/pkg/iostreams" ) func Test_jsonScalarToString(t *testing.T) { diff --git a/script/build.go b/script/build.go index 3d04fd6b2..50fb85f17 100644 --- a/script/build.go +++ b/script/build.go @@ -46,11 +46,11 @@ var tasks = map[string]func(string) error{ } ldflags := os.Getenv("GO_LDFLAGS") - ldflags = fmt.Sprintf("-X github.com/cli/cli/internal/build.Version=%s %s", version(), ldflags) - ldflags = fmt.Sprintf("-X github.com/cli/cli/internal/build.Date=%s %s", date(), ldflags) + ldflags = fmt.Sprintf("-X github.com/cli/cli/v2/internal/build.Version=%s %s", version(), ldflags) + ldflags = fmt.Sprintf("-X github.com/cli/cli/v2/internal/build.Date=%s %s", date(), ldflags) if oauthSecret := os.Getenv("GH_OAUTH_CLIENT_SECRET"); oauthSecret != "" { - ldflags = fmt.Sprintf("-X github.com/cli/cli/internal/authflow.oauthClientSecret=%s %s", oauthSecret, ldflags) - ldflags = fmt.Sprintf("-X github.com/cli/cli/internal/authflow.oauthClientID=%s %s", os.Getenv("GH_OAUTH_CLIENT_ID"), ldflags) + ldflags = fmt.Sprintf("-X github.com/cli/cli/v2/internal/authflow.oauthClientSecret=%s %s", oauthSecret, ldflags) + ldflags = fmt.Sprintf("-X github.com/cli/cli/v2/internal/authflow.oauthClientID=%s %s", os.Getenv("GH_OAUTH_CLIENT_ID"), ldflags) } return run("go", "build", "-trimpath", "-ldflags", ldflags, "-o", exe, "./cmd/gh") diff --git a/utils/table_printer.go b/utils/table_printer.go index 6780e2790..6c937f35d 100644 --- a/utils/table_printer.go +++ b/utils/table_printer.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "github.com/cli/cli/pkg/iostreams" - "github.com/cli/cli/pkg/text" + "github.com/cli/cli/v2/pkg/iostreams" + "github.com/cli/cli/v2/pkg/text" ) type TablePrinter interface {