fix: add new errors

coreos · Apr 16, 2024 · 6973cd1 · 6973cd1
1 parent bc6be5f
commit 6973cd1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/config/shared/errors/errors.go b/config/shared/errors/errors.go
@@ -85,7 +85,8 @@ var (
 	ErrInvalidProxy              = errors.New("proxies must be http(s)")
 	ErrInsecureProxy             = errors.New("insecure plaintext HTTP proxy specified for HTTPS resources")
 	ErrPathConflictsSystemd      = errors.New("path conflicts with systemd unit or dropin")
-	ErrPathConflictsParentDir    = errors.New("path conflicts with parent directory of another file, link, or directory")
+	ErrPathAlreadyExists         = errors.New("path already exists")
+	ErrMisslabeledDir            = errors.New("parent directory path matches configured file, check path, and ensure parent directory is configured")
 
 	// Systemd section errors
 	ErrInvalidSystemdExt       = errors.New("invalid systemd unit extension")

diff --git a/config/v3_5_experimental/types/config.go b/config/v3_5_experimental/types/config.go
@@ -81,17 +81,17 @@ func (cfg Config) validateParents(c path.ContextPath) report.Report {
 	r := report.Report{}
 
 	for i, f := range cfg.Storage.Files {
-		r = handlePathConflict(f.Path, "files", i, c, r, errors.ErrPathConflictsParentDir)
+		r = handlePathConflict(f.Path, "files", i, c, r, errors.ErrPathAlreadyExists)
 		addPathAndEntry(f.Path, "files", &entries)
 	}
 
 	for i, d := range cfg.Storage.Directories {
-		r = handlePathConflict(d.Path, "directories", i, c, r, errors.ErrPathConflictsParentDir)
+		r = handlePathConflict(d.Path, "directories", i, c, r, errors.ErrPathAlreadyExists)
 		addPathAndEntry(d.Path, "directories", &entries)
 	}
 
 	for i, l := range cfg.Storage.Links {
-		r = handlePathConflict(l.Path, "links", i, c, r, errors.ErrPathConflictsParentDir)
+		r = handlePathConflict(l.Path, "links", i, c, r, errors.ErrPathAlreadyExists)
 		addPathAndEntry(l.Path, "links", &entries)
 	}
 
@@ -102,7 +102,7 @@ func (cfg Config) validateParents(c path.ContextPath) report.Report {
 	for i, entry := range entries {
 		if i > 0 && isWithin(entry.Path, entries[i-1].Path) {
 			if entries[i-1].Field != "directories" {
-				r.AddOnError(c.Append("storage", entry.Field, i, "path"), errors.ErrPathConflictsParentDir)
+				r.AddOnError(c.Append("storage", entry.Field, i, "path"), errors.ErrMisslabeledDir)
 				return r
 			}
 		}

diff --git a/config/v3_5_experimental/types/config_test.go b/config/v3_5_experimental/types/config_test.go
@@ -194,7 +194,7 @@ func TestConfigValidation(t *testing.T) {
 					},
 				},
 			},
-			out: errors.ErrPathConflictsParentDir,
+			out: errors.ErrMisslabeledDir,
 			at:  path.New("json", "storage", "files", 1, "path"),
 		},
 
@@ -210,7 +210,7 @@ func TestConfigValidation(t *testing.T) {
 					},
 				},
 			},
-			out: errors.ErrPathConflictsParentDir,
+			out: errors.ErrMisslabeledDir,
 			at:  path.New("json", "storage", "links", 1, "path"),
 		},
 
@@ -226,7 +226,7 @@ func TestConfigValidation(t *testing.T) {
 					},
 				},
 			},
-			out: errors.ErrPathConflictsParentDir,
+			out: errors.ErrMisslabeledDir,
 			at:  path.New("json", "storage", "directories", 1, "path"),
 		},