gian/incus-mirror
1
0
Fork 0
mirror of https://github.com/lxc/incus synced 2026-08-02 05:26:46 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

global: Update for go-yaml/v4 rc5

Browse Source 
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
This commit is contained in:
Stéphane Graber 2026-06-10 22:26:22 -04:00
parent ee455f2e54
commit 6728a1eafc
No known key found for this signature in database
GPG Key ID: C638974D64792D67
47 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/incus-migrate/migrate_instance.go
View File

@ -336,7 +336,7 @@ func (m *InstanceMigration) render() string {
data.Disks[k] = v
}
out, err := yaml.Dump(&data, yaml.V2)
out, err := yaml.Dump(&data, yaml.WithV2Defaults())
if err != nil {
return ""
}

2
cmd/incus-migrate/migrate_volume.go
View File

@ -244,7 +244,7 @@ func (m *VolumeMigration) render() string {
m.sourceFormat,
}
out, err := yaml.Dump(&data, yaml.V2)
out, err := yaml.Dump(&data, yaml.WithV2Defaults())
if err != nil {
return ""
}

2
cmd/incus-simplestreams/main_generate_metadata.go
View File

@ -125,7 +125,7 @@ func (c *cmdGenerateMetadata) run(cmd *cobra.Command, args []string) error {
metadata.Properties["description"] = metaDescription
// Generate YAML.
body, err := yaml.Dump(&metadata, yaml.V2)
body, err := yaml.Dump(&metadata, yaml.WithV2Defaults())
if err != nil {
return err
}

2
cmd/incus/admin_init_dump.go
View File

@ -88,7 +88,7 @@ func (c *cmdAdminInit) runDump(d incus.InstanceServer) error {
config.Projects = append(config.Projects, projectsPost)
}
out, err := yaml.Dump(config, yaml.V2)
out, err := yaml.Dump(config, yaml.WithV2Defaults())
if err != nil {
return fmt.Errorf(i18n.G("Failed to retrieve current server configuration: %w"), err)
}

2
cmd/incus/admin_init_interactive.go
View File

@ -83,7 +83,7 @@ func (c *cmdAdminInit) runInteractive(_ *cobra.Command, d incus.InstanceServer,
object = *config
}
out, err := yaml.Dump(object, yaml.V2)
out, err := yaml.Dump(object, yaml.WithV2Defaults())
if err != nil {
return nil, fmt.Errorf(i18n.G("Failed to render the config: %w"), err)
}

6
cmd/incus/cluster.go
View File

@ -364,7 +364,7 @@ func (c *cmdClusterShow) run(cmd *cobra.Command, args []string) error {
}
// Render as YAML
data, err := yaml.Dump(&member, yaml.V2)
data, err := yaml.Dump(&member, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -418,7 +418,7 @@ func (c *cmdClusterInfo) run(cmd *cobra.Command, args []string) error {
}
// Render as YAML.
data, err := yaml.Dump(&member, yaml.V2)
data, err := yaml.Dump(&member, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -917,7 +917,7 @@ func (c *cmdClusterEdit) run(cmd *cobra.Command, args []string) error {
memberWritable := member.Writable()
data, err := yaml.Dump(&memberWritable, yaml.V2)
data, err := yaml.Dump(&memberWritable, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/cluster_group.go
View File

@ -351,7 +351,7 @@ func (c *cmdClusterGroupEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(group, yaml.V2)
data, err := yaml.Dump(group, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -721,7 +721,7 @@ func (c *cmdClusterGroupShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&group, yaml.V2)
data, err := yaml.Dump(&group, yaml.WithV2Defaults())
if err != nil {
return err
}

10
cmd/incus/config.go
View File

@ -211,7 +211,7 @@ func (c *cmdConfigEdit) run(cmd *cobra.Command, args []string) error {
inst.ExpandedConfig = nil
inst.ExpandedDevices = nil
data, err = yaml.Dump(&inst, yaml.V2)
data, err = yaml.Dump(&inst, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -227,7 +227,7 @@ func (c *cmdConfigEdit) run(cmd *cobra.Command, args []string) error {
inst.ExpandedConfig = nil
inst.ExpandedDevices = nil
data, err = yaml.Dump(&inst, yaml.V2)
data, err = yaml.Dump(&inst, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -320,7 +320,7 @@ func (c *cmdConfigEdit) run(cmd *cobra.Command, args []string) error {
}
brief := server.Writable()
data, err := yaml.Dump(&brief, yaml.V2)
data, err := yaml.Dump(&brief, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -742,7 +742,7 @@ func (c *cmdConfigShow) run(cmd *cobra.Command, args []string) error {
}
brief := server.Writable()
data, err = yaml.Dump(&brief, yaml.V2)
data, err = yaml.Dump(&brief, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -785,7 +785,7 @@ func (c *cmdConfigShow) run(cmd *cobra.Command, args []string) error {
}
}
data, err = yaml.Dump(&brief, yaml.V2)
data, err = yaml.Dump(&brief, yaml.WithV2Defaults())
if err != nil {
return err
}

2
cmd/incus/config_device.go
View File

@ -738,7 +738,7 @@ func (c *cmdConfigDeviceShow) run(cmd *cobra.Command, args []string) error {
devices = inst.Devices
}
data, err := yaml.Dump(&devices, yaml.V2)
data, err := yaml.Dump(&devices, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/config_metadata.go
View File

@ -125,7 +125,7 @@ func (c *cmdConfigMetadataEdit) run(cmd *cobra.Command, args []string) error {
return err
}
origContent, err := yaml.Dump(metadata, yaml.V2)
origContent, err := yaml.Dump(metadata, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -210,7 +210,7 @@ func (c *cmdConfigMetadataShow) run(cmd *cobra.Command, args []string) error {
return err
}
content, err := yaml.Dump(metadata, yaml.V2)
content, err := yaml.Dump(metadata, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/config_trust.go
View File

@ -308,7 +308,7 @@ func (c *cmdConfigTrustEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&cert, yaml.V2)
data, err := yaml.Dump(&cert, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -836,7 +836,7 @@ func (c *cmdConfigTrustShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&cert, yaml.V2)
data, err := yaml.Dump(&cert, yaml.WithV2Defaults())
if err != nil {
return err
}

6
cmd/incus/image.go
View File

@ -463,7 +463,7 @@ func (c *cmdImageEdit) run(cmd *cobra.Command, args []string) error {
}
brief := imgInfo.Writable()
data, err := yaml.Dump(&brief, yaml.V2)
data, err := yaml.Dump(&brief, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -1509,7 +1509,7 @@ func (c *cmdImageShow) run(cmd *cobra.Command, args []string) error {
}
properties := info.Writable()
data, err := yaml.Dump(&properties, yaml.V2)
data, err := yaml.Dump(&properties, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -1834,7 +1834,7 @@ func (c *cmdImageGenerateMetadata) run(cmd *cobra.Command, args []string) error
metadata.Properties["description"] = metaDescription
// Generate YAML.
body, err := yaml.Dump(&metadata, yaml.V2)
body, err := yaml.Dump(&metadata, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/info.go
View File

@ -87,7 +87,7 @@ func (c *cmdInfo) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(access, yaml.V2)
data, err := yaml.Dump(access, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -629,7 +629,7 @@ func (c *cmdInfo) remoteInfo(d incus.InstanceServer) error {
out = serverStatus.Filtered()
}
data, err := yaml.Dump(out, yaml.V2)
data, err := yaml.Dump(out, yaml.WithV2Defaults())
if err != nil {
return err
}

2
cmd/incus/monitor.go
View File

@ -176,7 +176,7 @@ func (c *cmdMonitor) run(cmd *cobra.Command, args []string) error {
var render []byte
switch c.flagFormat {
case "yaml":
render, err = yaml.Dump(&rawEvent, yaml.V2)
render, err = yaml.Dump(&rawEvent, yaml.WithV2Defaults())
if err != nil {
chError <- err
return

4
cmd/incus/network.go
View File

@ -742,7 +742,7 @@ func (c *cmdNetworkEdit) run(cmd *cobra.Command, args []string) error {
return errors.New(i18n.G("Only managed networks can be modified"))
}
data, err := yaml.Dump(&network, yaml.V2)
data, err := yaml.Dump(&network, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -1556,7 +1556,7 @@ func (c *cmdNetworkShow) run(cmd *cobra.Command, args []string) error {
sort.Strings(network.UsedBy)
data, err := yaml.Dump(&network, yaml.V2)
data, err := yaml.Dump(&network, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/network_acl.go
View File

@ -214,7 +214,7 @@ func (c *cmdNetworkACLShow) run(cmd *cobra.Command, args []string) error {
sort.Strings(netACL.UsedBy)
data, err := yaml.Dump(&netACL, yaml.V2)
data, err := yaml.Dump(&netACL, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -647,7 +647,7 @@ func (c *cmdNetworkACLEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&netACL, yaml.V2)
data, err := yaml.Dump(&netACL, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/network_address_set.go
View File

@ -206,7 +206,7 @@ func (c *cmdNetworkAddressSetShow) run(cmd *cobra.Command, args []string) error
sort.Strings(addrSet.UsedBy)
data, err := yaml.Dump(&addrSet, yaml.V2)
data, err := yaml.Dump(&addrSet, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -504,7 +504,7 @@ func (c *cmdNetworkAddressSetEdit) run(cmd *cobra.Command, args []string) error
return err
}
data, err := yaml.Dump(&addrSet, yaml.V2)
data, err := yaml.Dump(&addrSet, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/network_forward.go
View File

@ -284,7 +284,7 @@ func (c *cmdNetworkForwardShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&forward, yaml.V2)
data, err := yaml.Dump(&forward, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -704,7 +704,7 @@ func (c *cmdNetworkForwardEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&forward, yaml.V2)
data, err := yaml.Dump(&forward, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/network_integration.go
View File

@ -273,7 +273,7 @@ func (c *cmdNetworkIntegrationEdit) run(cmd *cobra.Command, args []string) error
return err
}
data, err := yaml.Dump(&networkIntegration, yaml.V2)
data, err := yaml.Dump(&networkIntegration, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -695,7 +695,7 @@ func (c *cmdNetworkIntegrationShow) run(cmd *cobra.Command, args []string) error
return err
}
data, err := yaml.Dump(&networkIntegration, yaml.V2)
data, err := yaml.Dump(&networkIntegration, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/network_load_balancer.go
View File

@ -287,7 +287,7 @@ func (c *cmdNetworkLoadBalancerShow) run(cmd *cobra.Command, args []string) erro
return err
}
data, err := yaml.Dump(&loadBalancer, yaml.V2)
data, err := yaml.Dump(&loadBalancer, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -684,7 +684,7 @@ func (c *cmdNetworkLoadBalancerEdit) run(cmd *cobra.Command, args []string) erro
return err
}
data, err := yaml.Dump(&loadBalancer, yaml.V2)
data, err := yaml.Dump(&loadBalancer, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/network_peer.go
View File

@ -278,7 +278,7 @@ func (c *cmdNetworkPeerShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&peer, yaml.V2)
data, err := yaml.Dump(&peer, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -708,7 +708,7 @@ func (c *cmdNetworkPeerEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&peer, yaml.V2)
data, err := yaml.Dump(&peer, yaml.WithV2Defaults())
if err != nil {
return err
}

8
cmd/incus/network_zone.go
View File

@ -278,7 +278,7 @@ func (c *cmdNetworkZoneShow) run(cmd *cobra.Command, args []string) error {
sort.Strings(netZone.UsedBy)
data, err := yaml.Dump(&netZone, yaml.V2)
data, err := yaml.Dump(&netZone, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -650,7 +650,7 @@ func (c *cmdNetworkZoneEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&netZone, yaml.V2)
data, err := yaml.Dump(&netZone, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -925,7 +925,7 @@ func (c *cmdNetworkZoneRecordShow) run(cmd *cobra.Command, args []string) error
return err
}
data, err := yaml.Dump(&netRecord, yaml.V2)
data, err := yaml.Dump(&netRecord, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -1319,7 +1319,7 @@ func (c *cmdNetworkZoneRecordEdit) run(cmd *cobra.Command, args []string) error
return err
}
data, err := yaml.Dump(netRecord.Writable, yaml.V2)
data, err := yaml.Dump(netRecord.Writable, yaml.WithV2Defaults())
if err != nil {
return err
}

2
cmd/incus/operation.go
View File

@ -319,7 +319,7 @@ func (c *cmdOperationShow) run(cmd *cobra.Command, args []string) error {
}
// Render as YAML
data, err := yaml.Dump(&op, yaml.V2)
data, err := yaml.Dump(&op, yaml.WithV2Defaults())
if err != nil {
return err
}

4
cmd/incus/profile.go
View File

@ -550,7 +550,7 @@ func (c *cmdProfileEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&profile, yaml.V2)
data, err := yaml.Dump(&profile, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -1097,7 +1097,7 @@ func (c *cmdProfileShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&profile, yaml.V2)
data, err := yaml.Dump(&profile, yaml.WithV2Defaults())
if err != nil {
return err
}

6
cmd/incus/project.go
View File

@ -373,7 +373,7 @@ func (c *cmdProjectEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&project, yaml.V2)
data, err := yaml.Dump(&project, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -918,7 +918,7 @@ func (c *cmdProjectShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&project, yaml.V2)
data, err := yaml.Dump(&project, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -1031,7 +1031,7 @@ func (c *cmdProjectInfo) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(access, yaml.V2)
data, err := yaml.Dump(access, yaml.WithV2Defaults())
if err != nil {
return err
}

2
cmd/incus/snapshot.go
View File

@ -629,7 +629,7 @@ func (c *cmdSnapshotShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&snap, yaml.V2)
data, err := yaml.Dump(&snap, yaml.WithV2Defaults())
if err != nil {
return err
}

10
cmd/incus/storage.go
View File

@ -333,7 +333,7 @@ func (c *cmdStorageEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&pool, yaml.V2)
data, err := yaml.Dump(&pool, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -608,12 +608,12 @@ func (c *cmdStorageInfo) run(cmd *cobra.Command, args []string) error {
poolinfo[infostring][spaceusedstring] = units.GetByteSizeStringIEC(int64(res.Space.Used), 2)
}
poolinfodata, err := yaml.Dump(poolinfo, yaml.V2)
poolinfodata, err := yaml.Dump(poolinfo, yaml.WithV2Defaults())
if err != nil {
return err
}
poolusedbydata, err := yaml.Dump(poolusedby, yaml.V2)
poolusedbydata, err := yaml.Dump(poolusedby, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -931,7 +931,7 @@ func (c *cmdStorageShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&res, yaml.V2)
data, err := yaml.Dump(&res, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -948,7 +948,7 @@ func (c *cmdStorageShow) run(cmd *cobra.Command, args []string) error {
sort.Strings(pool.UsedBy)
data, err := yaml.Dump(&pool, yaml.V2)
data, err := yaml.Dump(&pool, yaml.WithV2Defaults())
if err != nil {
return err
}

8
cmd/incus/storage_bucket.go
View File

@ -311,7 +311,7 @@ func (c *cmdStorageBucketEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&bucket, yaml.V2)
data, err := yaml.Dump(&bucket, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -733,7 +733,7 @@ func (c *cmdStorageBucketShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&bucket, yaml.V2)
data, err := yaml.Dump(&bucket, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -1185,7 +1185,7 @@ func (c *cmdStorageBucketKeyEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&bucket, yaml.V2)
data, err := yaml.Dump(&bucket, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -1273,7 +1273,7 @@ func (c *cmdStorageBucketKeyShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&bucket, yaml.V2)
data, err := yaml.Dump(&bucket, yaml.WithV2Defaults())
if err != nil {
return err
}

6
cmd/incus/storage_volume.go
View File

@ -1044,7 +1044,7 @@ func (c *cmdStorageVolumeEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err = yaml.Dump(&snapVol, yaml.V2)
data, err = yaml.Dump(&snapVol, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -1055,7 +1055,7 @@ func (c *cmdStorageVolumeEdit) run(cmd *cobra.Command, args []string) error {
return err
}
data, err = yaml.Dump(&vol, yaml.V2)
data, err = yaml.Dump(&vol, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -2163,7 +2163,7 @@ func (c *cmdStorageVolumeShow) run(cmd *cobra.Command, args []string) error {
sort.Strings(vol.UsedBy)
data, err := yaml.Dump(&vol, yaml.V2)
data, err := yaml.Dump(&vol, yaml.WithV2Defaults())
if err != nil {
return err
}

2
cmd/incus/storage_volume_snapshot.go
View File

@ -658,7 +658,7 @@ func (c *cmdStorageVolumeSnapshotShow) run(cmd *cobra.Command, args []string) er
return err
}
data, err := yaml.Dump(&vol, yaml.V2)
data, err := yaml.Dump(&vol, yaml.WithV2Defaults())
if err != nil {
return err
}

2
cmd/incus/warning.go
View File

@ -315,7 +315,7 @@ func (c *cmdWarningShow) run(cmd *cobra.Command, args []string) error {
return err
}
data, err := yaml.Dump(&warning, yaml.V2)
data, err := yaml.Dump(&warning, yaml.WithV2Defaults())
if err != nil {
return err
}

6
cmd/incusd/backup.go
View File

@ -286,7 +286,7 @@ func backupWriteIndex(sourceInst instance.Instance, pool storagePools.Pool, opti
}
// Convert to YAML.
indexData, err := yaml.Dump(&indexInfo, yaml.V2)
indexData, err := yaml.Dump(&indexInfo, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -619,7 +619,7 @@ func volumeBackupWriteIndex(projectName string, volumeName string, pool storageP
}
// Convert to YAML.
indexData, err := yaml.Dump(indexInfo, yaml.V2)
indexData, err := yaml.Dump(indexInfo, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -862,7 +862,7 @@ func bucketBackupWriteIndex(projectName string, bucketName string, pool storageP
}
// Convert to YAML.
indexData, err := yaml.Dump(indexInfo, yaml.V2)
indexData, err := yaml.Dump(indexInfo, yaml.WithV2Defaults())
if err != nil {
return err
}

2
cmd/incusd/instance_instance_types.go
View File

@ -38,7 +38,7 @@ func instanceSaveCache() error {
return nil
}
data, err := yaml.Dump(&instanceTypes, yaml.V2)
data, err := yaml.Dump(&instanceTypes, yaml.WithV2Defaults())
if err != nil {
return err
}

2
cmd/incusd/instance_metadata.go
View File

@ -356,7 +356,7 @@ func instanceMetadataPut(d *Daemon, r *http.Request) response.Response {
func doInstanceMetadataUpdate(s *state.State, inst instance.Instance, metadata api.ImageMetadata, r *http.Request) response.Response {
// Convert YAML.
data, err := yaml.Dump(metadata, yaml.V2)
data, err := yaml.Dump(metadata, yaml.WithV2Defaults())
if err != nil {
return response.BadRequest(err)
}

4
cmd/incusd/main_cluster.go
View File

@ -184,7 +184,7 @@ func (c *cmdClusterEdit) run(_ *cobra.Command, _ []string) error {
config.Members = append(config.Members, member)
}
data, err := yaml.Dump(config, yaml.V2)
data, err := yaml.Dump(config, yaml.WithV2Defaults())
if err != nil {
return err
}
@ -337,7 +337,7 @@ func (c *cmdClusterShow) run(_ *cobra.Command, _ []string) error {
config.Members = append(config.Members, member)
}
data, err := yaml.Dump(config, yaml.V2)
data, err := yaml.Dump(config, yaml.WithV2Defaults())
if err != nil {
return err
}

2
internal/server/backup/backup_config_utils.go
View File

@ -183,7 +183,7 @@ func UpdateInstanceConfig(c *db.Cluster, b Info, mountPath string) error {
defer logger.WarnOnError(file.Close, "Failed to close file")
data, err := yaml.Dump(&backup, yaml.V2)
data, err := yaml.Dump(&backup, yaml.WithV2Defaults())
if err != nil {
return err
}

2
internal/server/instance/drivers/driver_lxc.go
View File

@ -5608,7 +5608,7 @@ func (d *lxc) Export(metaWriter io.Writer, rootfsWriter io.Writer, properties ma
defer logger.WarnOnError(func() error { return os.RemoveAll(tempDir) }, "Failed to remove temporary directory")
data, err := yaml.Dump(&meta, yaml.V2)
data, err := yaml.Dump(&meta, yaml.WithV2Defaults())
if err != nil {
_ = metaTarWriter.Close()
if rootfsTarWriter != nil {

2
internal/server/instance/drivers/driver_qemu.go
View File

@ -7523,7 +7523,7 @@ func (d *qemu) Export(metaWriter io.Writer, rootfsWriter io.Writer, properties m
defer logger.WarnOnError(func() error { return os.RemoveAll(tempDir) }, "Failed to remove temporary directory")
data, err := yaml.Dump(&meta, yaml.V2)
data, err := yaml.Dump(&meta, yaml.WithV2Defaults())
if err != nil {
_ = metaTarWriter.Close()
d.logger.Error("Failed exporting instance", ctxMap)

2
internal/server/instance/drivers/util.go
View File

@ -280,7 +280,7 @@ func getNodeResources(s *state.State, name string, address string) (*api.Resourc
}
// Cache the data.
data, err := yaml.Dump(res, yaml.V2)
data, err := yaml.Dump(res, yaml.WithV2Defaults())
if err == nil {
_ = os.WriteFile(resourcesPath, data, 0o600)
}

2
internal/server/storage/backend.go
View File

@ -6932,7 +6932,7 @@ func (b *backend) UpdateInstanceBackupFile(inst instance.Instance, snapshots boo
return err
}
data, err := yaml.Dump(config, yaml.V2)
data, err := yaml.Dump(config, yaml.WithV2Defaults())
if err != nil {
return err
}

2
internal/server/storage/drivers/driver_btrfs_volumes.go
View File

@ -1674,7 +1674,7 @@ func (d *btrfs) BackupVolume(vol Volume, writer instancewriter.InstanceWriter, b
}
// Convert to YAML.
optimizedHeaderYAML, err := yaml.Dump(&optimizedHeader, yaml.V2)
optimizedHeaderYAML, err := yaml.Dump(&optimizedHeader, yaml.WithV2Defaults())
if err != nil {
return err
}

2
shared/api/config_test.go
View File

@ -379,7 +379,7 @@ func TestConfigMap_UnmarshalYAML(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
in, err := yaml.Dump(tc.input, yaml.V2)
in, err := yaml.Dump(tc.input, yaml.WithV2Defaults())
require.NoError(t, err)
err = yaml.Load(in, &tc.target)

2
shared/api/devices_test.go
View File

@ -475,7 +475,7 @@ func TestDevicesMap_UnmarshalYAML(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
in, err := yaml.Dump(tc.input, yaml.V2)
in, err := yaml.Dump(tc.input, yaml.WithV2Defaults())
require.NoError(t, err)
err = yaml.Load(in, &tc.target)

2
shared/cliconfig/file.go
View File

@ -165,7 +165,7 @@ func (c *Config) SaveConfig(path string) error {
defer logger.WarnOnError(f.Close, "Failed to close file")
// Write the new config
data, err := yaml.Dump(&conf, yaml.V2)
data, err := yaml.Dump(&conf, yaml.WithV2Defaults())
if err != nil {
return fmt.Errorf("Unable to marshal the configuration: %w", err)
}

2
shared/cmd/table.go
View File

@ -128,7 +128,7 @@ func RenderTable(w io.Writer, format string, header []string, data [][]string, r
}
case TableFormatYAML:
out, err := yaml.Dump(raw, yaml.V2)
out, err := yaml.Dump(raw, yaml.WithV2Defaults())
if err != nil {
return err
}

2
shared/subprocess/proc.go
View File

@ -270,7 +270,7 @@ func (p *Process) Reload() error {
// Save will save the given process object to a YAML file. Can be imported at a later point.
func (p *Process) Save(path string) error {
dat, err := yaml.Dump(p, yaml.V2)
dat, err := yaml.Dump(p, yaml.WithV2Defaults())
if err != nil {
return fmt.Errorf("Unable to serialize process struct to YAML: %w", err)
}

4
test/dev_incus-client/dev_incus_client.go
View File

@ -71,7 +71,7 @@ func devIncusMonitorStream() {
message["timestamp"] = nil
msg, err := yaml.Dump(&message, yaml.V2)
msg, err := yaml.Dump(&message, yaml.WithV2Defaults())
if err != nil {
return
}
@ -105,7 +105,7 @@ func devIncusMonitorWebsocket(c http.Client) {
message["timestamp"] = nil
msg, err := yaml.Dump(&message, yaml.V2)
msg, err := yaml.Dump(&message, yaml.WithV2Defaults())
if err != nil {
return
}