From b5bbb442fd61dae0581ae1758958a0d943181bcf Mon Sep 17 00:00:00 2001 From: Jose Garcia Date: Thu, 30 Sep 2021 11:06:43 -0400 Subject: [PATCH 1/2] Move `internal/api` to `internal/codespaces/api` --- cmd/ghcs/common.go | 2 +- cmd/ghcs/create.go | 2 +- cmd/ghcs/delete.go | 2 +- cmd/ghcs/delete_test.go | 2 +- cmd/ghcs/list.go | 2 +- cmd/ghcs/main/main.go | 2 +- cmd/ghcs/mock_api.go | 2 +- cmd/ghcs/ports.go | 2 +- internal/{ => codespaces}/api/api.go | 0 internal/{ => codespaces}/api/api_test.go | 0 internal/codespaces/codespaces.go | 2 +- internal/codespaces/states.go | 2 +- pkg/cmd/root/root.go | 4 ++-- 13 files changed, 12 insertions(+), 12 deletions(-) rename internal/{ => codespaces}/api/api.go (100%) rename internal/{ => codespaces}/api/api_test.go (100%) diff --git a/cmd/ghcs/common.go b/cmd/ghcs/common.go index d69ffd964..64286e3bd 100644 --- a/cmd/ghcs/common.go +++ b/cmd/ghcs/common.go @@ -13,7 +13,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/cli/cli/v2/cmd/ghcs/output" - "github.com/cli/cli/v2/internal/api" + "github.com/cli/cli/v2/internal/codespaces/api" "github.com/spf13/cobra" "golang.org/x/term" ) diff --git a/cmd/ghcs/create.go b/cmd/ghcs/create.go index c184a0ff7..c6f1e6e38 100644 --- a/cmd/ghcs/create.go +++ b/cmd/ghcs/create.go @@ -9,7 +9,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/cli/cli/v2/cmd/ghcs/output" - "github.com/cli/cli/v2/internal/api" + "github.com/cli/cli/v2/internal/codespaces/api" "github.com/cli/cli/v2/internal/codespaces" "github.com/fatih/camelcase" "github.com/spf13/cobra" diff --git a/cmd/ghcs/delete.go b/cmd/ghcs/delete.go index 228ed99ba..c0292f357 100644 --- a/cmd/ghcs/delete.go +++ b/cmd/ghcs/delete.go @@ -8,7 +8,7 @@ import ( "time" "github.com/AlecAivazis/survey/v2" - "github.com/cli/cli/v2/internal/api" + "github.com/cli/cli/v2/internal/codespaces/api" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" ) diff --git a/cmd/ghcs/delete_test.go b/cmd/ghcs/delete_test.go index af30bc542..1c239a74e 100644 --- a/cmd/ghcs/delete_test.go +++ b/cmd/ghcs/delete_test.go @@ -12,7 +12,7 @@ import ( "github.com/MakeNowJust/heredoc" "github.com/cli/cli/v2/cmd/ghcs/output" - "github.com/cli/cli/v2/internal/api" + "github.com/cli/cli/v2/internal/codespaces/api" ) func TestDelete(t *testing.T) { diff --git a/cmd/ghcs/list.go b/cmd/ghcs/list.go index 679325eff..1c45949aa 100644 --- a/cmd/ghcs/list.go +++ b/cmd/ghcs/list.go @@ -6,7 +6,7 @@ import ( "os" "github.com/cli/cli/v2/cmd/ghcs/output" - "github.com/cli/cli/v2/internal/api" + "github.com/cli/cli/v2/internal/codespaces/api" "github.com/spf13/cobra" ) diff --git a/cmd/ghcs/main/main.go b/cmd/ghcs/main/main.go index 455a8c302..ea7345dc9 100644 --- a/cmd/ghcs/main/main.go +++ b/cmd/ghcs/main/main.go @@ -9,7 +9,7 @@ import ( "github.com/cli/cli/v2/cmd/ghcs" "github.com/cli/cli/v2/cmd/ghcs/output" - "github.com/cli/cli/v2/internal/api" + "github.com/cli/cli/v2/internal/codespaces/api" "github.com/spf13/cobra" ) diff --git a/cmd/ghcs/mock_api.go b/cmd/ghcs/mock_api.go index f9733e9bc..268a6552e 100644 --- a/cmd/ghcs/mock_api.go +++ b/cmd/ghcs/mock_api.go @@ -7,7 +7,7 @@ import ( "context" "sync" - "github.com/cli/cli/v2/internal/api" + "github.com/cli/cli/v2/internal/codespaces/api" ) // apiClientMock is a mock implementation of apiClient. diff --git a/cmd/ghcs/ports.go b/cmd/ghcs/ports.go index 27467d150..ef7182df4 100644 --- a/cmd/ghcs/ports.go +++ b/cmd/ghcs/ports.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/cli/cli/v2/cmd/ghcs/output" - "github.com/cli/cli/v2/internal/api" + "github.com/cli/cli/v2/internal/codespaces/api" "github.com/cli/cli/v2/internal/codespaces" "github.com/cli/cli/v2/internal/liveshare" "github.com/muhammadmuzzammil1998/jsonc" diff --git a/internal/api/api.go b/internal/codespaces/api/api.go similarity index 100% rename from internal/api/api.go rename to internal/codespaces/api/api.go diff --git a/internal/api/api_test.go b/internal/codespaces/api/api_test.go similarity index 100% rename from internal/api/api_test.go rename to internal/codespaces/api/api_test.go diff --git a/internal/codespaces/codespaces.go b/internal/codespaces/codespaces.go index f127cb362..0780a40e8 100644 --- a/internal/codespaces/codespaces.go +++ b/internal/codespaces/codespaces.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/cli/cli/v2/internal/api" + "github.com/cli/cli/v2/internal/codespaces/api" "github.com/cli/cli/v2/internal/liveshare" ) diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go index 7bd53b5e0..67d2c3ec6 100644 --- a/internal/codespaces/states.go +++ b/internal/codespaces/states.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/cli/cli/v2/internal/api" + "github.com/cli/cli/v2/internal/codespaces/api" "github.com/cli/cli/v2/internal/liveshare" ) diff --git a/pkg/cmd/root/root.go b/pkg/cmd/root/root.go index bb36b9592..45b96b983 100644 --- a/pkg/cmd/root/root.go +++ b/pkg/cmd/root/root.go @@ -7,7 +7,7 @@ import ( "github.com/MakeNowJust/heredoc" "github.com/cli/cli/v2/cmd/ghcs" "github.com/cli/cli/v2/cmd/ghcs/output" - ghcsApi "github.com/cli/cli/v2/internal/api" + codespacesAPI "github.com/cli/cli/v2/internal/codespaces/api" 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" @@ -130,7 +130,7 @@ func bareHTTPClient(f *cmdutil.Factory, version string) func() (*http.Client, er func newCodespaceCmd(f *cmdutil.Factory) *cobra.Command { cmd := ghcs.NewRootCmd(ghcs.NewApp( output.NewLogger(f.IOStreams.Out, f.IOStreams.ErrOut, !f.IOStreams.IsStdoutTTY()), - ghcsApi.New("", &lazyLoadedHTTPClient{factory: f}), + codespacesAPI.New("", &lazyLoadedHTTPClient{factory: f}), )) cmd.Use = "codespace" cmd.Aliases = []string{"cs"} From 23d41ddb0d0e204a6816e51d4a296ae68fd360bd Mon Sep 17 00:00:00 2001 From: Jose Garcia Date: Thu, 30 Sep 2021 11:09:59 -0400 Subject: [PATCH 2/2] Format files --- cmd/ghcs/create.go | 2 +- cmd/ghcs/ports.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/ghcs/create.go b/cmd/ghcs/create.go index c6f1e6e38..9f0e6c956 100644 --- a/cmd/ghcs/create.go +++ b/cmd/ghcs/create.go @@ -9,8 +9,8 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/cli/cli/v2/cmd/ghcs/output" - "github.com/cli/cli/v2/internal/codespaces/api" "github.com/cli/cli/v2/internal/codespaces" + "github.com/cli/cli/v2/internal/codespaces/api" "github.com/fatih/camelcase" "github.com/spf13/cobra" ) diff --git a/cmd/ghcs/ports.go b/cmd/ghcs/ports.go index ef7182df4..35586feca 100644 --- a/cmd/ghcs/ports.go +++ b/cmd/ghcs/ports.go @@ -12,8 +12,8 @@ import ( "strings" "github.com/cli/cli/v2/cmd/ghcs/output" - "github.com/cli/cli/v2/internal/codespaces/api" "github.com/cli/cli/v2/internal/codespaces" + "github.com/cli/cli/v2/internal/codespaces/api" "github.com/cli/cli/v2/internal/liveshare" "github.com/muhammadmuzzammil1998/jsonc" "github.com/spf13/cobra"