Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

harden update worker for empty zoslight version #2477

Merged
merged 1 commit into from
Nov 6, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions tools/zos-update-worker/internal/update_worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,23 @@ func (w *Worker) updateZosVersion(network Network, manager client.Manager) error
//zos
zosCurrent := fmt.Sprintf("%v/.tag-%v", w.src, chainVersion.Version)
zosLatest := fmt.Sprintf("%v/%v", w.dst, network)

// zos light
zosLightCurrent := fmt.Sprintf("%v/.tag-%v", w.src, chainVersion.VersionLight)
zosLightLatest := fmt.Sprintf("%v/%v-v4", w.dst, network)
if chainVersion.VersionLight != "" {
zosLightCurrent := fmt.Sprintf("%v/.tag-%v", w.src, chainVersion.VersionLight)
zosLightLatest := fmt.Sprintf("%v/%v-v4", w.dst, network)
zosLightLink := fmt.Sprintf("%v/.tag-%v", path, chainVersion.VersionLight)
if err = w.updateLink(zosLightCurrent, zosLightLatest, zosLightLink); err != nil {
return err
}
}
// the link is like zosCurrent but it has the path relative from the symlink
// point of view (so relative to the symlink, how to reach zosCurrent)
// hence the link is instead used in all calls to symlink
zosLink := fmt.Sprintf("%v/.tag-%v", path, chainVersion.Version)
zosLightLink := fmt.Sprintf("%v/.tag-%v", path, chainVersion.VersionLight)

// update links for both zos and zoslight
if err = w.updateLink(zosCurrent, zosLatest, zosLink); err != nil {
return err
}
return w.updateLink(zosLightCurrent, zosLightLatest, zosLightLink)
// update links zos
return w.updateLink(zosCurrent, zosLatest, zosLink)
}

func (w *Worker) updateLink(current string, latest string, link string) error {
Expand Down
Loading