actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-24 16:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge pull request #4922 from bkreitch/stop-spinner-on-cancel

Browse source 
Stop spinner on cancel of flux diff kustomization
This commit is contained in:
Stefan Prodan 2024-08-09 17:24:00 +03:00 committed by GitHub
commit 52512a94a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
internal/build/build.go
View file

@ -583,10 +583,44 @@ func (b *Builder) Cancel() error {
b.mu.Lock() b.mu.Lock()
defer b.mu.Unlock() defer b.mu.Unlock()
err := kustomize.CleanDirectory(b.resourcesPath, b.action) err := b.stopSpinner()
if err != nil {
return err
}
err = kustomize.CleanDirectory(b.resourcesPath, b.action)
if err != nil { if err != nil {
return err return err
} }
return nil return nil
} }
func (b *Builder) startSpinner() error {
if b.spinner == nil {
return nil
}
err := b.spinner.Start()
if err != nil {
return fmt.Errorf("failed to start spinner: %w", err)
}
return nil
}
func (b *Builder) stopSpinner() error {
if b.spinner == nil {
return nil
}
status := b.spinner.Status()
if status == yacspin.SpinnerRunning || status == yacspin.SpinnerPaused {
err := b.spinner.Stop()
if err != nil {
return fmt.Errorf("failed to stop spinner: %w", err)
}
}
return nil
}

16
internal/build/diff.go
View file

@ -77,11 +77,9 @@ func (b *Builder) Diff() (string, bool, error) {
ctx, cancel := context.WithTimeout(context.Background(), b.timeout) ctx, cancel := context.WithTimeout(context.Background(), b.timeout)
defer cancel() defer cancel()
if b.spinner != nil { err = b.startSpinner()
err = b.spinner.Start() if err != nil {
if err != nil { return "", false, err
return "", false, fmt.Errorf("failed to start spinner: %w", err)
}
} }
var diffErrs []error var diffErrs []error
@ -151,11 +149,9 @@ func (b *Builder) Diff() (string, bool, error) {
} }
} }
if b.spinner != nil { err = b.stopSpinner()
err = b.spinner.Stop() if err != nil {
if err != nil { return "", createdOrDrifted, err
return "", createdOrDrifted, fmt.Errorf("failed to stop spinner: %w", err)
}
} }
return output.String(), createdOrDrifted, errors.Reduce(errors.Flatten(errors.NewAggregate(diffErrs))) return output.String(), createdOrDrifted, errors.Reduce(errors.Flatten(errors.NewAggregate(diffErrs)))