Skip to content

Commit 680d53c

Browse files
authored
chore: improve invalid slice name error (canonical#240)
Fixes canonical#158
1 parent 7f41408 commit 680d53c

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

‎internal/setup/setup_test.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,6 +1165,18 @@ var setupTests = []setupTest{{
11651165
`,
11661166
},
11671167
relerror: `invalid slice definition filename: "a.yaml"`,
1168+
}, {
1169+
summary: "Invalid slice name - too short",
1170+
input: map[string]string{
1171+
"slices/mydir/mypkg.yaml": `
1172+
package: mypkg
1173+
slices:
1174+
cc:
1175+
contents:
1176+
/usr/bin/cc:
1177+
`,
1178+
},
1179+
relerror: `invalid slice name "cc" in slices/mydir/mypkg.yaml \(start with a-z, len >= 3, only a-z / 0-9 / -\)`,
11681180
}, {
11691181
summary: "Package essentials with same package slice",
11701182
input: map[string]string{

‎internal/setup/yaml.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ func parsePackage(baseDir, pkgName, pkgPath string, data []byte) (*Package, erro
314314
for sliceName, yamlSlice := range yamlPkg.Slices {
315315
match := apacheutil.SnameExp.FindStringSubmatch(sliceName)
316316
if match == nil {
317-
return nil, fmt.Errorf("invalid slice name %q in %s", sliceName, pkgPath)
317+
return nil, fmt.Errorf("invalid slice name %q in %s (start with a-z, len >= 3, only a-z / 0-9 / -)", sliceName, pkgPath)
318318
}
319319

320320
slice := &Slice{

0 commit comments

Comments
 (0)