Merge lp:~mvo/snappy/snappy-lp1459212-check-required-fields into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Check the package.yaml for the required fields.

Tiny branch to check the package.yaml for the required fields. Open for
ideas about generating the error in a more elegant way.

[Sergio Schvezov (sergiusens)]

I would check for all the missing fields, append them and then
if len(missingFields) != 0 {
    fmt.Errorf(".... %s", strings.Join(missingFields, ","))
}

[Michael Vogt (mvo)]

Thanks Sergio, I updated the branch and tried to make it nicer. Maybe I went a bit overboard, not sure. You will let me know :)

[Michael Terry (mterry)]

LP doesn't show the diff, so I'll make all comments here.

===
In helpers_test.go:

+ func (ts *HTestSuite) TestGetattr(c *C) {
+ T := struct{
+ S string

There should be a space between struct and the brace. gofmt complains about it.

===
As for the strings.Join(missingFields, ",")) bit, you didn't want a space after the comma too? (Or fancy ngettext work to make fields singular sometimes? :))

===
Otherwise, it looks great! Nice collection of validation code into validatePackageYamlData.

review: Needs Fixing

[Michael Vogt (mvo)]

Thanks a bunch! I fixed the go fmt issue and added a extra space for the ", " join. No fancy ngettext() yet ;) The i18n story is something we have not tackled at all yet.

[Michael Terry (mterry)]

Aw, I was going to approve, but now you have conflicts.

[Michael Terry (mterry)]

Oh and you need to update your tests now that there is a space after the comma.

[Michael Vogt (mvo)]

I updated the tests and merged trunk. Should be ready now.

[Michael Terry (mterry)]

Perfect!

review: Approve

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:snappy failed due to conflicts:

text conflict in snappy/snapp_test.go

[lp:~mvo/snappy/snappy-lp1459212-check-required-fields]

484. By Michael Vogt on 2015-06-09

merged lp:snappy and resolved conflicts

[Michael Vogt (mvo)]

review: Approve

=== modified file 'helpers/helpers.go'
--- helpers/helpers.go	2015-06-08 14:25:07 +0000
+++ helpers/helpers.go	2015-06-09 19:11:58 +0000
@@ -31,6 +31,7 @@
 	"os/exec"
 	"os/user"
 	"path/filepath"
+	"reflect"
 	"runtime"
 	"strings"
 	"syscall"
@@ -370,6 +371,15 @@
 	return uint32((minor & 0xff) | ((major & 0xfff) << 8))
 }
 
