Merge lp:~stevenwilkin/snapweb/fetch-package-from-snapd-api into lp:~snappy-dev/snapweb/trunk

[Steven Wilkin]

Fetch individual packages from the snapd API

Re-proposed to take into consideration a now-merged prerequisite branch.

This introduces some interim code that will eventually be removed as further chunks of functionality are migrated over to use the new snapd REST API.

When displaying an individual package this will use the new API client library rather than pulling the package out of snappy itself.

[Sergio Schvezov (sergiusens)]

lgtm

review: Approve

=== modified file 'snappy/common_test.go'
--- snappy/common_test.go	2016-01-27 17:59:12 +0000
+++ snappy/common_test.go	2016-01-27 19:29:34 +0000
@@ -120,6 +120,10 @@
 	return nil, errors.New("the package has no services")
 }
 
+func (f *fakeSnapdClient) Package(name string) (*client.Package, error) {
+	return nil, errors.New("the package could not be retrieved")
+}
+
 var _ snapdClient = (*fakeSnapdClient)(nil)
 
 type fakeSnapdClientServicesNoExternalUI struct {
@@ -173,3 +177,23 @@
 
 	return services, nil
 }
+
+type fakeSnapdClientPackage struct {
+	fakeSnapdClient
+}
+
+func (f *fakeSnapdClientPackage) Package(name string) (*client.Package, error) {
+	pkg := &client.Package{
+		Description:   "WebRTC Video chat server for Snappy",
+		DownloadSize:  6930947,
+		Icon:          "/1.0/icons/chatroom.ogra/icon",
+		InstalledSize: 18976651,
+		Name:          "chatroom",
+		Origin:        "ogra",
+		Status:        client.StatusActive,
+		Type:          client.TypeApp,
+		Version:       "0.1-8",
+	}
+
+	return pkg, nil
+}
 
=== modified file 'snappy/converge.go'
--- snappy/converge.go	2016-01-27 17:59:12 +0000
+++ snappy/converge.go	2016-01-27 19:29:34 +0000
@@ -59,33 +59,13 @@
 	query         string
 }
 
-// for easier stubbing during testing
-var activeSnapByName = snappy.ActiveSnapByName
-
 func (h *Handler) packagePayload(resource string) (snapPkg, error) {
-	var pkgName, origin string
-	if s := strings.Split(resource, "."); len(s) == 2 {
-		pkgName = s[0]
-		origin = s[1]
-	} else {
-		pkgName = resource
-	}
-
-	snapQ := activeSnapByName(pkgName)
-	if snapQ != nil {
-		// the second check is for locally installed snaps that lose their origin.
-		if snapQ.Origin() == origin || snapQ.Type() != snap.TypeApp {
-			return h.snapQueryToPayload(snapQ), nil
-		}
-	}
-
-	mStore := snappy.NewMetaStoreRepository()
-	found, err := mStore.Details(pkgName, origin)
-	if err == nil && len(found) != 0 {
-		return h.snapQueryToPayload(found[0]), nil
-	}
-
-	return snapPkg{}, snappy.ErrPackageNotFound
+	pkg, err := h.snapdClient.Package(resource)
+	if err != nil {
+		return snapPkg{}, err
+	}
+
+	return h.snapQueryToPayload(packagePart{*pkg}), nil
 }
 
 func (h *Handler) allPackages(filter *listFilter) ([]snapPkg, error) {
 
=== modified file 'snappy/converge_test.go'
--- snappy/converge_test.go	2016-01-27 17:59:12 +0000
+++ snappy/converge_test.go	2016-01-27 19:29:34 +0000
@@ -25,6 +25,42 @@
 	"launchpad.net/webdm/webprogress"
 )
 
+type PackagePayloadSuite struct {
+	h Handler
+}
+
+var _ = Suite(&PackagePayloadSuite{})
+
+func (s *PackagePayloadSuite) SetUpTest(c *C) {
+	os.Setenv("SNAP_APP_DATA_PATH", c.MkDir())
+	s.h.statusTracker = webprogress.New()
+	s.h.setClient(&fakeSnapdClient{})
+}
+
+func (s *PackagePayloadSuite) TestPackageNotFound(c *C) {
+	_, err := s.h.packagePayload("chatroom.ogra")
+	c.Assert(err, NotNil)
+}
+
+func (s *PackagePayloadSuite) TestPackage(c *C) {
+	s.h.setClient(&fakeSnapdClientPackage{})
+
+	pkg, err := s.h.packagePayload("chatroom.ogra")
+	c.Assert(err, IsNil)
+	c.Assert(pkg, DeepEquals, snapPkg{
+		ID:            "chatroom.ogra",
+		Description:   "WebRTC Video chat server for Snappy",
+		DownloadSize:  0,
+		Icon:          "/icons/chatroom.ogra_icon.png",
+		InstalledSize: 18976651,
+		Name:          "chatroom",
+		Origin:        "ogra",
+		Status:        "installed",
+		Type:          "app",
+		Version:       "0.1-8",
+	})
+}
+
 type PayloadSuite struct {
 	h Handler
 }
 
