Merge branch 'trunk' of github.com:cli/cli into jg/liveshare-keepalive

josebalius · josebalius · commit 9c8351ecd82c · 2021-10-07T11:10:45.000-04:00
diff --git a/internal/codespaces/api/api.go b/internal/codespaces/api/api.go
@@ -425,7 +425,7 @@ type CreateCodespaceParams struct {
 func (a *API) CreateCodespace(ctx context.Context, params *CreateCodespaceParams) (*Codespace, error) {
 	codespace, err := a.startCreate(ctx, params.RepositoryID, params.Machine, params.Branch, params.Location)
 	if err != errProvisioningInProgress {
-		return nil, err
+		return codespace, err
 	}
 
 	// errProvisioningInProgress indicates that codespace creation did not complete
diff --git a/pkg/cmd/extension/manager.go b/pkg/cmd/extension/manager.go
@@ -46,6 +46,7 @@ func NewManager(io *iostreams.IOStreams) *Manager {
 		platform: func() string {
 			return fmt.Sprintf("%s-%s", runtime.GOOS, runtime.GOARCH)
 		},
+		io: io,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ type CreateCodespaceParams struct {`
`425`	`425`	`func (a API) CreateCodespace(ctx context.Context, params CreateCodespaceParams) (*Codespace, error) {`
`426`	`426`	`codespace, err := a.startCreate(ctx, params.RepositoryID, params.Machine, params.Branch, params.Location)`
`427`	`427`	`if err != errProvisioningInProgress {`
`428`		`- return nil, err`
	`428`	`+ return codespace, err`
`429`	`429`	`}`
`430`	`430`
`431`	`431`	`// errProvisioningInProgress indicates that codespace creation did not complete`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ func NewManager(io iostreams.IOStreams) Manager {`
`46`	`46`	`platform: func() string {`
`47`	`47`	`return fmt.Sprintf("%s-%s", runtime.GOOS, runtime.GOARCH)`
`48`	`48`	`},`
	`49`	`+ io: io,`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`