image: update signature of writeResolvedContentImpl()

This now take gadget.Info instead of the asserts.Model. Thanks
to Samuele for the suggestion.

image/export_test.go

@@ -20,7 +20,7 @@
 package image
 
 import (
-	"github.com/snapcore/snapd/asserts"
+	"github.com/snapcore/snapd/gadget"
 	"github.com/snapcore/snapd/overlord/auth"
 	"github.com/snapcore/snapd/store"
 )
@@ -55,7 +55,7 @@ var (
 	WriteResolvedContent = writeResolvedContent
 )
 
-func MockWriteResolvedContent(f func(prepareImageDir, gadgetRoot, kernelRoot string, model *asserts.Model) error) (restore func()) {
+func MockWriteResolvedContent(f func(prepareImageDir string, info *gadget.Info, gadgetRoot, kernelRoot string) error) (restore func()) {
 	oldWriteResolvedContent := writeResolvedContent
 	writeResolvedContent = f
 	return func() {

image/helpers.go

@@ -410,24 +410,20 @@ func (tsto *ToolingStore) Find(at *asserts.AssertionType, headers map[string]str
 // var so that it can be mocked for tests
 var writeResolvedContent = writeResolvedContentImpl
 
-// writeResolvedContent takes the unpacked gadget/kernel snaps and the
-// model and outputs the resolved content from the
+// writeResolvedContent takes gadget.Info and the unpacked
+// gadget/kernel snaps and outputs the resolved content from the
 // {gadget,kernel}.yaml into a filesystem tree with the structure:
 // <prepareImageDir>/resolved-content/<volume-name>/<structure-name>/...
 //
 // E.g.
 // /tmp/prep-img/resolved-content/pi/ubuntu-seed/{config.txt,bootcode.bin,...}
-func writeResolvedContentImpl(prepareDir, gadgetUnpackDir, kernelUnpackDir string, model *asserts.Model) error {
+func writeResolvedContentImpl(prepareDir string, info *gadget.Info, gadgetUnpackDir, kernelUnpackDir string) error {
 	fullPrepareDir, err := filepath.Abs(prepareDir)
 	if err != nil {
 		return err
 	}
 	targetDir := filepath.Join(fullPrepareDir, "resolved-content")
 
-	info, err := gadget.ReadInfoAndValidate(gadgetUnpackDir, model, nil)
-	if err != nil {
-		return err
-	}
 	constraints := gadget.LayoutConstraints{
 		NonMBRStartOffset: 1 * quantity.OffsetMiB,
 		// TODO:UC20: SectorSize is irrelevant here, we only care

image/helpers_test.go

@@ -27,6 +27,7 @@ import (
 
 	"gopkg.in/check.v1"
 
+	"github.com/snapcore/snapd/gadget"
 	"github.com/snapcore/snapd/image"
 	"github.com/snapcore/snapd/logger"
 	"github.com/snapcore/snapd/snap"
@@ -213,9 +214,12 @@ func (s *imageSuite) testWriteResolvedContent(c *check.C, prepareImageDir string
 		{"non-fs.img", "content of non-fs.img"},
 	})
 	kernelRoot := c.MkDir()
+
 	model := s.makeUC20Model(nil)
+	gadgetInfo, err := gadget.ReadInfoAndValidate(gadgetRoot, model, nil)
+	c.Assert(err, check.IsNil)
 
-	err = image.WriteResolvedContent(prepareImageDir, gadgetRoot, kernelRoot, model)
+	err = image.WriteResolvedContent(prepareImageDir, gadgetInfo, gadgetRoot, kernelRoot)
 	c.Assert(err, check.IsNil)
 
 	// XXX: add testutil.DirEquals([][]string)

image/image_linux.go

@@ -426,8 +426,13 @@ func setupSeed(tsto *ToolingStore, model *asserts.Model, opts *Options) error {
 		return err
 	}
 
+	gadgetInfo, err := gadget.ReadInfoAndValidate(gadgetUnpackDir, model, nil)
+	if err != nil {
+		return err
+	}
+
 	// write resolved content to structure root
-	if err := writeResolvedContent(opts.PrepareDir, gadgetUnpackDir, kernelUnpackDir, model); err != nil {
+	if err := writeResolvedContent(opts.PrepareDir, gadgetInfo, gadgetUnpackDir, kernelUnpackDir); err != nil {
 		return err
 	}
 
@@ -438,11 +443,6 @@ func setupSeed(tsto *ToolingStore, model *asserts.Model, opts *Options) error {
 			return err
 		}
 
-		gadgetInfo, err := gadget.ReadInfoAndValidate(gadgetUnpackDir, model, nil)
-		if err != nil {
-			return err
-		}
-
 		defaultsDir := sysconfig.WritableDefaultsDir(rootDir)
 		defaults := gadget.SystemDefaults(gadgetInfo.Defaults)
 		if len(defaults) > 0 {

image/image_test.go

@@ -40,6 +40,7 @@ import (
 	"github.com/snapcore/snapd/bootloader/bootloadertest"
 	"github.com/snapcore/snapd/bootloader/grubenv"
 	"github.com/snapcore/snapd/bootloader/ubootenv"
+	"github.com/snapcore/snapd/gadget"
 	"github.com/snapcore/snapd/image"
 	"github.com/snapcore/snapd/osutil"
 	"github.com/snapcore/snapd/overlord/auth"
@@ -119,7 +120,7 @@ func (s *imageSuite) SetUpTest(c *C) {
 	c2 := testutil.MockCommand(c, "umount", "")
 	s.AddCleanup(c2.Restore)
 
-	restore := image.MockWriteResolvedContent(func(_, _, _ string, _ *asserts.Model) error {
+	restore := image.MockWriteResolvedContent(func(_ string, _ *gadget.Info, _, _ string) error {
 		return nil
 	})
 	s.AddCleanup(restore)
@@ -486,6 +487,37 @@ const pcGadgetYaml = `
      bootloader: grub
  `
 
+const pcUC20GadgetYaml = `
+ volumes:
+   pc:
+     bootloader: grub
+     structure:
+       - name: ubuntu-seed
+         role: system-seed
+         type: EF,C12A7328-F81F-11D2-BA4B-00A0C93EC93B
+         size: 100M
+       - name: ubuntu-data
+         role: system-data
+         type: 83,0FC63DAF-8483-4772-8E79-3D69D8477DE4
+         size: 200M
+ `
+
+const piUC20GadgetYaml = `
+ volumes:
+   pi:
+     schema: mbr
+     bootloader: u-boot
+     structure:
+       - name: ubuntu-seed
+         role: system-seed
+         type: 0C
+         size: 100M
+       - name: ubuntu-data
+         role: system-data
+         type: 83,0FC63DAF-8483-4772-8E79-3D69D8477DE4
+         size: 200M
+ `
+
 func (s *imageSuite) setupSnaps(c *C, publishers map[string]string, defaultsYaml string) {
 	gadgetYaml := pcGadgetYaml + defaultsYaml
 	if _, ok := publishers["pc"]; ok {
@@ -590,8 +622,7 @@ func (s *imageSuite) TestSetupSeed(c *C) {
 	}, "")
 
 	gadgetWriteResolvedContentCalled := 0
-	restore = image.MockWriteResolvedContent(func(prepareImageDir, gadgetRoot, kernelRoot string, model *asserts.Model) error {
-		c.Check(model, DeepEquals, s.model)
+	restore = image.MockWriteResolvedContent(func(prepareImageDir string, info *gadget.Info, gadgetRoot, kernelRoot string) error {
 		c.Check(prepareImageDir, Equals, preparedir)
 		c.Check(gadgetRoot, Equals, filepath.Join(preparedir, "gadget"))
 		c.Check(kernelRoot, Equals, filepath.Join(preparedir, "kernel"))
@@ -2605,6 +2636,7 @@ func (s *imageSuite) TestSetupSeedCore20Grub(c *C) {
 	gadgetContent := [][]string{
 		{"grub-recovery.conf", "# recovery grub.cfg"},
 		{"grub.conf", "# boot grub.cfg"},
+		{"meta/gadget.yaml", pcUC20GadgetYaml},
 	}
 	s.makeSnap(c, "pc=20", gadgetContent, snap.R(22), "")
 	s.makeSnap(c, "required20", nil, snap.R(21), "other")
@@ -2761,6 +2793,7 @@ func (s *imageSuite) TestSetupSeedCore20UBoot(c *C) {
 		// TODO:UC20: write this test with non-empty uboot.env when we support
 		//            that
 		{"uboot.conf", ""},
+		{"meta/gadget.yaml", piUC20GadgetYaml},
 	}
 	s.makeSnap(c, "uboot-gadget=20", gadgetContent, snap.R(22), "")