tag v0.155.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.155.0 ---------------- * Fedora 43: add shadow-utils when LockRoot is enabled, update cloud-init service name (osbuild/images#1618) * Author: Achilleas Koutsou, Reviewers: Gianluca Zuccarelli, Michael Vogt * Update osbuild dependency commit ID to latest (osbuild/images#1609) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza * Update snapshots to 20250626 (osbuild/images#1623) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro/rhel9: xz compress azure-cvm image type [HMS-8587] (osbuild/images#1620) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: introduce new image type: Azure SAP Apps [HMS-8738] (osbuild/images#1612) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: move ansible-core to sap_extras_pkgset (osbuild/images#1624) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Tomáš Hozza * github/create-tag: allow passing the version when run manually (osbuild/images#1621) * Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza * rhel9: move image-config into pure YAML (HMS-8593) (osbuild/images#1616) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * test: split manifest checksums into separate files (osbuild/images#1625) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-06-30 --- tag v0.156.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.156.0 ---------------- * Many: delete repositories for EOL distributions (HMS-7044) (osbuild/images#1607) * Author: Tomáš Hozza, Reviewers: Michael Vogt, Simon de Vlieger * RHSM/facts: add 'image-builder CLI' API type (osbuild/images#1640) * Author: Tomáš Hozza, Reviewers: Brian C. Lane, Simon de Vlieger * Update dependencies 2025-06-29 (osbuild/images#1628) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * Update osbuild dependency commit ID to latest (osbuild/images#1627) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * [RFC] image: drop `InstallWeakDeps` from image.DiskImage (osbuild/images#1642) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger, Tomáš Hozza * build(deps): bump the go-deps group across 1 directory with 3 updates (osbuild/images#1632) * Author: dependabot[bot], Reviewers: SchutzBot, Tomáš Hozza * distro/rhel10: xz compress azure-cvm image type (osbuild/images#1638) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Simon de Vlieger * distro: cleanup/refactor distro/{defs,generic} (HMS-8744) (osbuild/images#1570) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: remove some hardcoded values from generic/images.go (osbuild/images#1636) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: small tweaks for the YAML based imagetypes (osbuild/images#1622) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger * fedora/wsl: packages and locale (osbuild/images#1635) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * image/many: make compression more generic (osbuild/images#1634) * Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt * manifest: handle content template name with spaces (osbuild/images#1641) * Author: Bryttanie, Reviewers: Brian C. Lane, Michael Vogt, Tomáš Hozza * many: implement gzip (osbuild/images#1633) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * rhel/azure: set GRUB_TERMINAL based on architecture [RHEL-91383] (osbuild/images#1626) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-07-07 ---
113 lines
1.9 KiB
Go
113 lines
1.9 KiB
Go
// © Broadcom. All Rights Reserved.
|
|
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package progress
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
type LogFunc func(msg string) (int, error)
|
|
|
|
type ProgressLogger struct {
|
|
log LogFunc
|
|
prefix string
|
|
|
|
wg sync.WaitGroup
|
|
|
|
sink chan chan Report
|
|
done chan struct{}
|
|
}
|
|
|
|
func NewProgressLogger(log LogFunc, prefix string) *ProgressLogger {
|
|
p := &ProgressLogger{
|
|
log: log,
|
|
prefix: prefix,
|
|
|
|
sink: make(chan chan Report),
|
|
done: make(chan struct{}),
|
|
}
|
|
|
|
p.wg.Add(1)
|
|
|
|
go p.loopA()
|
|
|
|
return p
|
|
}
|
|
|
|
// loopA runs before Sink() has been called.
|
|
func (p *ProgressLogger) loopA() {
|
|
var err error
|
|
|
|
defer p.wg.Done()
|
|
|
|
tick := time.NewTicker(100 * time.Millisecond)
|
|
defer tick.Stop()
|
|
|
|
called := false
|
|
|
|
for stop := false; !stop; {
|
|
select {
|
|
case ch := <-p.sink:
|
|
err = p.loopB(tick, ch)
|
|
stop = true
|
|
called = true
|
|
case <-p.done:
|
|
stop = true
|
|
case <-tick.C:
|
|
line := fmt.Sprintf("\r%s", p.prefix)
|
|
p.log(line)
|
|
}
|
|
}
|
|
|
|
if err != nil && err != io.EOF {
|
|
p.log(fmt.Sprintf("\r%sError: %s\n", p.prefix, err))
|
|
} else if called {
|
|
p.log(fmt.Sprintf("\r%sOK\n", p.prefix))
|
|
}
|
|
}
|
|
|
|
// loopA runs after Sink() has been called.
|
|
func (p *ProgressLogger) loopB(tick *time.Ticker, ch <-chan Report) error {
|
|
var r Report
|
|
var ok bool
|
|
var err error
|
|
|
|
for ok = true; ok; {
|
|
select {
|
|
case r, ok = <-ch:
|
|
if !ok {
|
|
break
|
|
}
|
|
err = r.Error()
|
|
case <-tick.C:
|
|
line := fmt.Sprintf("\r%s", p.prefix)
|
|
if r != nil {
|
|
line += fmt.Sprintf("(%.0f%%", r.Percentage())
|
|
detail := r.Detail()
|
|
if detail != "" {
|
|
line += fmt.Sprintf(", %s", detail)
|
|
}
|
|
line += ")"
|
|
}
|
|
p.log(line)
|
|
}
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
func (p *ProgressLogger) Sink() chan<- Report {
|
|
ch := make(chan Report)
|
|
p.sink <- ch
|
|
return ch
|
|
}
|
|
|
|
func (p *ProgressLogger) Wait() {
|
|
close(p.done)
|
|
p.wg.Wait()
|
|
}
|