Skip to content

fix: handle default arch in Select #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niemeyer merged 13 commits into from
Jan 12, 2026
Merged

fix: handle default arch in Select #256

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a080409
bugfix: cut does not infer the architecture properly
letFunny Nov 19, 2025
2fb3c32
add test showcasing behavior
upils Nov 20, 2025
53fe075
fix: Detect cycles with v3-essential
upils Nov 21, 2025
c80bc7b
fix: arch specific slice installed if no arch provided
upils Nov 21, 2025
4ce1609
fix: Select error out if empty arch
upils Nov 21, 2025
7796bfc
style: improve error message and align with code conventions
upils Nov 21, 2025
842070c
style: improve quoting
upils Nov 21, 2025
f1ffee3
refactor: simplify setting default on test.arch
upils Nov 21, 2025
9b8ace6
refactor: handle empty arch in Select
upils Jan 7, 2026
79e047d
test: Invalid arch received by Select
upils Jan 7, 2026
2b506e8
test: invalid and empty arch for Select
upils Jan 7, 2026
032536a
test: check Select output
upils Jan 9, 2026
1863441
test: split test to clarify intent
upils Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion internal/setup/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"golang.org/x/crypto/openpgp/packet"

"github.com/canonical/chisel/internal/apacheutil"
"github.com/canonical/chisel/internal/deb"
"github.com/canonical/chisel/internal/strdist"
)

Expand Down Expand Up @@ -369,7 +370,7 @@ func order(pkgs map[string]*Package, keys []SliceKey, arch string) ([]SliceKey,
fqslice := slice.String()
predecessors := successors[fqslice]
for req, info := range slice.Essential {
if len(info.Arch) > 0 && !slices.Contains(info.Arch, arch) {
if len(info.Arch) > 0 && arch != "" && !slices.Contains(info.Arch, arch) {
continue
}
fqreq := req.String()
Expand Down Expand Up @@ -465,6 +466,16 @@ func stripBase(baseDir, path string) string {
func Select(release *Release, slices []SliceKey, arch string) (*Selection, error) {
logf("Selecting slices...")

var err error
if arch == "" {
arch, err = deb.InferArch()
} else {
err = deb.ValidateArch(arch)
}
if err != nil {
return nil, err
}

selection := &Selection{
Release: release,
}
Expand Down
89 changes: 88 additions & 1 deletion internal/setup/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3548,6 +3548,44 @@ var setupTests = []setupTest{{
`,
},
relerror: `package "mypkg" repeats mypkg_myslice2 in essential fields`,
}, {
summary: "Cycles are detected with 'v3-essential'",
input: map[string]string{
"slices/mydir/mypkg1.yaml": `
package: mypkg1
slices:
myslice:
v3-essential:
mypkg2_myslice: {arch: [amd64, i386]}
`,
"slices/mydir/mypkg2.yaml": `
package: mypkg2
slices:
myslice:
v3-essential:
mypkg1_myslice: {arch: [amd64, i386]}
`,
},
relerror: "essential loop detected: mypkg1_myslice, mypkg2_myslice",
}, {
summary: "Cycles are detected with 'v3-essential' without architecture",
input: map[string]string{
"slices/mydir/mypkg1.yaml": `
package: mypkg1
slices:
myslice:
v3-essential:
mypkg2_myslice:
`,
"slices/mydir/mypkg2.yaml": `
package: mypkg2
slices:
myslice:
v3-essential:
mypkg1_myslice: {arch: [amd64, i386]}
`,
},
relerror: "essential loop detected: mypkg1_myslice, mypkg2_myslice",
}}

func (s *S) TestParseRelease(c *C) {
Expand Down Expand Up @@ -3625,7 +3663,7 @@ func runParseReleaseTests(c *C, tests []setupTest) {
}

if test.selslices != nil {
selection, err := setup.Select(release, test.selslices, "")
selection, err := setup.Select(release, test.selslices, "amd64")
Copy link
Contributor

@lczyk lczyk Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

magic value. should be a constant imo.

these are tests, so its maybe less important here, but nonetheless it does introduce a notion of a default architecture. maybe we should define that and the return it here:
https://github.com/canonical/chisel/pull/256/changes#diff-8867bd2aaddbb2642dd6d8fee78a80c836af5eaabbd059da7fe716a378603203R65 ??

Copy link
Collaborator Author

@upils upils Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think it introduces the notion of a default architecture from the point of view of setup.Slice().
Here in the test we use a value coherent with our tests cases. We set amd64 because that was previously the implicit value for the test cases.

The behavior of falling back to inferring the arch is consistent with how the release is inferred in obtainRelease. There is no "default value" but a heuristic to get a value from the building environment if none was explicitly provided (I see a nuance here, let me know if this is not clear).

if test.selerror != "" {
c.Assert(err, ErrorMatches, test.selerror)
continue
Expand Down Expand Up @@ -3850,3 +3888,52 @@ func (s *S) TestYAMLPathGenerate(c *C) {
c.Assert(result, Equals, test.result)
}
}

var selectWithArchTests = []struct {
summary string
arch string
input map[string]string
selerror string
}{{
summary: "Empty arch",
arch: "",
}, {
summary: "Invalid arch",
arch: "foo",
selerror: "invalid package architecture: foo",
}}

func (s *S) TestSelectWithArch(c *C) {
input := map[string]string{
"chisel.yaml": string(testutil.DefaultChiselYaml),
"slices/mydir/mypkg.yaml": `
package: mypkg
slices:
myslice:
contents:
/dir/file1: {}
`,
}
selslices := []setup.SliceKey{{"mypkg", "myslice"}}
dir := c.MkDir()
for path, data := range input {
fpath := filepath.Join(dir, path)
err := os.MkdirAll(filepath.Dir(fpath), 0o755)
c.Assert(err, IsNil)
err = os.WriteFile(fpath, testutil.Reindent(data), 0o644)
c.Assert(err, IsNil)
}

release, err := setup.ReadRelease(dir)
c.Assert(err, IsNil)

for _, test := range selectWithArchTests {
_, err = setup.Select(release, selslices, test.arch)
if test.selerror != "" {
c.Assert(err, ErrorMatches, test.selerror)
continue
} else {
c.Assert(err, IsNil)
}
}
}
Loading