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

feat: optimize terminal ui for kusion apply #1241

Merged
merged 1 commit into from
Jul 30, 2024
Merged

feat: optimize terminal ui for kusion apply #1241

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
24 changes: 17 additions & 7 deletions pkg/cmd/apply/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ func Apply(
// The writer below is for operation error printing.
errWriter := multi.NewWriter()

multi.WithUpdateDelay(time.Millisecond * 50)
multi.WithUpdateDelay(time.Millisecond * 100)
multi.Start()
defer multi.Stop()

Expand All @@ -536,6 +536,7 @@ func Apply(
progressbar,
&ls,
o.DryRun,
o.Watch,
)

watchErrCh := make(chan error)
Expand Down Expand Up @@ -614,6 +615,7 @@ func PrintApplyDetails(
progressbar *pterm.ProgressbarPrinter,
ls *lineSummary,
dryRun bool,
watch bool,
) {
defer func() {
if p := recover(); p != nil {
Expand Down Expand Up @@ -649,11 +651,15 @@ func PrintApplyDetails(
title = fmt.Sprintf("Skipped %s", pterm.Bold.Sprint(changeStep.ID))
changesWriterMap[msg.ResourceID].Success(title)
} else {
title = fmt.Sprintf("%s %s",
changeStep.Action.Ing(),
pterm.Bold.Sprint(changeStep.ID),
)
changesWriterMap[msg.ResourceID].UpdateText(title)
if watch {
title = fmt.Sprintf("%s %s",
changeStep.Action.Ing(),
pterm.Bold.Sprint(changeStep.ID),
)
changesWriterMap[msg.ResourceID].UpdateText(title)
} else {
changesWriterMap[msg.ResourceID].Success(fmt.Sprintf("Succeeded %s", pterm.Bold.Sprint(msg.ResourceID)))
}
}
progressbar.Increment()
ls.Count(changeStep.Action)
Expand Down Expand Up @@ -720,7 +726,7 @@ func Watch(

// Prepare the tables for printing the details of the resources.
tables := make(map[string]*printers.Table, len(toBeWatched))
ticker := time.NewTicker(time.Millisecond * 500)
ticker := time.NewTicker(time.Millisecond * 100)
defer ticker.Stop()

// Record the watched and finished resources.
Expand Down Expand Up @@ -774,6 +780,10 @@ func Watch(
printTable(&w, id, tables)
}
for id, table := range tables {
if finished[id] {
continue
}

if table.AllCompleted() {
finished[id] = true
changesWriterMap[id].Success(fmt.Sprintf("Succeeded %s", pterm.Bold.Sprint(id)))
Expand Down
Loading