Move internal/api to internal/codespaces/api

josebalius · josebalius · commit b5bbb442fd61 · 2021-09-30T11:06:43.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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/codespaces/api/api.go b/internal/codespaces/api/api.go
diff --git a/internal/codespaces/api/api_test.go b/internal/codespaces/api/api_test.go
diff --git 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
@@ -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
@@ -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"}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"github.com/AlecAivazis/survey/v2"`
`14`	`14`	`"github.com/AlecAivazis/survey/v2/terminal"`
`15`	`15`	`"github.com/cli/cli/v2/cmd/ghcs/output"`
`16`		`- "github.com/cli/cli/v2/internal/api"`
	`16`	`+ "github.com/cli/cli/v2/internal/codespaces/api"`
`17`	`17`	`"github.com/spf13/cobra"`
`18`	`18`	`"golang.org/x/term"`
`19`	`19`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"time"`
`9`	`9`
`10`	`10`	`"github.com/AlecAivazis/survey/v2"`
`11`		`- "github.com/cli/cli/v2/internal/api"`
	`11`	`+ "github.com/cli/cli/v2/internal/codespaces/api"`
`12`	`12`	`"github.com/spf13/cobra"`
`13`	`13`	`"golang.org/x/sync/errgroup"`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`"github.com/MakeNowJust/heredoc"`
`14`	`14`	`"github.com/cli/cli/v2/cmd/ghcs/output"`
`15`		`- "github.com/cli/cli/v2/internal/api"`
	`15`	`+ "github.com/cli/cli/v2/internal/codespaces/api"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func TestDelete(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"os"`
`7`	`7`
`8`	`8`	`"github.com/cli/cli/v2/cmd/ghcs/output"`
`9`		`- "github.com/cli/cli/v2/internal/api"`
	`9`	`+ "github.com/cli/cli/v2/internal/codespaces/api"`
`10`	`10`	`"github.com/spf13/cobra"`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/cli/cli/v2/cmd/ghcs"`
`11`	`11`	`"github.com/cli/cli/v2/cmd/ghcs/output"`
`12`		`- "github.com/cli/cli/v2/internal/api"`
	`12`	`+ "github.com/cli/cli/v2/internal/codespaces/api"`
`13`	`13`	`"github.com/spf13/cobra"`
`14`	`14`	`)`
`15`	`15`