Skip to content

Commit 1ca7cb0

Browse files
fix map random print
1 parent 0f69fed commit 1ca7cb0

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

internal/namespaces/instance/v1/custom_server.go

+13-1
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,7 @@ func serverDeleteCommand() *core.Command {
644644
}
645645
}
646646

647+
deletedVolumeMessages := [][2]string(nil)
647648
for index, volume := range server.Server.Volumes {
648649
switch {
649650
case deleteServerRequest.WithVolumes == "none":
@@ -666,7 +667,10 @@ func serverDeleteCommand() *core.Command {
666667
if err != nil {
667668
logger.Debugf("cannot marshal human size %v", volume.Size)
668669
}
669-
_, _ = interactive.Printf("successfully deleted volume %s (%s %s)\n", volume.Name, humanSize, volume.VolumeType)
670+
deletedVolumeMessages = append(deletedVolumeMessages, [2]string{
671+
index,
672+
fmt.Sprintf("successfully deleted volume %s (%s %s)", volume.Name, humanSize, volume.VolumeType),
673+
})
670674
}
671675
}
672676
if multiErr != nil {
@@ -676,6 +680,14 @@ func serverDeleteCommand() *core.Command {
676680
}
677681
}
678682

683+
// Sort and print deleted volume messages
684+
sort.Slice(deletedVolumeMessages, func(i, j int) bool {
685+
return deletedVolumeMessages[i][0] < deletedVolumeMessages[j][0]
686+
})
687+
for _, message := range deletedVolumeMessages {
688+
_, _ = interactive.Println(message[1])
689+
}
690+
679691
return &core.SuccessResult{}, nil
680692
},
681693
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
successfully deleted ip 163.172.146.186
2-
successfully deleted volume cli-srv-eager-driscoll-1 (10 GB b_ssd)
32
successfully deleted volume snapshot-de728daa-0bf6-4c64-abf5-a9477e791c83-2019-03-05_10:13 (20 GB l_ssd)
3+
successfully deleted volume cli-srv-eager-driscoll-1 (10 GB b_ssd)

0 commit comments

Comments
 (0)