Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Making output more consistent #312

Merged
merged 1 commit into from
Aug 18, 2023
Merged

Making output more consistent #312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions cli/cmd/cluster_prepare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@ func (r *runners) prepareCluster(_ *cobra.Command, args []string) error {
clusterID := ""

if r.args.prepareClusterID == "" {
log.ChildActionWithoutSpinner("SEQUENCE: %d", release.Sequence)

if r.args.prepareClusterName == "" {
r.args.prepareClusterName = generateClusterName()
}
Expand Down Expand Up @@ -194,7 +192,7 @@ func (r *runners) prepareCluster(_ *cobra.Command, args []string) error {
fmt.Printf("Failed to wait for cluster %s to be ready: %v\n", cl.ID, err)
}

fmt.Fprintf(r.w, "Cluster %s (%s) created.\n", cl.Name, cl.ID)
log.ActionWithoutSpinner("Cluster %s (%s) created.\n", cl.Name, cl.ID)
}(&wg)
} else {
// need to get the cluster info to get the name to pass to the customer
Expand Down Expand Up @@ -253,15 +251,15 @@ func (r *runners) prepareCluster(_ *cobra.Command, args []string) error {
if appRelease.IsHelmOnly {
customerOpts.IsKotInstallEnabled = false
}
log.ActionWithSpinner("Creating Customer")
customer, err := r.api.CreateCustomer(r.appType, customerOpts)
if err != nil {
log.FinishSpinnerWithError()
return errors.Wrap(err, "failed to create customer")
}
log.FinishSpinner()

_, err = fmt.Fprintf(r.w, "Customer %s (%s) created.\n", customer.Name, customer.ID)
if err != nil {
return errors.Wrap(err, "failed to write to stdout")
}
log.ChildActionWithoutSpinner("Customer %s (%s) created.\n", customer.Name, customer.ID)

// wait for the wait group
wg.Wait()
Expand Down Expand Up @@ -335,6 +333,8 @@ func prepareRelease(r *runners, log *logger.Logger) (*types.ReleaseInfo, error)
}
log.FinishSpinner()

log.ChildActionWithoutSpinner("SEQUENCE: %d", release.Sequence)

return release, nil
}

Expand Down Expand Up @@ -583,7 +583,7 @@ func installHelmChart(r *runners, appSlug string, chartName string, releaseSeque

registryClient, err := registry.NewClient(
registry.ClientOptDebug(settings.Debug),
registry.ClientOptWriter(r.w),
registry.ClientOptWriter(io.Discard),
registry.ClientOptCredentialsFile(credentialsFile),
)
if err != nil {
Expand Down