=== added file 'snappy/package_part.go'
--- snappy/package_part.go	1970-01-01 00:00:00 +0000
+++ snappy/package_part.go	2016-01-27 19:29:34 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package snappy
+
+import (
+	"time"
+
+	"github.com/ubuntu-core/snappy/client"
+	"github.com/ubuntu-core/snappy/progress"
+	"github.com/ubuntu-core/snappy/snap"
+	"github.com/ubuntu-core/snappy/snappy"
+)
+
+// packagePart is an interim bridge between client.Package and snappy.Part.
+type packagePart struct {
+	client.Package
+}
+
+var _ snappy.Part = (*packagePart)(nil)
+
+func (p packagePart) Name() string {
+	return p.Package.Name
+}
+
+func (p packagePart) Version() string {
+	return p.Package.Version
+}
+
+func (p packagePart) Origin() string {
+	return p.Package.Origin
+}
+
+func (p packagePart) Description() string {
+	return p.Package.Description
+}
+
+func (p packagePart) InstalledSize() int64 {
+	return p.Package.InstalledSize
+}
+
+func (p packagePart) DownloadSize() int64 {
+	return p.Package.DownloadSize
+}
+
+func (p packagePart) Icon() string {
+	return p.Package.Icon
+}
+
+func (p packagePart) IsInstalled() bool {
+	return p.Status == client.StatusInstalled || p.Status == client.StatusActive
+}
+
+func (p packagePart) IsActive() bool {
+	return p.Status == client.StatusActive
+}
+
+func (p packagePart) Type() snap.Type {
+	return snap.Type(p.Package.Type)
+}
+
+func (p packagePart) Hash() string {
+	return ""
+}
+
+func (p packagePart) Channel() string {
+	return ""
+}
+
+func (p packagePart) NeedsReboot() bool {
+	return false
+}
+
+func (p packagePart) Config(configuration []byte) (newConfig string, err error) {
+	return "", nil
+}
+
+func (p packagePart) Date() time.Time {
+	return time.Now()
+}
+
+func (p packagePart) Install(pb progress.Meter, flags snappy.InstallFlags) (name string, err error) {
+	return "", nil
+}
+
+func (p packagePart) Uninstall(pb progress.Meter) error {
+	return nil
+}
+
+func (p packagePart) SetActive(bool, progress.Meter) error {
+	return nil
+}
+
+func (p packagePart) Frameworks() ([]string, error) {
+	return nil, nil
+}
 
=== added file 'snappy/package_part_test.go'
--- snappy/package_part_test.go	1970-01-01 00:00:00 +0000
+++ snappy/package_part_test.go	2016-01-27 19:29:34 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package snappy
+
+import (
+	"github.com/ubuntu-core/snappy/client"
+	"github.com/ubuntu-core/snappy/snap"
+
+	. "gopkg.in/check.v1"
+)
+
+type PackagePartSuite struct {
+	pkg     client.Package
+	pkgPart packagePart
+}
+
+var _ = Suite(&PackagePartSuite{})
+
+func (s *PackagePartSuite) SetUpTest(c *C) {
+	s.pkg = client.Package{
+		Description:   "WebRTC Video chat server for Snappy",
+		DownloadSize:  6930947,
+		Icon:          "/1.0/icons/chatroom.ogra/icon",
+		InstalledSize: 18976651,
+		Name:          "chatroom",
+		Origin:        "ogra",
+		Status:        client.StatusActive,
+		Type:          client.TypeApp,
+		Version:       "0.1-8",
+	}
+	s.pkgPart = packagePart{s.pkg}
+}
+
+func (s *PackagePartSuite) TestPackagePart(c *C) {
+	c.Assert(s.pkgPart.Name(), Equals, s.pkg.Name)
+	c.Assert(s.pkgPart.Version(), Equals, s.pkg.Version)
+	c.Assert(s.pkgPart.Origin(), Equals, s.pkg.Origin)
+	c.Assert(s.pkgPart.Description(), Equals, s.pkg.Description)
+	c.Assert(s.pkgPart.InstalledSize(), Equals, s.pkg.InstalledSize)
+	c.Assert(s.pkgPart.DownloadSize(), Equals, s.pkg.DownloadSize)
+	c.Assert(s.pkgPart.Icon(), Equals, s.pkg.Icon)
+	c.Assert(s.pkgPart.IsInstalled(), Equals, true)
+	c.Assert(s.pkgPart.Type(), Equals, snap.TypeApp)
+}
 
=== modified file 'snappy/snapd_client.go'
--- snappy/snapd_client.go	2016-01-27 17:59:12 +0000
+++ snappy/snapd_client.go	2016-01-27 19:29:34 +0000
@@ -24,4 +24,5 @@
 type snapdClient interface {
 	Icon(pkgID string) (*client.Icon, error)
 	Services(pkg string) (map[string]*client.Service, error)
+	Package(name string) (*client.Package, error)
 }