Merge lp:~sergiusens/snappy/qualifiedUpdate into lp:~snappy-dev/snappy/15.04-deprecated

[Sergio Schvezov]

Update using full qualifiers

[Michael Vogt (mvo)]

Nice, this looks good. Just one (silly?) inline question.

[Michael Vogt (mvo)]

review: Approve

=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-07-06 19:40:55 +0000
+++ snappy/parts.go	2015-07-07 02:36:11 +0000
@@ -248,7 +248,9 @@
 }
 
 // ActiveSnapsByType returns all installed snaps with the given type
-func ActiveSnapsByType(snapTs ...SnapType) (res []Part, err error) {
+var ActiveSnapsByType = activeSnapsByTypeImpl
+
+func activeSnapsByTypeImpl(snapTs ...SnapType) (res []Part, err error) {
 	m := NewMetaRepository()
 	installed, err := m.Installed()
 	if err != nil {
@@ -282,7 +284,9 @@
 }
 
 // ActiveSnapByName returns all active snaps with the given name
-func ActiveSnapByName(needle string) Part {
+var ActiveSnapByName = activeSnapByNameImpl
+
+func activeSnapByNameImpl(needle string) Part {
 	m := NewMetaRepository()
 	installed, err := m.Installed()
 	if err != nil {

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-07-06 19:52:32 +0000
+++ snappy/snapp.go	2015-07-07 02:36:11 +0000
@@ -225,6 +225,15 @@
 	Version         string             `json:"version"`
 }
 
+func (s remoteSnap) qualifiedName() string {
+	switch s.Type {
+	case SnapTypeApp:
+		return fmt.Sprintf("%s.%s", s.Name, s.Namespace)
+	default:
+		return s.Name
+	}
+}
+
 type searchResults struct {
 	Payload struct {
 		Packages []remoteSnap `json:"clickindex:package"`
@@ -1253,11 +1262,22 @@
 func (s *SnapUbuntuStoreRepository) Updates() (parts []Part, err error) {
 	// the store only supports apps, oem and frameworks currently, so no
 	// sense in sending it our ubuntu-core snap
-	installed, err := ActiveSnapNamesByType(SnapTypeApp, SnapTypeFramework, SnapTypeOem)
+	installed, err := ActiveSnapsByType(SnapTypeApp, SnapTypeFramework, SnapTypeOem)
 	if err != nil || len(installed) == 0 {
 		return nil, err
 	}
-	jsonData, err := json.Marshal(map[string][]string{"name": installed})
+
+	snapNames := make([]string, 0, len(installed))
+	for _, snap := range installed {
+		// this can be dropped once package origins are correctly recorded for everything
+		if snap.Namespace() != "" {
+			snapNames = append(snapNames, fmt.Sprintf("%s.%s", snap.Name(), snap.Namespace()))
+		} else {
+			snapNames = append(snapNames, snap.Name())
+		}
+	}
+
+	jsonData, err := json.Marshal(map[string][]string{"name": snapNames})
 	if err != nil {
 		return nil, err
 	}
@@ -1286,7 +1306,13 @@
 	}
 
 	for _, pkg := range updateData {
-		current := ActiveSnapByName(pkg.Name)
+		current := ActiveSnapByName(pkg.qualifiedName())
+
+		// this check is for non apps
+		if current != nil && current.Namespace() != "" && current.Namespace() != pkg.Namespace {
+			continue
+		}
+
 		if current == nil || current.Version() != pkg.Version {
 			snap := NewRemoteSnapPart(pkg)
 			parts = append(parts, snap)

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-07-06 19:08:24 +0000
+++ snappy/snapp_test.go	2015-07-07 02:36:11 +0000
@@ -105,6 +105,8 @@
 	policy.SecBase = s.secbase
 	regenerateAppArmorRules = regenerateAppArmorRulesImpl
 	ActiveSnapNamesByType = activeSnapNamesByTypeImpl
+	ActiveSnapsByType = activeSnapsByTypeImpl
+	ActiveSnapByName = activeSnapByNameImpl
 	duCmd = "du"
 	stripGlobalRootDir = stripGlobalRootDirImpl
 	runScFilterGen = runScFilterGenImpl
@@ -511,33 +513,94 @@
 	}
 }
 
+func mockActiveSnapsByType(mockParts []Part) {
+	ActiveSnapsByType = func(snapTs ...SnapType) (res []Part, err error) {
+		return mockParts, nil
+	}
+}
+
+func mockActiveSnapByName(mockPart Part) {
+	ActiveSnapByName = func(string) Part {
+		return mockPart
+	}
+}
+
 func (s *SnapTestSuite) TestUbuntuStoreRepositoryUpdates(c *C) {
 	mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		jsonReq, err := ioutil.ReadAll(r.Body)
 		c.Assert(err, IsNil)
-		c.Assert(string(jsonReq), Equals, `{"name":["`+funkyAppName+`"]}`)
-		io.WriteString(w, MockUpdatesJSON)
-	}))
-
-	c.Assert(mockServer, NotNil)
-	defer mockServer.Close()
-
-	var err error
-	storeBulkURI, err = url.Parse(mockServer.URL + "/updates/")
-	c.Assert(err, IsNil)
-	snap := NewUbuntuStoreSnapRepository()
-	c.Assert(snap, NotNil)
+		c.Assert(string(jsonReq), Equals, `{"name":["`+funkyAppName+`.`+funkyAppOrigin+`"]}`)
+		io.WriteString(w, MockUpdatesJSON)
+	}))
+
+	c.Assert(mockServer, NotNil)
+	defer mockServer.Close()
+
+	var err error
+	storeBulkURI, err = url.Parse(mockServer.URL + "/updates/")
+	c.Assert(err, IsNil)
+	snap := NewUbuntuStoreSnapRepository()
+	c.Assert(snap, NotNil)
+
+	part := SnapPart{
+		m: &packageYaml{
+			Name:    funkyAppName,
+			Type:    SnapTypeApp,
+			Version: "41",
+		},
+		namespace: funkyAppOrigin,
+	}
+
+	// override the real ActiveSnapsByType to return our
+	// mock data
+	mockActiveSnapsByType([]Part{&part})
+
+	// the actual test
+	results, err := snap.Updates()
+	c.Assert(err, IsNil)
+	c.Assert(results, HasLen, 1)
+	c.Check(results[0].Name(), Equals, funkyAppName)
+	c.Check(results[0].Version(), Equals, "42")
+}
+
+func (s *SnapTestSuite) TestUbuntuStoreRepositoryUpdatesDifferentNamespace(c *C) {
+	mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		jsonReq, err := ioutil.ReadAll(r.Body)
+		c.Assert(err, IsNil)
+		c.Assert(string(jsonReq), Equals, `{"name":["`+funkyAppName+`.yadayada"]}`)
+		io.WriteString(w, MockUpdatesJSON)
+	}))
+
+	c.Assert(mockServer, NotNil)
+	defer mockServer.Close()
+
+	var err error
+	storeBulkURI, err = url.Parse(mockServer.URL + "/updates/")
+	c.Assert(err, IsNil)
+	snap := NewUbuntuStoreSnapRepository()
+	c.Assert(snap, NotNil)
+
+	part := SnapPart{
+		m: &packageYaml{
+			Name:    funkyAppName,
+			Type:    SnapTypeApp,
+			Version: "41",
+		},
+		namespace: "yadayada",
+	}
+
+	// override the real ActiveSnapsByType to return our
+	// mock data
+	mockActiveSnapsByType([]Part{&part})
 
 	// override the real ActiveSnapNamesByType to return our
 	// mock data
-	mockActiveSnapNamesByType([]string{funkyAppName})
+	mockActiveSnapByName(&part)
 
 	// the actual test
 	results, err := snap.Updates()
-	c.Assert(err, IsNil)
-	c.Assert(results, HasLen, 1)
-	c.Assert(results[0].Name(), Equals, funkyAppName)
-	c.Assert(results[0].Version(), Equals, "42")
+	c.Check(err, IsNil)
+	c.Check(results, HasLen, 0)
 }
 
 func (s *SnapTestSuite) TestUbuntuStoreRepositoryUpdatesNoSnaps(c *C) {