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 ---
145 lines
3.3 KiB
Go
145 lines
3.3 KiB
Go
// © Broadcom. All Rights Reserved.
|
|
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package task
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/vmware/govmomi/property"
|
|
"github.com/vmware/govmomi/vim25/progress"
|
|
"github.com/vmware/govmomi/vim25/types"
|
|
)
|
|
|
|
type taskProgress struct {
|
|
info *types.TaskInfo
|
|
}
|
|
|
|
func (t taskProgress) Percentage() float32 {
|
|
return float32(t.info.Progress)
|
|
}
|
|
|
|
func (t taskProgress) Detail() string {
|
|
return ""
|
|
}
|
|
|
|
func (t taskProgress) Error() error {
|
|
if t.info.Error != nil {
|
|
return Error{t.info.Error, t.info.Description}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
type taskCallback struct {
|
|
ch chan<- progress.Report
|
|
info *types.TaskInfo
|
|
err error
|
|
}
|
|
|
|
func (t *taskCallback) fn(pc []types.PropertyChange) bool {
|
|
for _, c := range pc {
|
|
if c.Name != "info" {
|
|
continue
|
|
}
|
|
|
|
if c.Op != types.PropertyChangeOpAssign {
|
|
continue
|
|
}
|
|
|
|
if c.Val == nil {
|
|
continue
|
|
}
|
|
|
|
ti := c.Val.(types.TaskInfo)
|
|
t.info = &ti
|
|
}
|
|
|
|
// t.info could be nil if pc can't satisfy the rules above
|
|
if t.info == nil {
|
|
return false
|
|
}
|
|
|
|
pr := taskProgress{t.info}
|
|
|
|
// Store copy of error, so Wait() can return it as well.
|
|
t.err = pr.Error()
|
|
|
|
switch t.info.State {
|
|
case types.TaskInfoStateQueued, types.TaskInfoStateRunning:
|
|
if t.ch != nil {
|
|
// Don't care if this is dropped
|
|
select {
|
|
case t.ch <- pr:
|
|
default:
|
|
}
|
|
}
|
|
return false
|
|
case types.TaskInfoStateSuccess, types.TaskInfoStateError:
|
|
if t.ch != nil {
|
|
// Last one must always be delivered
|
|
t.ch <- pr
|
|
}
|
|
return true
|
|
default:
|
|
panic("unknown state: " + t.info.State)
|
|
}
|
|
}
|
|
|
|
// WaitEx waits for a task to finish with either success or failure. It does so
|
|
// by waiting for the "info" property of task managed object to change. The
|
|
// function returns when it finds the task in the "success" or "error" state.
|
|
// In the former case, the return value is nil. In the latter case the return
|
|
// value is an instance of this package's Error struct.
|
|
//
|
|
// Any error returned while waiting for property changes causes the function to
|
|
// return immediately and propagate the error.
|
|
//
|
|
// If the progress.Sinker argument is specified, any progress updates for the
|
|
// task are sent here. The completion percentage is passed through directly.
|
|
// The detail for the progress update is set to an empty string. If the task
|
|
// finishes in the error state, the error instance is passed through as well.
|
|
// Note that this error is the same error that is returned by this function.
|
|
func WaitEx(
|
|
ctx context.Context,
|
|
ref types.ManagedObjectReference,
|
|
pc *property.Collector,
|
|
s progress.Sinker) (*types.TaskInfo, error) {
|
|
|
|
cb := &taskCallback{}
|
|
|
|
// Include progress sink if specified
|
|
if s != nil {
|
|
cb.ch = s.Sink()
|
|
defer close(cb.ch)
|
|
}
|
|
|
|
filter := &property.WaitFilter{
|
|
WaitOptions: property.WaitOptions{
|
|
PropagateMissing: true,
|
|
},
|
|
}
|
|
filter.Add(ref, ref.Type, []string{"info"})
|
|
|
|
if err := property.WaitForUpdatesEx(
|
|
ctx,
|
|
pc,
|
|
filter,
|
|
func(updates []types.ObjectUpdate) bool {
|
|
for _, update := range updates {
|
|
// Only look at updates for the expected task object.
|
|
if update.Obj.Value == ref.Value && update.Obj.Type == ref.Type {
|
|
if cb.fn(update.ChangeSet) {
|
|
return true
|
|
}
|
|
}
|
|
}
|
|
return false
|
|
}); err != nil {
|
|
|
|
return nil, err
|
|
}
|
|
|
|
return cb.info, cb.err
|
|
}
|