Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions cmd/cloud/apps/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (c *DeployCtrl) waitRunCompletion(cmd *cobra.Command) error {

c.store.logs = l.ReadLogsResponse.Data

return fmt.Errorf("deployment failed: %s", c.store.ID)
return nil
default:
continue
}
Expand All @@ -170,9 +170,11 @@ func (c *DeployCtrl) waitRunCompletion(cmd *cobra.Command) error {
}

func (c *DeployCtrl) Render(cmd *cobra.Command, args []string) error {
if c.store.Run.Status == "errored" && len(c.store.logs) > 0 {
if err := printer.RenderLogs(cmd.ErrOrStderr(), c.store.logs); err != nil {
return err
if c.store.Run.Status == "errored" {
if len(c.store.logs) > 0 {
if err := printer.RenderLogs(cmd.ErrOrStderr(), c.store.logs); err != nil {
return err
}
}
return fmt.Errorf("deployment failed: %s", c.store.ID)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/cloud/organizations/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (c *CreateController) Run(cmd *cobra.Command, args []string) (fctl.Renderab
return nil, err
}

_, apiClient, err := fctl.NewMembershipClientForOrganizationFromFlags(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile)
apiClient, err := fctl.NewMembershipClient(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/cloud/organizations/invitations/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

func NewCommand() *cobra.Command {
return fctl.NewStackCommand("invitations",
return fctl.NewMembershipCommand("invitations",
fctl.WithAliases("invit", "inv", "i", "invitation"),
fctl.WithShortDescription("Invitations management"),
fctl.WithChildCommands(
Expand Down
2 changes: 1 addition & 1 deletion cmd/cloud/organizations/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
)

func NewCommand() *cobra.Command {
return fctl.NewStackCommand("organizations",
return fctl.NewCommand("organizations",
fctl.WithAliases("org", "o", "organization"),
fctl.WithShortDescription("Organizations management"),
fctl.WithChildCommands(
Expand Down
Loading