Skip to content

Cost Estimation CLI output unnecessary #27735

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

Merged
omarismail merged 2 commits into from
Feb 11, 2021
Merged

Cost Estimation CLI output unnecessary #27735

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d96c90b
Cost Estimation CLI output unnecessary
omarismail Feb 10, 2021
4ac095b
only print horizontal rule at first attempt
omarismail Feb 11, 2021
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
17 changes: 9 additions & 8 deletions backend/remote/backend_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,7 @@ func (b *Remote) costEstimate(stopCtx, cancelCtx context.Context, op *backend.Op
return nil
}

if b.CLI != nil {
b.CLI.Output("\n------------------------------------------------------------------------\n")
}

msgPrefix := "Cost estimation"
if b.CLI != nil {
b.CLI.Output(b.Colorize().Color(msgPrefix + ":\n"))
}

started := time.Now()
updated := started
for i := 0; ; i++ {
Expand All @@ -284,6 +276,12 @@ func (b *Remote) costEstimate(stopCtx, cancelCtx context.Context, op *backend.Op
}
}

// checking if i == 0 so as to avoid printing this starting horizontal-rule
// every retry, and that it only prints it on the first (i=0) attempt.
if b.CLI != nil && i == 0 {
b.CLI.Output("\n------------------------------------------------------------------------\n")
Copy link
Contributor Author

@omarismail omarismail Feb 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved the starting output ---- here because on line 274 we check to ensure that there are no errors/cancellations.

Copy link
Contributor

@mwhooker mwhooker Feb 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean that we might see a couple of lines of ----s if we hit CostEstimatePending, tfe.CostEstimateQueued? I know this kind of procedural flow makes it hard to do this correctly, but I'm thinking we shouldn't show this separator every iteration

}

switch ce.Status {
case tfe.CostEstimateFinished:
delta, err := strconv.ParseFloat(ce.DeltaMonthlyCost, 64)
Expand All @@ -299,6 +297,7 @@ func (b *Remote) costEstimate(stopCtx, cancelCtx context.Context, op *backend.Op
deltaRepr := strings.Replace(ce.DeltaMonthlyCost, "-", "", 1)

if b.CLI != nil {
b.CLI.Output(b.Colorize().Color(msgPrefix + ":\n"))
Copy link
Contributor Author

@omarismail omarismail Feb 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved the specific msgPrefix part here and the other lines below because other cases have a different prefex mesage, and there wasn't a clean way to not duplicate.

b.CLI.Output(b.Colorize().Color(fmt.Sprintf("Resources: %d of %d estimated", ce.MatchedResourcesCount, ce.ResourcesCount)))
b.CLI.Output(b.Colorize().Color(fmt.Sprintf(" $%s/mo %s$%s", ce.ProposedMonthlyCost, sign, deltaRepr)))

Expand All @@ -320,10 +319,12 @@ func (b *Remote) costEstimate(stopCtx, cancelCtx context.Context, op *backend.Op
elapsed = fmt.Sprintf(
" (%s elapsed)", current.Sub(started).Truncate(30*time.Second))
}
b.CLI.Output(b.Colorize().Color(msgPrefix + ":\n"))
b.CLI.Output(b.Colorize().Color("Waiting for cost estimate to complete..." + elapsed + "\n"))
}
continue
case tfe.CostEstimateSkippedDueToTargeting:
b.CLI.Output(b.Colorize().Color(msgPrefix + ":\n"))
b.CLI.Output("Not available for this plan, because it was created with the -target option.")
b.CLI.Output("\n------------------------------------------------------------------------")
return nil
Expand Down