+// Getattr get the attribute of the given name
+func Getattr(i interface{}, name string) interface{} {
+	v := reflect.ValueOf(i)
+	if v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+	return v.FieldByName(name).Interface()
+}
+
 func fillSnapEnvVars(desc interface{}, vars []string) []string {
 	for i, v := range vars {
 		var templateOut bytes.Buffer

=== modified file 'helpers/helpers_test.go'
--- helpers/helpers_test.go	2015-06-08 14:25:07 +0000
+++ helpers/helpers_test.go	2015-06-09 19:11:58 +0000
@@ -327,7 +327,22 @@
 	err = UnpackTar(f, c.MkDir(), nil)
 	c.Assert(err, IsNil)
 	c.Assert(mknodWasCalled, Equals, true)
+}
 
+func (ts *HTestSuite) TestGetattr(c *C) {
+	T := struct {
+		S string
+		I int
+	}{
+		S: "foo",
+		I: 42,
+	}
+	// works on values
+	c.Assert(Getattr(T, "S").(string), Equals, "foo")
+	c.Assert(Getattr(T, "I").(int), Equals, 42)
+	// works for pointers too
+	c.Assert(Getattr(&T, "S").(string), Equals, "foo")
+	c.Assert(Getattr(&T, "I").(int), Equals, 42)
 }
 
 func makeTestFiles(c *C, srcDir, destDir string) {

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-06-09 17:02:32 +0000
+++ snappy/click_test.go	2015-06-09 19:11:58 +0000
@@ -248,7 +248,11 @@
 // if the snap asks for accepting a license, and an agreer isn't provided,
 // install fails
 func (s *SnapTestSuite) TestLocalSnapInstallMissingAccepterFails(c *C) {
-	pkg := makeTestSnapPackage(c, "explicit-license-agreement: Y")
+	pkg := makeTestSnapPackage(c, `
+name: foo
+version: 1.0
+vendor: foo
+explicit-license-agreement: Y`)
 	_, err := installClick(pkg, 0, nil, testOrigin)
 	c.Check(err, Equals, ErrLicenseNotAccepted)
 }
@@ -256,7 +260,11 @@
 // if the snap asks for accepting a license, and an agreer is provided, and
 // Agreed returns false, install fails
 func (s *SnapTestSuite) TestLocalSnapInstallNegAccepterFails(c *C) {
-	pkg := makeTestSnapPackage(c, "explicit-license-agreement: Y")
+	pkg := makeTestSnapPackage(c, `
+name: foo
+version: 1.0
+vendor: foo
+explicit-license-agreement: Y`)
 	_, err := installClick(pkg, 0, &MockProgressMeter{y: false}, testOrigin)
 	c.Check(err, Equals, ErrLicenseNotAccepted)
 }
@@ -267,7 +275,11 @@
 	licenseChecker = func(string) error { return nil }
 	defer func() { licenseChecker = checkLicenseExists }()
 
-	pkg := makeTestSnapPackageFull(c, "explicit-license-agreement: Y", false)
+	pkg := makeTestSnapPackageFull(c, `
+name: foo
+version: 1.0
+vendor: foo
+explicit-license-agreement: Y`, false)
 	_, err := installClick(pkg, 0, &MockProgressMeter{y: true}, testOrigin)
 	c.Check(err, Equals, ErrLicenseNotProvided)
 }
@@ -275,14 +287,22 @@
 // if the snap asks for accepting a license, and an agreer is provided, and
 // Agreed returns true, install succeeds
 func (s *SnapTestSuite) TestLocalSnapInstallPosAccepterWorks(c *C) {
-	pkg := makeTestSnapPackage(c, "explicit-license-agreement: Y")
+	pkg := makeTestSnapPackage(c, `
+name: foo
+version: 1.0
+vendor: foo
+explicit-license-agreement: Y`)
 	_, err := installClick(pkg, 0, &MockProgressMeter{y: true}, testOrigin)
 	c.Check(err, Equals, nil)
 }
 
 // Agreed is given reasonable values for intro and license
 func (s *SnapTestSuite) TestLocalSnapInstallAccepterReasonable(c *C) {
-	pkg := makeTestSnapPackage(c, "name: foobar\nexplicit-license-agreement: Y")
+	pkg := makeTestSnapPackage(c, `
+name: foobar
+version: 1.0
+vendor: foo
+explicit-license-agreement: Y`)
 	ag := &MockProgressMeter{y: true}
 	_, err := installClick(pkg, 0, ag, testOrigin)
 	c.Assert(err, Equals, nil)
@@ -294,7 +314,11 @@
 // isn't called
 func (s *SnapTestSuite) TestPreviouslyAcceptedLicense(c *C) {
 	ag := &MockProgressMeter{y: true}
-	yaml := "name: foox\nexplicit-license-agreement: Y\nlicense-version: 2\n"
+	yaml := `name: foox
+explicit-license-agreement: Y
+license-version: 2
+vendor: foo
+`
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, yaml+"version: 1")
 	pkgdir := filepath.Dir(filepath.Dir(yamlFile))
 	c.Assert(os.MkdirAll(filepath.Join(pkgdir, ".click", "info"), 0755), IsNil)
@@ -314,7 +338,11 @@
 // explicit license agreement set, the agreer *is* called
 func (s *SnapTestSuite) TestSameLicenseVersionButNotRequired(c *C) {
 	ag := &MockProgressMeter{y: true}
-	yaml := "name: foox\nlicense-version: 2\n"
+	yaml := `name: foox
+license-version: 2
+version: 1.0
+vendor: foo
+`
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, yaml+"version: 1")
 	pkgdir := filepath.Dir(filepath.Dir(yamlFile))
 	c.Assert(os.MkdirAll(filepath.Join(pkgdir, ".click", "info"), 0755), IsNil)
@@ -323,7 +351,7 @@
 	c.Assert(err, IsNil)
 	c.Assert(part.activate(true, ag), IsNil)
 
-	pkg := makeTestSnapPackage(c, yaml+"version: 2\nexplicit-license-agreement: Y")
+	pkg := makeTestSnapPackage(c, yaml+"version: 2\nexplicit-license-agreement: Y\nvendor: foo")
 	_, err = installClick(pkg, 0, ag, testOrigin)
 	c.Assert(err, Equals, nil)
 	c.Check(ag.license, Equals, "WTFPL")
@@ -333,7 +361,10 @@
 // agreer *is* called
 func (s *SnapTestSuite) TestDifferentLicenseVersion(c *C) {
 	ag := &MockProgressMeter{y: true}
-	yaml := "name: foox\nexplicit-license-agreement: Y\n"
+	yaml := `name: foox
+vendor: foo
+explicit-license-agreement: Y
+`
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, yaml+"license-version: 2\nversion: 1")
 	pkgdir := filepath.Dir(filepath.Dir(yamlFile))
 	c.Assert(os.MkdirAll(filepath.Join(pkgdir, ".click", "info"), 0755), IsNil)
@@ -897,7 +928,11 @@
 
 func (s *SnapTestSuite) setupSnappyDependentServices(c *C) (string, *MockProgressMeter) {
 	inter := &MockProgressMeter{}
-	fmkYaml := "name: fmk\ntype: framework\nversion: "
+	fmkYaml := `name: fmk
+version: 1.0
+vendor: foo
+type: framework
+version: `
 	fmkFile := makeTestSnapPackage(c, fmkYaml+"1")
 	_, err := installClick(fmkFile, AllowUnauthenticated, inter, "")
 	c.Assert(err, IsNil)
@@ -1122,6 +1157,7 @@
 	yaml := `name: foo
 version: 1
 type: framework
+vendor: foo
 services:
   - name: bar
     bus-name: foo.bar.baz
@@ -1140,6 +1176,7 @@
 func (s *SnapTestSuite) TestAddPackageServicesBusPolicyNoFramework(c *C) {
 	yaml := `name: foo
 version: 1
+vendor: foo
 type: app
 services:
   - name: bar
@@ -1401,6 +1438,7 @@
 func (s *SnapTestSuite) TestPackageYamlAddSecurityPolicy(c *C) {
 	m, err := parsePackageYamlData([]byte(`name: foo
 version: 1.0
+vendor: foo
 binaries:
  - name: foo
 services:
@@ -1424,6 +1462,7 @@
 func (s *SnapTestSuite) TestPackageYamlRemoveSecurityPolicy(c *C) {
 	m, err := parsePackageYamlData([]byte(`name: foo
 version: 1.0
+vendor: foo
 binaries:
  - name: foo
 services:

=== modified file 'snappy/config_test.go'
--- snappy/config_test.go	2015-06-02 20:46:07 +0000
+++ snappy/config_test.go	2015-06-09 19:11:58 +0000
@@ -98,6 +98,7 @@
 
 	snapDir, err := s.makeInstalledMockSnapWithConfig(c, mockConfig, `name: fmk
 type: framework
+vendor: foo
 version: 42`)
 	c.Assert(err, IsNil)
 	_, err = snapConfig(snapDir, testOrigin, configYaml)
@@ -105,6 +106,7 @@
 
 	snapDir, err = s.makeInstalledMockSnapWithConfig(c, mockConfig, `name: potato
 type: potato
+vendor: foo
 version: 42`)
 	c.Assert(err, IsNil)
 	_, err = snapConfig(snapDir, testOrigin, configYaml)

=== modified file 'snappy/install_test.go'
--- snappy/install_test.go	2015-06-08 17:21:44 +0000
+++ snappy/install_test.go	2015-06-09 19:11:58 +0000
@@ -105,7 +105,7 @@
 }
 
 func (s *SnapTestSuite) TestInstallAppTwiceFails(c *C) {
-	snapPackage := makeTestSnapPackage(c, "name: foo\nversion: 2")
+	snapPackage := makeTestSnapPackage(c, "name: foo\nversion: 2\nvendor: foo")
 	snapR, err := os.Open(snapPackage)
 	c.Assert(err, IsNil)
 	defer snapR.Close()

=== modified file 'snappy/parts_test.go'
--- snappy/parts_test.go	2015-06-08 17:21:45 +0000
+++ snappy/parts_test.go	2015-06-09 19:11:58 +0000
@@ -161,7 +161,7 @@
 }
 
 func (s *SnapTestSuite) TestFindSnapsByNameAndVersionFmk(c *C) {
-	_, err := makeInstalledMockSnap(s.tempdir, "name: fmk\ntype: framework\nversion: 1")
+	_, err := makeInstalledMockSnap(s.tempdir, "name: fmk\ntype: framework\nversion: 1\nvendor: foo")
 	repo := NewLocalSnapRepository(snapAppsDir)
 	installed, err := repo.Installed()
 	c.Assert(err, IsNil)

=== modified file 'snappy/purge_test.go'
--- snappy/purge_test.go	2015-06-08 18:56:56 +0000
+++ snappy/purge_test.go	2015-06-09 19:11:58 +0000
@@ -71,7 +71,7 @@
 		panic("dunno what to do with args")
 	}
 	app := "hello-app." + testOrigin
-	yaml := "name: hello-app\nversion: " + version + "\n" + extra
+	yaml := "version: 1.0\nvendor: foo\nname: hello-app\nversion: " + version + "\n" + extra
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, yaml)
 	c.Assert(err, IsNil)
 	pkgdir := filepath.Dir(filepath.Dir(yamlFile))

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-06-09 17:11:43 +0000
+++ snappy/snapp.go	2015-06-09 19:11:58 +0000
@@ -264,6 +264,44 @@
 	return parsePackageYamlData(yamlData)
 }
 
+func validatePackageYamlData(file string, yamlData []byte, m *packageYaml) error {
+	// check mandatory fields
+	missing := []string{}
+	for _, name := range []string{"Name", "Version", "Vendor"} {
+		s := helpers.Getattr(m, name).(string)
+		if s == "" {
+			missing = append(missing, strings.ToLower(name))
+		}
+	}
+	if len(missing) > 0 {
+		return &ErrInvalidYaml{
+			file: file,
+			yaml: yamlData,
+			err:  fmt.Errorf("missing required fields '%s'", strings.Join(missing, ", ")),
+		}
+	}
+
+	// this is to prevent installation of legacy packages such as those that
+	// contain the origin/origin in the package name.
+	if strings.ContainsRune(m.Name, '.') {
+		return ErrPackageNameNotSupported
+	}
+
+	// do all checks here
+	for _, binary := range m.Binaries {
+		if err := verifyBinariesYaml(binary); err != nil {
+			return err
+		}
+	}
+	for _, service := range m.Services {
+		if err := verifyServiceYaml(service); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func parsePackageYamlData(yamlData []byte) (*packageYaml, error) {
 	var m packageYaml
 	err := yaml.Unmarshal(yamlData, &m)
@@ -271,6 +309,10 @@
 		return nil, &ErrInvalidYaml{file: "package.yaml", err: err, yaml: yamlData}
 	}
 
+	if err := validatePackageYamlData("package.yaml", yamlData, &m); err != nil {
+		return nil, err
+	}
+
 	if m.Architectures == nil {
 		if m.DeprecatedArchitecture == nil {
 			m.Architectures = []string{"all"}
@@ -279,12 +321,6 @@
 		}
 	}
 
-	// this is to prevent installation of legacy packages such as those that
-	// contain the origin/origin in the package name.
-	if strings.ContainsRune(m.Name, '.') {
-		return nil, ErrPackageNameNotSupported
-	}
-
 	if m.DeprecatedFramework != "" {
 		logger.Noticef(`Use of deprecated "framework" key in yaml`)
 		if len(m.Frameworks) != 0 {
@@ -295,18 +331,6 @@
 		m.DeprecatedFramework = ""
 	}
 
-	// do all checks here
-	for _, binary := range m.Binaries {
-		if err := verifyBinariesYaml(binary); err != nil {
-			return nil, err
-		}
-	}
-	for _, service := range m.Services {
-		if err := verifyServiceYaml(service); err != nil {
-			return nil, err
-		}
-	}
-
 	// For backward compatiblity we allow that there is no "exec:" line
 	// in the binary definition and that its derived from the name.
 	//

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-06-09 17:02:32 +0000
+++ snappy/snapp_test.go	2015-06-09 19:11:58 +0000
@@ -187,6 +187,7 @@
 func (s *SnapTestSuite) TestLocalSnapFrameworks(c *C) {
 	snapYaml, err := makeInstalledMockSnap(s.tempdir, `name: foo
 version: 1.0
+vendor: foo
 frameworks:
  - one
  - two
@@ -678,6 +679,7 @@
 func (s *SnapTestSuite) TestRemoteSnapUpgradeService(c *C) {
 	snapPackage := makeTestSnapPackage(c, `name: foo
 version: 1.0
+vendor: foo
 services:
  - name: svc
 `)
@@ -858,7 +860,11 @@
 
 func (s *SnapTestSuite) TestPackageYamlLicenseParsing(c *C) {
 	y := filepath.Join(s.tempdir, "package.yaml")
-	ioutil.WriteFile(y, []byte(`explicit-license-agreement: Y`), 0644)
+	ioutil.WriteFile(y, []byte(`
+name: foo
+version: 1.0
+vendor: foo
+explicit-license-agreement: Y`), 0644)
 	m, err := parsePackageYamlFile(y)
 	c.Assert(err, IsNil)
 	c.Assert(m.ExplicitLicenseAgreement, Equals, true)
@@ -998,6 +1004,8 @@
 
 func (s *SnapTestSuite) TestPackageYamlFrameworkParsing(c *C) {
 	m, err := parsePackageYamlData([]byte(`name: foo
+version: 1.0
+vendor: foo
 framework: one, two
 `))
 	c.Assert(err, IsNil)
@@ -1008,6 +1016,8 @@
 
 func (s *SnapTestSuite) TestPackageYamlFrameworksParsing(c *C) {
 	m, err := parsePackageYamlData([]byte(`name: foo
+version: 1.0
+vendor: foo
 frameworks:
  - one
  - two
@@ -1020,6 +1030,8 @@
 
 func (s *SnapTestSuite) TestPackageYamlFrameworkAndFrameworksFails(c *C) {
 	_, err := parsePackageYamlData([]byte(`name: foo
+version: 1.0
+vendor: foo
 frameworks:
  - one
  - two
@@ -1029,7 +1041,7 @@
 }
 
 func (s *SnapTestSuite) TestDetectsAlreadyInstalled(c *C) {
-	data := "name: afoo\nversion: 1"
+	data := "name: afoo\nversion: 1\nvendor: foo"
 	yamlPath, err := makeInstalledMockSnap(s.tempdir, data)
 	c.Assert(err, IsNil)
 	c.Assert(makeSnapActive(yamlPath), IsNil)
@@ -1043,7 +1055,7 @@
 	// XXX: should this be allowed? right now it is (=> you can re-sideload the same version of your apps)
 	//      (remote snaps are stopped before clickInstall gets to run)
 
-	data := "name: afoo\nversion: 1"
+	data := "name: afoo\nversion: 1\nvendor: foo"
 	yamlPath, err := makeInstalledMockSnap(s.tempdir, data)
 	c.Assert(err, IsNil)
 	c.Assert(makeSnapActive(yamlPath), IsNil)
@@ -1054,7 +1066,7 @@
 }
 
 func (s *SnapTestSuite) TestIgnoresAlreadyInstalledFrameworks(c *C) {
-	data := "name: afoo\nversion: 1\ntype: framework"
+	data := "name: afoo\nversion: 1\nvendor: foo\ntype: framework"
 	yamlPath, err := makeInstalledMockSnap(s.tempdir, data)
 	c.Assert(err, IsNil)
 	c.Assert(makeSnapActive(yamlPath), IsNil)
@@ -1067,6 +1079,7 @@
 func (s *SnapTestSuite) TestDetectsNameClash(c *C) {
 	data := []byte(`name: afoo
 version: 1.0
+vendor: foo
 services:
  - name: foo
 binaries:
@@ -1081,6 +1094,7 @@
 func (s *SnapTestSuite) TestDetectsMissingFrameworks(c *C) {
 	data := []byte(`name: afoo
 version: 1.0
+vendor: foo
 frameworks:
  - missing
  - also-missing
@@ -1094,6 +1108,7 @@
 func (s *SnapTestSuite) TestDetectsFrameworksInUse(c *C) {
 	_, err := makeInstalledMockSnap(s.tempdir, `name: foo
 version: 1.0
+vendor: foo
 frameworks:
  - fmk
 `)
@@ -1101,6 +1116,7 @@
 
 	yaml, err := parsePackageYamlData([]byte(`name: fmk
 version: 1.0
+vendor: foo
 type: framework`))
 	c.Assert(err, IsNil)
 	part := &SnapPart{m: yaml}
@@ -1131,6 +1147,7 @@
 
 	_, err := makeInstalledMockSnap(s.tempdir, `name: foo
 version: 1.0
+vendor: foo
 frameworks:
  - fmk
 binaries:
@@ -1144,13 +1161,13 @@
 	d2 := c.MkDir()
 	dp := filepath.Join("meta", "framework-policy", "apparmor", "policygroups")
 
-	yaml := "name: fmk\ntype: framework\nversion: 1\n"
+	yaml := "name: fmk\ntype: framework\nversion: 1\nvendor: foo"
 	_, err = makeInstalledMockSnap(d1, yaml)
 	c.Assert(err, IsNil)
 	c.Assert(os.MkdirAll(filepath.Join(d1, dp), 0755), IsNil)
 	c.Assert(ioutil.WriteFile(filepath.Join(d1, dp, "foo"), []byte(""), 0644), IsNil)
 
-	_, err = makeInstalledMockSnap(d2, "name: fmk\ntype: framework\nversion: 2\n")
+	_, err = makeInstalledMockSnap(d2, "name: fmk\ntype: framework\nversion: 2\nvendor: foo")
 	c.Assert(err, IsNil)
 	c.Assert(os.MkdirAll(filepath.Join(d2, dp), 0755), IsNil)
 	c.Assert(ioutil.WriteFile(filepath.Join(d2, dp, "foo"), []byte("x"), 0644), IsNil)
@@ -1165,12 +1182,14 @@
 func (s *SnapTestSuite) TestRemoveChecksFrameworks(c *C) {
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, `name: fmk
 version: 1.0
+vendor: foo
 type: framework`)
 	c.Assert(err, IsNil)
 	yaml, err := parsePackageYamlFile(yamlFile)
 
 	_, err = makeInstalledMockSnap(s.tempdir, `name: foo
 version: 1.0
+vendor: foo
 frameworks:
  - fmk
 `)
@@ -1316,6 +1335,8 @@
 
 func (s *SnapTestSuite) TestIllegalPackageNameWithOrigin(c *C) {
 	_, err := parsePackageYamlData([]byte(`name: foo.something
+version: 1.0
+vendor: foo
 `))
 
 	c.Assert(err, Equals, ErrPackageNameNotSupported)
@@ -1323,6 +1344,7 @@
 
 var hardwareYaml = []byte(`name: oem-foo
 version: 1.0
+vendor: someone
 oem:
  hardware:
   assign:
@@ -1434,6 +1456,36 @@
 	c.Assert(udevName, Equals, "foo")
 }
 
+func (s *SnapTestSuite) TestParsePackageYamlDataChecksName(c *C) {
+	_, err := parsePackageYamlData([]byte(`
+version: 1.0
+vendor: Foo Bar <[e-mail]>
+`))
+	c.Assert(err, ErrorMatches, "can not parse package.yaml: missing required fields 'name'.*")
+}
+
+func (s *SnapTestSuite) TestParsePackageYamlDataChecksVersion(c *C) {
+	_, err := parsePackageYamlData([]byte(`
+name: foo
+vendor: Foo Bar <[e-mail]>
+`))
+	c.Assert(err, ErrorMatches, "can not parse package.yaml: missing required fields 'version'.*")
+}
+
+func (s *SnapTestSuite) TestParsePackageYamlDataChecksVendor(c *C) {
+	_, err := parsePackageYamlData([]byte(`
+name: foo
+version: 1.0
+`))
+	c.Assert(err, ErrorMatches, "can not parse package.yaml: missing required fields 'vendor'.*")
+}
+
+func (s *SnapTestSuite) TestParsePackageYamlDataChecksMultiple(c *C) {
+	_, err := parsePackageYamlData([]byte(`
+`))
+	c.Assert(err, ErrorMatches, "can not parse package.yaml: missing required fields 'name, version, vendor'.*")
+}
+
 func (s *SnapTestSuite) TestIntegrateBoring(c *C) {
 	m := &packageYaml{}
 	m.legacyIntegration()