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 ---
192 lines
4.4 KiB
Go
192 lines
4.4 KiB
Go
// © Broadcom. All Rights Reserved.
|
|
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package keepalive
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net/http"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/vmware/govmomi/vapi/rest"
|
|
"github.com/vmware/govmomi/vim25/methods"
|
|
"github.com/vmware/govmomi/vim25/soap"
|
|
)
|
|
|
|
// handler contains the generic keep alive settings and logic
|
|
type handler struct {
|
|
mu sync.Mutex
|
|
notifyStop chan struct{}
|
|
notifyWaitGroup sync.WaitGroup
|
|
|
|
idle time.Duration
|
|
send func() error
|
|
}
|
|
|
|
// NewHandlerSOAP returns a soap.RoundTripper for use with a vim25.Client
|
|
// The idle time specifies the interval in between send() requests. Defaults to 10 minutes.
|
|
// The send func is used to keep a session alive. Defaults to calling vim25 GetCurrentTime().
|
|
// The keep alive goroutine starts when a Login method is called and runs until Logout is called or send returns an error.
|
|
func NewHandlerSOAP(c soap.RoundTripper, idle time.Duration, send func() error) *HandlerSOAP {
|
|
h := &handler{
|
|
idle: idle,
|
|
send: send,
|
|
}
|
|
|
|
if send == nil {
|
|
h.send = func() error {
|
|
return h.keepAliveSOAP(c)
|
|
}
|
|
}
|
|
|
|
return &HandlerSOAP{h, c}
|
|
}
|
|
|
|
// NewHandlerREST returns an http.RoundTripper for use with a rest.Client
|
|
// The idle time specifies the interval in between send() requests. Defaults to 10 minutes.
|
|
// The send func is used to keep a session alive. Defaults to calling the rest.Client.Session() method
|
|
// The keep alive goroutine starts when a Login method is called and runs until Logout is called or send returns an error.
|
|
func NewHandlerREST(c *rest.Client, idle time.Duration, send func() error) *HandlerREST {
|
|
h := &handler{
|
|
idle: idle,
|
|
send: send,
|
|
}
|
|
|
|
if send == nil {
|
|
h.send = func() error {
|
|
return h.keepAliveREST(c)
|
|
}
|
|
}
|
|
|
|
return &HandlerREST{h, c.Transport}
|
|
}
|
|
|
|
func (h *handler) keepAliveSOAP(rt soap.RoundTripper) error {
|
|
ctx := context.Background()
|
|
_, err := methods.GetCurrentTime(ctx, rt)
|
|
return err
|
|
}
|
|
|
|
func (h *handler) keepAliveREST(c *rest.Client) error {
|
|
ctx := context.Background()
|
|
|
|
s, err := c.Session(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if s != nil {
|
|
return nil
|
|
}
|
|
return errors.New(http.StatusText(http.StatusUnauthorized))
|
|
}
|
|
|
|
// Start explicitly starts the keep alive go routine.
|
|
// For use with session cache.Client, as cached sessions may not involve Login/Logout via RoundTripper.
|
|
func (h *handler) Start() {
|
|
h.mu.Lock()
|
|
defer h.mu.Unlock()
|
|
|
|
if h.notifyStop != nil {
|
|
return
|
|
}
|
|
|
|
if h.idle == 0 {
|
|
h.idle = time.Minute * 10
|
|
}
|
|
|
|
// This channel must be closed to terminate idle timer.
|
|
h.notifyStop = make(chan struct{})
|
|
h.notifyWaitGroup.Add(1)
|
|
|
|
go func() {
|
|
for t := time.NewTimer(h.idle); ; {
|
|
select {
|
|
case <-h.notifyStop:
|
|
h.notifyWaitGroup.Done()
|
|
t.Stop()
|
|
return
|
|
case <-t.C:
|
|
if err := h.send(); err != nil {
|
|
h.notifyWaitGroup.Done()
|
|
h.Stop()
|
|
return
|
|
}
|
|
t.Reset(h.idle)
|
|
}
|
|
}
|
|
}()
|
|
}
|
|
|
|
// Stop explicitly stops the keep alive go routine.
|
|
// For use with session cache.Client, as cached sessions may not involve Login/Logout via RoundTripper.
|
|
func (h *handler) Stop() {
|
|
h.mu.Lock()
|
|
defer h.mu.Unlock()
|
|
|
|
if h.notifyStop != nil {
|
|
close(h.notifyStop)
|
|
h.notifyWaitGroup.Wait()
|
|
h.notifyStop = nil
|
|
}
|
|
}
|
|
|
|
// HandlerSOAP is a keep alive implementation for use with vim25.Client
|
|
type HandlerSOAP struct {
|
|
*handler
|
|
|
|
roundTripper soap.RoundTripper
|
|
}
|
|
|
|
// RoundTrip implements soap.RoundTripper
|
|
func (h *HandlerSOAP) RoundTrip(ctx context.Context, req, res soap.HasFault) error {
|
|
// Stop ticker on logout.
|
|
switch req.(type) {
|
|
case *methods.LogoutBody:
|
|
h.Stop()
|
|
}
|
|
|
|
err := h.roundTripper.RoundTrip(ctx, req, res)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Start ticker on login.
|
|
switch req.(type) {
|
|
case *methods.LoginBody, *methods.LoginExtensionByCertificateBody, *methods.LoginByTokenBody:
|
|
h.Start()
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// HandlerREST is a keep alive implementation for use with rest.Client
|
|
type HandlerREST struct {
|
|
*handler
|
|
|
|
roundTripper http.RoundTripper
|
|
}
|
|
|
|
// RoundTrip implements http.RoundTripper
|
|
func (h *HandlerREST) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
if req.URL.Path != "/rest/com/vmware/cis/session" {
|
|
return h.roundTripper.RoundTrip(req)
|
|
}
|
|
|
|
if req.Method == http.MethodDelete { // Logout
|
|
h.Stop()
|
|
}
|
|
|
|
res, err := h.roundTripper.RoundTrip(req)
|
|
if err != nil {
|
|
return res, err
|
|
}
|
|
|
|
if req.Method == http.MethodPost { // Login
|
|
h.Start()
|
|
}
|
|
|
|
return res, err
|
|
}
|