opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 03:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

pkg/autoupdate: introduce status constants

Browse Source 
To replace redundant string scattered across the code with proper
constants.  The "status" will further be useful in a future change
as it can be moved into a `task`.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2022-08-03 13:49:04 +02:00
parent 42c4c17c01
commit 1cc933c6bb
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/autoupdate/autoupdate.go
View File

@ -60,6 +60,14 @@ type updater struct {
runtime *libpod.Runtime runtime *libpod.Runtime
} }
const (
statusFailed = "failed" // The update has failed
statusUpdated = "true" // The update succeeded
statusNotUpdated = "false" // No update was needed
statusPending = "pending" // The update is pending (see options.DryRun)
statusRolledBack = "rolled back" // Rollback after a failed update
)
// task includes data and state for updating a container // task includes data and state for updating a container
type task struct { type task struct {
authfile string // Container-specific authfile authfile string // Container-specific authfile
@ -233,7 +241,7 @@ func (t *task) updateRegistry(ctx context.Context) (*entities.AutoUpdateReport,
ImageName: rawImageName, ImageName: rawImageName,
Policy: PolicyRegistryImage, Policy: PolicyRegistryImage,
SystemdUnit: t.unit, SystemdUnit: t.unit,
Updated: "failed", Updated: statusFailed,
} }
if _, updated := t.auto.updatedRawImages[rawImageName]; updated { if _, updated := t.auto.updatedRawImages[rawImageName]; updated {
@ -241,7 +249,7 @@ func (t *task) updateRegistry(ctx context.Context) (*entities.AutoUpdateReport,
if err := t.auto.restartSystemdUnit(ctx, t.container, t.unit); err != nil { if err := t.auto.restartSystemdUnit(ctx, t.container, t.unit); err != nil {
return report, err return report, err
} }
report.Updated = "true" report.Updated = statusUpdated
return report, nil return report, nil
} }
@ -251,12 +259,12 @@ func (t *task) updateRegistry(ctx context.Context) (*entities.AutoUpdateReport,
} }
if !needsUpdate { if !needsUpdate {
report.Updated = "false" report.Updated = statusNotUpdated
return report, nil return report, nil
} }
if t.auto.options.DryRun { if t.auto.options.DryRun {
report.Updated = "pending" report.Updated = statusPending
return report, nil return report, nil
} }
@ -268,7 +276,7 @@ func (t *task) updateRegistry(ctx context.Context) (*entities.AutoUpdateReport,
logrus.Infof("Auto-updating container %q using registry image %q", cid, rawImageName) logrus.Infof("Auto-updating container %q using registry image %q", cid, rawImageName)
updateErr := t.auto.restartSystemdUnit(ctx, t.container, t.unit) updateErr := t.auto.restartSystemdUnit(ctx, t.container, t.unit)
if updateErr == nil { if updateErr == nil {
report.Updated = "true" report.Updated = statusUpdated
return report, nil return report, nil
} }
@ -286,7 +294,7 @@ func (t *task) updateRegistry(ctx context.Context) (*entities.AutoUpdateReport,
return report, fmt.Errorf("restarting unit with old image during fallback: %w", err) return report, fmt.Errorf("restarting unit with old image during fallback: %w", err)
} }
report.Updated = "rolled back" report.Updated = statusRolledBack
return report, nil return report, nil
} }
@ -308,7 +316,7 @@ func (t *task) updateLocally(ctx context.Context) (*entities.AutoUpdateReport, e
ImageName: rawImageName, ImageName: rawImageName,
Policy: PolicyLocalImage, Policy: PolicyLocalImage,
SystemdUnit: t.unit, SystemdUnit: t.unit,
Updated: "failed", Updated: statusFailed,
} }
needsUpdate, err := newerLocalImageAvailable(t.auto.runtime, t.image, rawImageName) needsUpdate, err := newerLocalImageAvailable(t.auto.runtime, t.image, rawImageName)
@ -317,19 +325,19 @@ func (t *task) updateLocally(ctx context.Context) (*entities.AutoUpdateReport, e
} }
if !needsUpdate { if !needsUpdate {
report.Updated = "false" report.Updated = statusNotUpdated
return report, nil return report, nil
} }
if t.auto.options.DryRun { if t.auto.options.DryRun {
report.Updated = "pending" report.Updated = statusPending
return report, nil return report, nil
} }
logrus.Infof("Auto-updating container %q using local image %q", cid, rawImageName) logrus.Infof("Auto-updating container %q using local image %q", cid, rawImageName)
updateErr := t.auto.restartSystemdUnit(ctx, t.container, t.unit) updateErr := t.auto.restartSystemdUnit(ctx, t.container, t.unit)
if updateErr == nil { if updateErr == nil {
report.Updated = "true" report.Updated = statusUpdated
return report, nil return report, nil
} }
@ -345,7 +353,7 @@ func (t *task) updateLocally(ctx context.Context) (*entities.AutoUpdateReport, e
return report, fmt.Errorf("restarting unit with old image during fallback: %w", err) return report, fmt.Errorf("restarting unit with old image during fallback: %w", err)
} }
report.Updated = "rolled back" report.Updated = statusRolledBack
return report, nil return report, nil
} }