philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-26 11:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: event ID generation for images, machines, and volumes to align with plan formatting

Browse Source
This commit is contained in:
Pasha Sviderski
2026-04-08 19:16:42 +10:00
parent 3e30a59d4c
commit fe813302b7
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/client/container.go
+1 -1
View File
@@ -131,7 +131,7 @@ func (cli *Client) createServiceContainerWithPull(
func (cli *Client) pullImageWithProgress(ctx context.Context, image, machineName, parentEventID string) error {
pw := progress.ContextWriter(ctx)
eventID := fmt.Sprintf("Image %s on %s", image, machineName)
eventID := cliprogress.ImageEventID(image, machineName)
pw.Event(progress.Event{
ID: eventID,
ParentID: parentEventID,
pkg/client/dns.go
+2 -1
View File
@@ -13,6 +13,7 @@ import (
"github.com/cenkalti/backoff/v4"
"github.com/docker/compose/v2/pkg/progress"
cliprogress "github.com/psviderski/uncloud/internal/cli/progress"
"github.com/psviderski/uncloud/internal/machine/api/pb"
"github.com/psviderski/uncloud/internal/machine/caddyconfig"
"github.com/psviderski/uncloud/pkg/api"
@@ -148,7 +149,7 @@ func verifyCaddyReachable(ctx context.Context, m *pb.MachineInfo) error {
publicIP, _ := m.PublicIp.ToAddr()
pw := progress.ContextWriter(ctx)
eventID := fmt.Sprintf("Machine %s (%s)", m.Name, publicIP)
eventID := cliprogress.MachineEventID(m.Name, publicIP.String())
pw.Event(progress.NewEvent(eventID, progress.Working, "Querying"))
verifyURL := getVerifyURL(publicIP)
pkg/client/volume.go
+3 -2
View File
@@ -7,6 +7,7 @@ import (
"github.com/containerd/errdefs"
"github.com/docker/compose/v2/pkg/progress"
"github.com/docker/docker/api/types/volume"
cliprogress "github.com/psviderski/uncloud/internal/cli/progress"
"github.com/psviderski/uncloud/internal/cli/tui"
"github.com/psviderski/uncloud/internal/machine/api/pb"
"github.com/psviderski/uncloud/pkg/api"
@@ -30,7 +31,7 @@ func (cli *Client) CreateVolume(
ctx = proxyToMachine(ctx, machine.Machine)
pw := progress.ContextWriter(ctx)
eventID := fmt.Sprintf("Volume %s on %s", opts.Name, machine.Machine.Name)
eventID := cliprogress.VolumeEventID(opts.Name, machine.Machine.Name)
pw.Event(progress.CreatingEvent(eventID))
vol, err := cli.Docker.CreateVolume(ctx, opts)
@@ -120,7 +121,7 @@ func (cli *Client) RemoveVolume(ctx context.Context, machineNameOrID, volumeName
ctx = proxyToMachine(ctx, machine.Machine)
pw := progress.ContextWriter(ctx)
eventID := fmt.Sprintf("Volume %s on %s", volumeName, machine.Machine.Name)
eventID := cliprogress.VolumeEventID(volumeName, machine.Machine.Name)
pw.Event(progress.RemovingEvent(eventID))
if err = cli.Docker.RemoveVolume(ctx, volumeName, force); err != nil {