Merge pull request #334 from stgraber/migrate

lxd-to-incus: Clarify error messages
lxc · Dec 28, 2023 · 2dd6ad0 · 2dd6ad0
2 parents 46cac3c + 11e501a
commit 2dd6ad0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/cmd/lxd-to-incus/validate.go b/cmd/lxd-to-incus/validate.go
@@ -220,7 +220,7 @@ func (c *cmdMigrate) validate(source Source, target Target) error {
 	for _, key := range deprecatedConfigs {
 		_, ok := srcServerInfo.Config[key]
 		if ok {
-			errors = append(errors, fmt.Errorf("Source server is using deprecated key %q", key))
+			errors = append(errors, fmt.Errorf("Source server is using deprecated server configuration key %q", key))
 		}
 	}
 
@@ -244,7 +244,7 @@ func (c *cmdMigrate) validate(source Source, target Target) error {
 		for _, key := range deprecatedNetworkConfigs {
 			_, ok := network.Config[key]
 			if ok {
-				errors = append(errors, fmt.Errorf("Source server has network %q using deprecated key %q", network.Name, key))
+				errors = append(errors, fmt.Errorf("Source server has network %q using deprecated configuration key %q", network.Name, key))
 			}
 		}
 	}
@@ -306,15 +306,15 @@ func (c *cmdMigrate) validate(source Source, target Target) error {
 			for _, key := range deprecatedInstanceConfigs {
 				_, ok := inst.Config[key]
 				if ok {
-					errors = append(errors, fmt.Errorf("Source server has instance %q in project %q using deprecated key %q", inst.Name, project.Name, key))
+					errors = append(errors, fmt.Errorf("Source server has instance %q in project %q using deprecated configuration key %q", inst.Name, project.Name, key))
 				}
 			}
 
 			for deviceName, device := range inst.Devices {
 				for _, key := range deprecatedInstanceDeviceConfigs {
 					_, ok := device[key]
 					if ok {
-						errors = append(errors, fmt.Errorf("Source server has device %q for instance %q in project %q using deprecated key %q", deviceName, inst.Name, project.Name, key))
+						errors = append(errors, fmt.Errorf("Source server has device %q for instance %q in project %q using deprecated configuration key %q", deviceName, inst.Name, project.Name, key))
 					}
 				}
 			}
@@ -329,15 +329,15 @@ func (c *cmdMigrate) validate(source Source, target Target) error {
 			for _, key := range deprecatedInstanceConfigs {
 				_, ok := profile.Config[key]
 				if ok {
-					errors = append(errors, fmt.Errorf("Source server has profile %q in project %q using deprecated key %q", profile.Name, project.Name, key))
+					errors = append(errors, fmt.Errorf("Source server has profile %q in project %q using deprecated configuration key %q", profile.Name, project.Name, key))
 				}
 			}
 
 			for deviceName, device := range profile.Devices {
 				for _, key := range deprecatedInstanceDeviceConfigs {
 					_, ok := device[key]
 					if ok {
-						errors = append(errors, fmt.Errorf("Source server has device %q for profile %q in project %q using deprecated key %q", deviceName, profile.Name, project.Name, key))
+						errors = append(errors, fmt.Errorf("Source server has device %q for profile %q in project %q using deprecated configuration key %q", deviceName, profile.Name, project.Name, key))
 					}
 				}
 			}