Merge branch 'trunk' of github.com:cli/cli into jg/move-ghcs-cmd

internal/codespaces/codespaces.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/cli/cli/v2/internal/api"
-	"github.com/cli/cli/v2/internal/liveshare"
+	"github.com/cli/cli/v2/internal/codespaces/api"
+	"github.com/cli/cli/v2/pkg/liveshare"
 )
 
 type logger interface {

internal/codespaces/states.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cli/cli/v2/internal/api"
-	"github.com/cli/cli/v2/internal/liveshare"
+	"github.com/cli/cli/v2/internal/codespaces/api"
+	"github.com/cli/cli/v2/pkg/liveshare"
 )
 
 // PostCreateStateStatus is a string value representing the different statuses a state can have.

pkg/cmd/codespace/common.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/AlecAivazis/survey/v2/terminal"
-	"github.com/cli/cli/v2/internal/api"
+	"github.com/cli/cli/v2/internal/codespaces/api"
 	"github.com/cli/cli/v2/pkg/cmd/codespace/output"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"

pkg/cmd/codespace/create.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/cli/cli/v2/internal/api"
 	"github.com/cli/cli/v2/internal/codespaces"
+	"github.com/cli/cli/v2/internal/codespaces/api"
 	"github.com/cli/cli/v2/pkg/cmd/codespace/output"
 	"github.com/fatih/camelcase"
 	"github.com/spf13/cobra"

pkg/cmd/codespace/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"
 )

pkg/cmd/codespace/delete_test.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/cli/cli/v2/internal/api"
+	"github.com/cli/cli/v2/internal/codespaces/api"
 	"github.com/cli/cli/v2/pkg/cmd/codespace/output"
 )
 

pkg/cmd/codespace/list.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/cli/cli/v2/internal/api"
+	"github.com/cli/cli/v2/internal/codespaces/api"
 	"github.com/cli/cli/v2/pkg/cmd/codespace/output"
 	"github.com/spf13/cobra"
 )

pkg/cmd/codespace/logs.go

@@ -6,7 +6,7 @@ import (
 	"net"
 
 	"github.com/cli/cli/v2/internal/codespaces"
-	"github.com/cli/cli/v2/internal/liveshare"
+	"github.com/cli/cli/v2/pkg/liveshare"
 	"github.com/spf13/cobra"
 )
 

pkg/cmd/codespace/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.

pkg/cmd/codespace/ports.go

@@ -11,10 +11,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cli/cli/v2/internal/api"
 	"github.com/cli/cli/v2/internal/codespaces"
-	"github.com/cli/cli/v2/internal/liveshare"
+	"github.com/cli/cli/v2/internal/codespaces/api"
 	"github.com/cli/cli/v2/pkg/cmd/codespace/output"
+	"github.com/cli/cli/v2/pkg/liveshare"
 	"github.com/muhammadmuzzammil1998/jsonc"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"

pkg/cmd/codespace/ssh.go

@@ -6,7 +6,7 @@ import (
 	"net"
 
 	"github.com/cli/cli/v2/internal/codespaces"
-	"github.com/cli/cli/v2/internal/liveshare"
+	"github.com/cli/cli/v2/pkg/liveshare"
 	"github.com/spf13/cobra"
 )
 

pkg/cmd/root/root.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/MakeNowJust/heredoc"
-	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 := codespaceCmd.NewRootCmd(codespaceCmd.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"}

pkg/liveshare/client_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	livesharetest "github.com/cli/cli/v2/internal/liveshare/test"
+	livesharetest "github.com/cli/cli/v2/pkg/liveshare/test"
 	"github.com/sourcegraph/jsonrpc2"
 )
 

pkg/liveshare/port_forwarder_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	livesharetest "github.com/cli/cli/v2/internal/liveshare/test"
+	livesharetest "github.com/cli/cli/v2/pkg/liveshare/test"
 	"github.com/sourcegraph/jsonrpc2"
 )
 

pkg/liveshare/session_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	livesharetest "github.com/cli/cli/v2/internal/liveshare/test"
+	livesharetest "github.com/cli/cli/v2/pkg/liveshare/test"
 	"github.com/sourcegraph/jsonrpc2"
 )