Merge lp:~stevenwilkin/snapweb/snappy-2-0 into lp:~snappy-dev/snapweb/trunk

[Steven Wilkin]

Get WebDM building against Snappy 2.0

Get WebDM building against Snappy 2.0.

NOTE: the resulting snap will still need to be sideloaded with `--devmode`

[Michael Vogt (mvo)]

Looks good!

review: Approve

=== modified file 'cmd/snappyd/handlers.go'
--- cmd/snappyd/handlers.go	2016-03-08 18:55:57 +0000
+++ cmd/snappyd/handlers.go	2016-04-26 10:36:16 +0000
@@ -53,7 +53,7 @@
 	snappyHandler := snappy.NewHandler()
 	http.Handle("/api/v2/packages/", snappyHandler.MakeMuxer("/api/v2/packages"))
 
-	http.Handle("/public/", loggingHandler(http.FileServer(http.Dir("./www"))))
+	http.Handle("/public/", loggingHandler(http.FileServer(http.Dir(filepath.Join(os.Getenv("SNAP"), "www")))))
 
 	if iconDir, relativePath, err := snappy.IconDir(); err == nil {
 		http.Handle(fmt.Sprintf("/%s/", relativePath), loggingHandler(http.FileServer(http.Dir(filepath.Join(iconDir, "..")))))
@@ -95,13 +95,13 @@
 }
 
 func renderLayout(html string, data *page, w http.ResponseWriter) error {
-	htmlPath := filepath.Join("www", "templates", html)
+	htmlPath := filepath.Join(os.Getenv("SNAP"), "www", "templates", html)
 	if _, err := os.Stat(htmlPath); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return err
 	}
 
-	layoutPath := filepath.Join("www", "templates", "base.html")
+	layoutPath := filepath.Join(os.Getenv("SNAP"), "www", "templates", "base.html")
 	t, err := template.ParseFiles(layoutPath, htmlPath)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 
=== modified file 'dependencies.tsv'
--- dependencies.tsv	2016-02-23 16:00:47 +0000
+++ dependencies.tsv	2016-04-26 10:36:16 +0000
@@ -7,7 +7,7 @@
 github.com/miekg/dns	git	5a357a6fc5e85268b929350aa6423e2d56dcc4ff	2015-04-18T05:52:30Z
 github.com/mvo5/goconfigparser	git	26426272dda20cc76aa1fa44286dc743d2972fe8	2015-02-12T09:37:50Z
 github.com/mvo5/uboot-go	git	69978a3e4b05cca9d7cfee489b3453dfed45e72c	2015-07-23T08:17:10Z
-github.com/ubuntu-core/snappy	git	5bcb20229bb884b85144eab0fe5db7aa05a27ebf	2016-02-23T14:04:06Z
+github.com/ubuntu-core/snappy	git	462812cfc390aff5bc2861320edba4cf34b740cf	2016-04-19T15:04:48Z
 golang.org/x/crypto	git	60052bd85f2d91293457e8811b0cf26b773de469	2015-06-22T23:34:07Z
 gopkg.in/check.v1	git	64131543e7896d5bcc6bd5a76287eb75ea96c673	2014-10-24T13:38:53Z
 gopkg.in/yaml.v2	git	49c95bdc21843256fb6c4e0d370a05f24a0bf213	2015-02-24T22:57:58Z
 
=== modified file 'pkg/meta/snap.yaml'
--- pkg/meta/snap.yaml	2016-03-06 16:59:32 +0000
+++ pkg/meta/snap.yaml	2016-04-26 10:36:16 +0000
@@ -24,10 +24,4 @@
     daemon: simple
     description: Snappy WebDM
     command: snappyd
-    plugs: [snappyd]
-plugs:
-  snappyd:
-    interface: old-security
-    security-policy:
-      apparmor: meta/snappyd.profile
-      seccomp: meta/snappyd.seccomp
+    plugs: [network, network-bind, snapd-control]
 
=== removed file 'pkg/meta/snappyd.profile'
--- pkg/meta/snappyd.profile	2016-01-27 14:16:35 +0000
+++ pkg/meta/snappyd.profile	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-#include <tunables/global>
-
-###VAR###
-
-###PROFILEATTACH### (attach_disconnected) {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-
-  # Read-only for the install directory
-  @{CLICK_DIR}/@{APP_PKGNAME}/                                      r,
-  @{CLICK_DIR}/@{APP_PKGNAME}/@{APP_VERSION}/                       r,
-  @{CLICK_DIR}/@{APP_PKGNAME}/@{APP_VERSION}/**                mrklix,
-
-  # Writable home area
-  owner @{HOMEDIRS}/snaps/@{APP_PKGNAME}/@{APP_VERSION}/           rw,
-  owner @{HOMEDIRS}/snaps/@{APP_PKGNAME}/@{APP_VERSION}/**    mrwklix,
-
-  # Read-only system area for other versions
-  /var/lib/snaps/@{APP_PKGNAME}/                                   rw,
-  /var/lib/snaps/@{APP_PKGNAME}/**                              mrkix,
-
-  # Writable system area only for this version.
-  /var/lib/snaps/@{APP_PKGNAME}/@{APP_VERSION}/                     w,
-  /var/lib/snaps/@{APP_PKGNAME}/@{APP_VERSION}/**                  wl,
-
-  # temp dirs
-  /tmp/snaps/@{APP_PKGNAME}/                                        r,
-  /tmp/snaps/@{APP_PKGNAME}/**                                     rk,
-  /tmp/snaps/@{APP_PKGNAME}/@{APP_VERSION}/                        rw,
-  /tmp/snaps/@{APP_PKGNAME}/@{APP_VERSION}/**                 mrwlkix,
-
-  # magic script
-  /bin/uname                                                      ixr,
-  /usr/bin/basename                                               ixr,
-  /usr/bin/realpath                                               ixr,
-  /usr/bin/dirname                                                ixr,
-  /bin/dash                                                       ixr,
-  /bin/sed                                                        ixr,
-  /bin/mkdir                                                      ixr,
-
-  @{PROC}/sys/kernel/hostname                                       r,
-  @{PROC}/sys/kernel/somaxconn                                      r,
-  @{PROC}/sys/net/core/somaxconn                                    r,
-
-  # system image
-  /etc/system-image/channel.ini                                     r,
-  /writable/cache/system/etc/system-image/channel.ini               r,
-
-  # snaps
-  /snaps/                                                           r,
-  /snaps/**                                                       rwl,
-  /gadget/                                                          r,
-  /gadget/**                                                      rwl,
-  /tmp/                                                             r,
-  /tmp/**                                                         rwl,
-  /var/lib/snaps/                                                   r,
-  /var/lib/snaps/**                                               rwl,
-  /var/lib/snappy/                                                  r,
-  /var/lib/snappy/**                                              rwl,
-  /var/lib/click/hooks/                                             r,
-  /var/lib/click/hooks/**                                         rwl,
-  /home/                                                            r,
-  /home/**                                                          r,
-
-
-  # snappy unpack
-  /usr/bin/snappy                                                 uxr,
-
-  # snappy tty change
-  /dev/tty                                                          r,
-
-  # snappy requirements
-  /bin/lsblk                                                      Uxr,
-  /bin/mountpoint                                                 Uxr,
-  /bin/cp                                                         Uxr,
-  /usr/bin/debsig-verify                                          Uxr,
-  /usr/bin/sc-filtergen                                           Uxr,
-  /usr/bin/aa-clickhook                                           Uxr,
-  /usr/bin/aa-profile-hook                                        Uxr,
-
-  # snapd REST API
-  /run/snapd.socket                                                rw,
-
-  # TODO: attention needed here
-  /etc/lsb-release                                                  r,
-  /sbin/apparmor_parser                                           Uxr,
-  /usr/bin/unsquashfs                                             Uxr,
-  /usr/share/apparmor/easyprof/policygroups/**                      r,
-  /usr/share/apparmor/easyprof/templates/**                         r,
-  /usr/share/seccomp/policygroups/**                                r,
-  /usr/share/seccomp/templates/**                                   r,
-  /var/cache/apparmor/**                                            w,
-
-  # snappy requirements for services
-  /etc/dbus-1/system.d/                                             r,
-  /etc/dbus-1/system.d/**                                         rwl,
-  /etc/mime.types                                                   r,
-  /usr/share/click/hooks/                                           r,
-  /usr/share/click/hooks/**                                         r,
-  /etc/systemd/system/                                              r,
-  /etc/systemd/system/**                                          rwl,
-  /var/lib/apparmor/clicks/                                         r,
-  /var/lib/apparmor/clicks/**                                     rwl,
-  /var/lib/apparmor/snappy/                                         r,
-  /var/lib/apparmor/snappy/**                                     rwl,
-  /bin/systemctl                                                  Uxr,
-
-  capability net_admin,
-  capability dac_override,
-}
 
=== removed file 'pkg/meta/snappyd.seccomp'
--- pkg/meta/snappyd.seccomp	2015-06-11 22:03:29 +0000
+++ pkg/meta/snappyd.seccomp	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-# This has to be unrestricted since snappyd will fork/exec /usr/bin/snappy for
-# various things and seccomp would apply this policy to snappy and it then
-# doesn't run well. Once there is a proper IPC service, this can be revisited.
-@unrestricted
 
=== modified file 'pkg/snappyd'
--- pkg/snappyd	2016-02-23 12:15:07 +0000
+++ pkg/snappyd	2016-04-26 10:36:16 +0000
@@ -18,8 +18,7 @@
         ;;
 esac
 
-mkdir -m1777 -p $SNAP_APP_TMPDIR
-exec $SNAP_APP_PATH/bin/$plat_abi/snappyd
+exec $SNAP/bin/$plat_abi/snappyd
 
 # never reach this
 exit 1
 
=== modified file 'snappy/common_test.go'
--- snappy/common_test.go	2016-04-21 04:33:37 +0000
+++ snappy/common_test.go	2016-04-26 10:36:16 +0000
@@ -18,7 +18,6 @@
 package snappy
 
 import (
-	"errors"
 	"testing"
 
 	"github.com/ubuntu-core/snappy/client"
@@ -41,7 +40,7 @@
 		Icon:          "/1.0/icons/chatroom.ogra/icon",
 		InstalledSize: 18976651,
 		Name:          "chatroom",
-		Origin:        "ogra",
+		Developer:     "ogra",
 		Status:        client.StatusActive,
 		Type:          client.TypeApp,
 		Version:       "0.1-8",
@@ -55,7 +54,7 @@
 	return snap
 }
 
-func (f *fakeSnapdClient) Icon(pkgID string) (*client.Icon, error) {
+func (f *fakeSnapdClient) Icon(name string) (*client.Icon, error) {
 	icon := &client.Icon{
 		Filename: "icon.png",
 		Content:  []byte("png"),
@@ -63,86 +62,25 @@
 	return icon, nil
 }
 
-func (f *fakeSnapdClient) Services(pkg string) (map[string]*client.Service, error) {
-	return nil, errors.New("the package has no services")
-}
-
-func (f *fakeSnapdClient) Snap(name string) (*client.Snap, error) {
+func (f *fakeSnapdClient) Snap(name string) (*client.Snap, *client.ResultInfo, error) {
 	if len(f.snaps) > 0 {
-		return f.snaps[0], f.err
+		return f.snaps[0], nil, f.err
 	}
-	return nil, f.err
+	return nil, nil, f.err
 }
 
-func (f *fakeSnapdClient) FilterSnaps(filter client.SnapFilter) (map[string]*client.Snap, error) {
+func (f *fakeSnapdClient) FilterSnaps(filter client.SnapFilter) ([]*client.Snap, *client.ResultInfo, error) {
 	f.filter = filter // record the filter used
 
-	snaps := make(map[string]*client.Snap)
-	for _, s := range f.snaps {
-		snaps[s.Name] = s
-	}
-
-	return snaps, f.err
+	return f.snaps, nil, f.err
 }
 
-func (f *fakeSnapdClient) AddSnap(name string) (string, error) {
+func (f *fakeSnapdClient) Install(name string, options *client.SnapOptions) (string, error) {
 	return "", nil
 }
 
-func (f *fakeSnapdClient) RemoveSnap(name string) (string, error) {
+func (f *fakeSnapdClient) Remove(name string, options *client.SnapOptions) (string, error) {
 	return "", nil
 }
 
 var _ snapdClient = (*fakeSnapdClient)(nil)
-
-type fakeSnapdClientServicesNoExternalUI struct {
-	fakeSnapdClient
-}
-
-func (f *fakeSnapdClientServicesNoExternalUI) Services(pkg string) (map[string]*client.Service, error) {
-	internal := map[string]client.ServicePort{"ui": client.ServicePort{Port: "200/tcp"}}
-	external := map[string]client.ServicePort{"web": client.ServicePort{Port: "1024/tcp"}}
-	s1 := &client.Service{
-		Spec: client.ServiceSpec{
-			Ports: client.ServicePorts{
-				Internal: internal,
-				External: external,
-			},
-		},
-	}
-
-	s2 := &client.Service{}
-
-	services := map[string]*client.Service{
-		"s1": s1,
-		"s2": s2,
-	}
-
-	return services, nil
-}
-
-type fakeSnapdClientServicesExternalUI struct {
-	fakeSnapdClient
-}
-
-func (f *fakeSnapdClientServicesExternalUI) Services(pkg string) (map[string]*client.Service, error) {
-	s1 := &client.Service{}
-
-	internal := map[string]client.ServicePort{"ui": client.ServicePort{Port: "200/tcp"}}
-	external := map[string]client.ServicePort{"ui": client.ServicePort{Port: "1024/tcp"}}
-	s2 := &client.Service{
-		Spec: client.ServiceSpec{
-			Ports: client.ServicePorts{
-				Internal: internal,
-				External: external,
-			},
-		},
-	}
-
-	services := map[string]*client.Service{
-		"s1": s1,
-		"s2": s2,
-	}
-
-	return services, nil
-}
 
=== modified file 'snappy/converge.go'
--- snappy/converge.go	2016-04-21 04:33:37 +0000
+++ snappy/converge.go	2016-04-26 10:36:16 +0000
@@ -19,8 +19,6 @@
 
 import (
 	"sort"
-	"strconv"
-	"strings"
 
 	"log"
 
@@ -31,7 +29,7 @@
 type snapPkg struct {
 	ID            string    `json:"id"`
 	Name          string    `json:"name"`
-	Origin        string    `json:"origin"`
+	Developer     string    `json:"developer"`
 	Version       string    `json:"version"`
 	Description   string    `json:"description"`
 	Icon          string    `json:"icon"`
@@ -41,7 +39,6 @@
 	InstalledSize int64     `json:"installed_size,omitempty"`
 	DownloadSize  int64     `json:"download_size,omitempty"`
 	Type          snap.Type `json:"type,omitempty"`
-	UIPort        uint64    `json:"ui_port,omitempty"`
 }
 
 type response struct {
@@ -50,7 +47,7 @@
 }
 
 func (h *Handler) packagePayload(resource string) (snapPkg, error) {
-	snap, err := h.snapdClient.Snap(resource)
+	snap, _, err := h.snapdClient.Snap(resource)
 	if err != nil {
 		return snapPkg{}, err
 	}
@@ -59,7 +56,7 @@
 }
 
 func (h *Handler) allPackages(filter client.SnapFilter) ([]snapPkg, error) {
-	snaps, err := h.snapdClient.FilterSnaps(filter)
+	snaps, _, err := h.snapdClient.FilterSnaps(filter)
 	if err != nil {
 		return nil, err
 	}
@@ -74,56 +71,45 @@
 	return snapPkgs, nil
 }
 
-func (h *Handler) removePackage(ID string) error {
-	snap, err := h.snapdClient.Snap(ID)
+func (h *Handler) removePackage(name string) error {
+	snap, _, err := h.snapdClient.Snap(name)
 	if err != nil {
 		return err
 	}
 
 	h.statusTracker.TrackUninstall(snap)
 
-	_, err = h.snapdClient.RemoveSnap(ID)
+	_, err = h.snapdClient.Remove(name, nil)
 	return err
 }
 
-func (h *Handler) installPackage(ID string) error {
-	snap, err := h.snapdClient.Snap(ID)
+func (h *Handler) installPackage(name string) error {
+	snap, _, err := h.snapdClient.Snap(name)
 	if err != nil {
 		return err
 	}
 
 	h.statusTracker.TrackInstall(snap)
 
-	_, err = h.snapdClient.AddSnap(ID)
+	_, err = h.snapdClient.Install(name, nil)
 	return err
 }
 
-func hasPortInformation(snapQ *client.Snap) bool {
-	snapType := snap.Type(snapQ.Type)
-	return snapType == snap.TypeApp || snapType == snap.TypeFramework
-}
-
 func (h *Handler) snapToPayload(snapQ *client.Snap) snapPkg {
 	snap := snapPkg{
-		ID:          snapQ.Name + "." + snapQ.Origin,
+		ID:          snapQ.Name,
 		Name:        snapQ.Name,
-		Origin:      snapQ.Origin,
+		Developer:   snapQ.Developer,
 		Version:     snapQ.Version,
 		Description: snapQ.Description,
 		Type:        snap.Type(snapQ.Type),
 		Status:      h.statusTracker.Status(snapQ),
 	}
 
-	if hasPortInformation(snapQ) {
-		if services, err := h.snapdClient.Services(snap.ID); err == nil {
-			snap.UIPort = uiAccess(services)
-		}
-	}
-
 	isInstalled := snapQ.Status == client.StatusInstalled || snapQ.Status == client.StatusActive
 
 	if isInstalled {
-		iconPath, err := localIconPath(h.snapdClient, snap.ID)
+		iconPath, err := localIconPath(h.snapdClient, snap.Name)
 		if err != nil {
 			log.Println("Icon path for installed package cannot be set", err)
 			iconPath = ""
@@ -138,25 +124,3 @@
 
 	return snap
 }
-
-func uiAccess(services map[string]*client.Service) uint64 {
-	for i := range services {
-		if services[i].Spec.Ports.External == nil {
-			continue
-		}
-
-		if ui, ok := services[i].Spec.Ports.External["ui"]; ok {
-			ui := strings.Split(ui.Port, "/")
-			if len(ui) == 2 {
-				port, err := strconv.ParseUint(ui[0], 0, 64)
-				if err != nil {
-					return 0
-				}
-
-				return port
-			}
-		}
-	}
-
-	return 0
-}
 
=== modified file 'snappy/converge_test.go'
--- snappy/converge_test.go	2016-03-08 18:30:48 +0000
+++ snappy/converge_test.go	2016-04-26 10:36:16 +0000
@@ -35,7 +35,7 @@
 var _ = Suite(&PackagePayloadSuite{})
 
 func (s *PackagePayloadSuite) SetUpTest(c *C) {
-	os.Setenv("SNAP_APP_DATA_PATH", c.MkDir())
+	os.Setenv("SNAP_DATA", c.MkDir())
 	s.h.statusTracker = statustracker.New()
 	s.c = &fakeSnapdClient{}
 	s.h.setClient(s.c)
@@ -44,23 +44,23 @@
 func (s *PackagePayloadSuite) TestPackageNotFound(c *C) {
 	s.c.err = errors.New("the snap could not be retrieved")
 
-	_, err := s.h.packagePayload("chatroom.ogra")
+	_, err := s.h.packagePayload("chatroom")
 	c.Assert(err, NotNil)
 }
 
 func (s *PackagePayloadSuite) TestPackage(c *C) {
 	s.c.snaps = []*client.Snap{newDefaultSnap()}
 
-	pkg, err := s.h.packagePayload("chatroom.ogra")
+	pkg, err := s.h.packagePayload("chatroom")
 	c.Assert(err, IsNil)
 	c.Assert(pkg, DeepEquals, snapPkg{
-		ID:            "chatroom.ogra",
+		ID:            "chatroom",
 		Description:   "WebRTC Video chat server for Snappy",
 		DownloadSize:  0,
-		Icon:          "/icons/chatroom.ogra_icon.png",
+		Icon:          "/icons/chatroom_icon.png",
 		InstalledSize: 18976651,
 		Name:          "chatroom",
-		Origin:        "ogra",
+		Developer:     "ogra",
 		Status:        "installed",
 		Type:          "app",
 		Version:       "0.1-8",
@@ -74,12 +74,12 @@
 var _ = Suite(&PayloadSuite{})
 
 func (s *PayloadSuite) SetUpTest(c *C) {
-	os.Setenv("SNAP_APP_DATA_PATH", c.MkDir())
+	os.Setenv("SNAP_DATA", c.MkDir())
 	s.h.statusTracker = statustracker.New()
 	s.h.setClient(&fakeSnapdClient{})
 }
 
-func (s *PayloadSuite) TestPayloadWithNoServices(c *C) {
+func (s *PayloadSuite) TestPayload(c *C) {
 	fakeSnap := newDefaultSnap()
 
 	q := s.h.snapToPayload(fakeSnap)
@@ -88,55 +88,13 @@
 	c.Check(q.Version, Equals, fakeSnap.Version)
 	c.Check(q.Status, Equals, statustracker.StatusInstalled)
 	c.Check(q.Type, Equals, snap.Type(fakeSnap.Type))
-	c.Check(q.UIPort, Equals, uint64(0))
-	c.Check(q.Icon, Equals, "/icons/chatroom.ogra_icon.png")
+	c.Check(q.Icon, Equals, "/icons/chatroom_icon.png")
 	c.Check(q.Description, Equals, fakeSnap.Description)
 }
 
-func (s *PayloadSuite) TestPayloadWithServicesButNoUI(c *C) {
-	s.h.setClient(&fakeSnapdClientServicesNoExternalUI{})
-
-	fakeSnap := newDefaultSnap()
-	q := s.h.snapToPayload(fakeSnap)
-
-	c.Assert(q.Name, Equals, fakeSnap.Name)
-	c.Assert(q.Version, Equals, fakeSnap.Version)
-	c.Assert(q.Status, Equals, statustracker.StatusInstalled)
-	c.Assert(q.Type, Equals, snap.Type(fakeSnap.Type))
-	c.Assert(q.UIPort, Equals, uint64(0))
-}
-
-func (s *PayloadSuite) TestPayloadWithServicesUI(c *C) {
-	s.h.setClient(&fakeSnapdClientServicesExternalUI{})
-
-	fakeSnap := newDefaultSnap()
-	q := s.h.snapToPayload(fakeSnap)
-
-	c.Assert(q.Name, Equals, fakeSnap.Name)
-	c.Assert(q.Version, Equals, fakeSnap.Version)
-	c.Assert(q.Status, Equals, statustracker.StatusInstalled)
-	c.Assert(q.Type, Equals, snap.Type(fakeSnap.Type))
-	c.Assert(q.UIPort, Equals, uint64(1024))
-}
-
-func (s *PayloadSuite) TestPayloadTypeGadget(c *C) {
-	s.h.setClient(&fakeSnapdClientServicesExternalUI{})
-
-	fakeSnap := newDefaultSnap()
-	fakeSnap.Type = string(snap.TypeGadget)
-
-	q := s.h.snapToPayload(fakeSnap)
-
-	c.Assert(q.Name, Equals, fakeSnap.Name)
-	c.Assert(q.Version, Equals, fakeSnap.Version)
-	c.Assert(q.Status, Equals, statustracker.StatusInstalled)
-	c.Assert(q.Type, Equals, snap.Type(fakeSnap.Type))
-	c.Assert(q.UIPort, Equals, uint64(0))
-}
-
 func (s *PayloadSuite) TestPayloadSnapInstalling(c *C) {
 	fakeSnap := newDefaultSnap()
-	fakeSnap.Status = client.StatusNotInstalled
+	fakeSnap.Status = client.StatusAvailable
 	s.h.statusTracker.TrackInstall(fakeSnap)
 
 	payload := s.h.snapToPayload(fakeSnap)
@@ -151,7 +109,7 @@
 var _ = Suite(&AllPackagesSuite{})
 
 func (s *AllPackagesSuite) SetUpTest(c *C) {
-	os.Setenv("SNAP_APP_DATA_PATH", c.MkDir())
+	os.Setenv("SNAP_DATA", c.MkDir())
 	s.h.statusTracker = statustracker.New()
 	s.c = &fakeSnapdClient{}
 	s.h.setClient(s.c)
 
=== modified file 'snappy/handlers.go'
--- snappy/handlers.go	2016-03-08 18:30:48 +0000
+++ snappy/handlers.go	2016-04-26 10:36:16 +0000
@@ -82,13 +82,13 @@
 	w.Header().Set("Content-Type", "application/json")
 	// Get the Key.
 	vars := mux.Vars(r)
-	resource := vars["id"]
+	name := vars["name"]
 	enc := json.NewEncoder(w)
 
-	payload, err := h.packagePayload(resource)
+	payload, err := h.packagePayload(name)
 	if err != nil {
 		w.WriteHeader(http.StatusNotFound)
-		enc.Encode(fmt.Sprintln(err, resource))
+		enc.Encode(fmt.Sprintln(err, name))
 		return
 	}
 
@@ -104,12 +104,12 @@
 	w.Header().Set("Content-Type", "application/json")
 	// Get the Key.
 	vars := mux.Vars(r)
-	ID := vars["id"]
+	name := vars["name"]
 
-	err := h.installPackage(ID)
+	err := h.installPackage(name)
 	msg, status := respond(err)
 
-	response := response{Message: msg, Package: ID}
+	response := response{Message: msg, Package: name}
 	bs, err := json.Marshal(response)
 	if err != nil {
 		// giving up on json
@@ -127,12 +127,12 @@
 	w.Header().Set("Content-Type", "application/json")
 	// Get the Key.
 	vars := mux.Vars(r)
-	ID := vars["id"]
+	name := vars["name"]
 
-	err := h.removePackage(ID)
+	err := h.removePackage(name)
 	msg, status := respond(err)
 
-	response := response{Message: msg, Package: ID}
+	response := response{Message: msg, Package: name}
 	bs, err := json.Marshal(response)
 	if err != nil {
 		// giving up on json
@@ -180,13 +180,13 @@
 	m.HandleFunc("/", h.getAll).Methods("GET")
 
 	// get specific package
-	m.HandleFunc("/{id}", h.get).Methods("GET")
+	m.HandleFunc("/{name}", h.get).Methods("GET")
 
 	// Add a package
-	m.HandleFunc("/{id}", h.add).Methods("PUT")
+	m.HandleFunc("/{name}", h.add).Methods("PUT")
 
 	// Remove a package
-	m.HandleFunc("/{id}", h.remove).Methods("DELETE")
+	m.HandleFunc("/{name}", h.remove).Methods("DELETE")
 
 	return m
 }
 
=== modified file 'snappy/handlers_test.go'
--- snappy/handlers_test.go	2016-03-08 18:30:48 +0000
+++ snappy/handlers_test.go	2016-04-26 10:36:16 +0000
@@ -35,7 +35,7 @@
 var _ = Suite(&HandlersSuite{})
 
 func (s *HandlersSuite) SetUpTest(c *C) {
-	os.Setenv("SNAP_APP_DATA_PATH", c.MkDir())
+	os.Setenv("SNAP_DATA", c.MkDir())
 	s.c = &fakeSnapdClient{}
 	s.h.setClient(s.c)
 }
 
=== modified file 'snappy/icon.go'
--- snappy/icon.go	2016-01-27 14:16:35 +0000
+++ snappy/icon.go	2016-04-26 10:36:16 +0000
@@ -26,7 +26,7 @@
 )
 
 var (
-	// ErrDataPathNotSet indicates that SNAP_APP_DATA_PATH has not been set by the
+	// ErrDataPathNotSet indicates that SNAP_DATA has not been set by the
 	// launching system.
 	ErrDataPathNotSet = errors.New("package data path not set")
 	// ErrOnIconDataPathSet indicates that there has been an error when setting up
@@ -36,18 +36,18 @@
 	ErrIconNotExist = errors.New("the icon does not exist")
 )
 
-func localIconPath(c snapdClient, ID string) (relativePath string, err error) {
+func localIconPath(c snapdClient, name string) (relativePath string, err error) {
 	dataPath, relativePath, err := IconDir()
 	if err != nil {
 		return "", err
 	}
 
-	icon, err := c.Icon(ID)
+	icon, err := c.Icon(name)
 	if err != nil {
 		return "", ErrIconNotExist
 	}
 
-	baseIcon := fmt.Sprintf("%s_%s", ID, icon.Filename)
+	baseIcon := fmt.Sprintf("%s_%s", name, icon.Filename)
 
 	relativePath = filepath.Join(relativePath, baseIcon)
 	iconDstPath := filepath.Join(dataPath, baseIcon)
@@ -67,7 +67,7 @@
 
 // IconDir returns information to properly serve package icons with an http.FileServer
 func IconDir() (dataPath, relativeBasePath string, err error) {
-	dataPath = os.Getenv("SNAP_APP_DATA_PATH")
+	dataPath = os.Getenv("SNAP_DATA")
 	if dataPath == "" {
 		return "", "", ErrDataPathNotSet
 	}
 
=== modified file 'snappy/icon_test.go'
--- snappy/icon_test.go	2016-01-27 14:16:35 +0000
+++ snappy/icon_test.go	2016-04-26 10:36:16 +0000
@@ -36,7 +36,7 @@
 
 func (s *IconSuite) SetUpTest(c *C) {
 	s.dataPath = c.MkDir()
-	os.Setenv("SNAP_APP_DATA_PATH", s.dataPath)
+	os.Setenv("SNAP_DATA", s.dataPath)
 }
 
 func (s *IconSuite) TestIconDir(c *C) {
@@ -47,7 +47,7 @@
 }
 
 func (s *IconSuite) TestNoSnapAppDataPathCausesError(c *C) {
-	os.Setenv("SNAP_APP_DATA_PATH", "")
+	os.Setenv("SNAP_DATA", "")
 	_, _, err := IconDir()
 	c.Assert(err, Equals, ErrDataPathNotSet)
 }
@@ -55,7 +55,7 @@
 func (s *IconSuite) TestIconDirCreateFails(c *C) {
 	fileAsDir := filepath.Join(s.dataPath, "badDataPath")
 	c.Assert(ioutil.WriteFile(fileAsDir, []byte{}, 0644), IsNil)
-	os.Setenv("SNAP_APP_DATA_PATH", fileAsDir)
+	os.Setenv("SNAP_DATA", fileAsDir)
 	_, _, err := IconDir()
 	c.Assert(err, Equals, ErrOnIconDataPathSet)
 }
@@ -66,7 +66,7 @@
 	err      error
 }
 
-func (s *IconPathSuite) Icon(pkgID string) (*client.Icon, error) {
+func (s *IconPathSuite) Icon(name string) (*client.Icon, error) {
 	icon := &client.Icon{
 		Filename: "pkgIcon.png",
 		Content:  []byte("png"),
@@ -78,14 +78,14 @@
 
 func (s *IconPathSuite) SetUpTest(c *C) {
 	s.dataPath = c.MkDir()
-	os.Setenv("SNAP_APP_DATA_PATH", s.dataPath)
+	os.Setenv("SNAP_DATA", s.dataPath)
 	s.err = nil
 }
 
 func (s *IconPathSuite) TestIconCopy(c *C) {
-	relativePath, err := localIconPath(s, "mypackage.sergiusens")
+	relativePath, err := localIconPath(s, "mypackage")
 	c.Assert(err, IsNil)
-	iconBaseName := "icons/mypackage.sergiusens_pkgIcon.png"
+	iconBaseName := "icons/mypackage_pkgIcon.png"
 	c.Check(relativePath, Equals, filepath.Join("/", iconBaseName))
 
 	contents, err := ioutil.ReadFile(filepath.Join(s.dataPath, iconBaseName))
@@ -95,23 +95,23 @@
 }
 
 func (s *IconPathSuite) TestIconCopyNoDataPath(c *C) {
-	os.Setenv("SNAP_APP_DATA_PATH", "")
-	_, err := localIconPath(s, "mypackage.sergiusens")
+	os.Setenv("SNAP_DATA", "")
+	_, err := localIconPath(s, "mypackage")
 	c.Assert(err, Equals, ErrDataPathNotSet)
 }
 
 func (s *IconPathSuite) TestIconCopyNoIcon(c *C) {
 	s.err = errors.New("Not Found")
-	_, err := localIconPath(s, "mypackage.sergiusens")
+	_, err := localIconPath(s, "mypackage")
 	c.Assert(err, Equals, ErrIconNotExist)
 }
 
 func (s *IconPathSuite) TestIconCopyTargetIconExists(c *C) {
-	iconBaseName := "icons/mypackage.sergiusens_pkgIcon.png"
+	iconBaseName := "icons/mypackage_pkgIcon.png"
 	c.Assert(os.MkdirAll(filepath.Join(s.dataPath, "icons"), 0755), IsNil)
 	c.Assert(ioutil.WriteFile(filepath.Join(s.dataPath, iconBaseName), []byte{}, 0644), IsNil)
 
-	relativePath, err := localIconPath(s, "mypackage.sergiusens")
+	relativePath, err := localIconPath(s, "mypackage")
 	c.Assert(err, IsNil)
 	c.Check(relativePath, Equals, filepath.Join("/", iconBaseName))
 }
 
=== modified file 'snappy/snapd_client.go'
--- snappy/snapd_client.go	2016-04-21 04:33:37 +0000
+++ snappy/snapd_client.go	2016-04-26 10:36:16 +0000
@@ -22,10 +22,9 @@
 )
 
 type snapdClient interface {
-	Icon(pkgID string) (*client.Icon, error)
-	Services(pkg string) (map[string]*client.Service, error)
-	Snap(name string) (*client.Snap, error)
-	FilterSnaps(filter client.SnapFilter) (map[string]*client.Snap, error)
-	AddSnap(name string) (string, error)
-	RemoveSnap(name string) (string, error)
+	Icon(name string) (*client.Icon, error)
+	Snap(name string) (*client.Snap, *client.ResultInfo, error)
+	FilterSnaps(filter client.SnapFilter) ([]*client.Snap, *client.ResultInfo, error)
+	Install(name string, options *client.SnapOptions) (string, error)
+	Remove(name string, options *client.SnapOptions) (string, error)
 }
 
=== modified file 'statustracker/statustracker.go'
--- statustracker/statustracker.go	2016-03-08 18:30:49 +0000
+++ statustracker/statustracker.go	2016-04-26 10:36:16 +0000
@@ -62,13 +62,13 @@
 	s.Lock()
 	defer s.Unlock()
 
-	status, ok := s.statuses[snapID(snap)]
+	status, ok := s.statuses[snap.Name]
 	if !ok {
 		return translateStatus(snap)
 	}
 
 	if hasCompleted(status, snap) {
-		delete(s.statuses, snapID(snap))
+		delete(s.statuses, snap.Name)
 		return translateStatus(snap)
 	}
 
@@ -81,19 +81,19 @@
 		return
 	}
 
-	s.trackOperation(snapID(snap), StatusInstalling)
+	s.trackOperation(snap.Name, StatusInstalling)
 }
 
-func (s *StatusTracker) trackOperation(id, operation string) {
+func (s *StatusTracker) trackOperation(name, operation string) {
 	s.Lock()
 	defer s.Unlock()
 
-	s.statuses[id] = operation
+	s.statuses[name] = operation
 
 	go func() {
 		<-time.After(trackerDuration)
 		s.Lock()
-		delete(s.statuses, id)
+		delete(s.statuses, name)
 		s.Unlock()
 	}()
 }
@@ -104,11 +104,7 @@
 		return
 	}
 
-	s.trackOperation(snapID(snap), StatusUninstalling)
-}
-
-func snapID(s *client.Snap) string {
-	return s.Name + "." + s.Origin
+	s.trackOperation(snap.Name, StatusUninstalling)
 }
 
 func isInstalled(s *client.Snap) bool {
 
=== modified file 'statustracker/statustracker_test.go'
--- statustracker/statustracker_test.go	2016-04-21 06:03:28 +0000
+++ statustracker/statustracker_test.go	2016-04-26 10:36:16 +0000
@@ -45,7 +45,7 @@
 	}{
 		{client.StatusInstalled, StatusInstalled},
 		{client.StatusActive, StatusInstalled},
-		{client.StatusNotInstalled, StatusUninstalled},
+		{client.StatusAvailable, StatusUninstalled},
 		{client.StatusRemoved, StatusUninstalled},
 	}
 
@@ -85,7 +85,7 @@
 }
 
 func (s *StatusTrackerSuite) TestTrackInstall(c *C) {
-	snap := &client.Snap{Status: client.StatusNotInstalled}
+	snap := &client.Snap{Status: client.StatusAvailable}
 	s.t.TrackInstall(snap)
 	c.Assert(s.t.Status(snap), Equals, StatusInstalling)
 	// installation completes
@@ -96,7 +96,7 @@
 func (s *StatusTrackerSuite) TestTrackInstallExpiry(c *C) {
 	trackerDuration = 200 * time.Millisecond
 
-	snap := &client.Snap{Status: client.StatusNotInstalled}
+	snap := &client.Snap{Status: client.StatusAvailable}
 	s.t.TrackInstall(snap)
 	c.Assert(s.t.Status(snap), Equals, StatusInstalling)
 
@@ -106,7 +106,7 @@
 }
 
 func (s *StatusTrackerSuite) TestTrackUninstallNotInstalled(c *C) {
-	snap := &client.Snap{Status: client.StatusNotInstalled}
+	snap := &client.Snap{Status: client.StatusAvailable}
 	s.t.TrackUninstall(snap)
 	c.Assert(s.t.Status(snap), Equals, StatusUninstalled)
 }
 
=== modified file 'www/src/css/snaplist.css'
--- www/src/css/snaplist.css	2015-12-11 15:07:16 +0000
+++ www/src/css/snaplist.css	2016-04-26 10:36:16 +0000
@@ -62,7 +62,7 @@
 
 .b-snaplist_grid .b-snaplist__version,
 .b-snaplist_grid .b-snaplist__type,
-.b-snaplist_grid .b-snaplist__origin,
+.b-snaplist_grid .b-snaplist__developer,
 .b-snaplist_grid .b-snaplist__actions {
   display:none;
 }
@@ -114,7 +114,7 @@
 
 .b-snaplist_row .b-snaplist__name,
 .b-snaplist_row .b-snaplist__version,
-.b-snaplist_row .b-snaplist__origin,
+.b-snaplist_row .b-snaplist__developer,
 .b-snaplist_row .b-snaplist__size {
   white-space: nowrap;
   width: 100%;
@@ -142,8 +142,8 @@
   display:none;
 }
 
-.b-snaplist_row .b-snaplist__origin
-.b-snaplist_row .b-snaplist__origin {
+.b-snaplist_row .b-snaplist__developer
+.b-snaplist_row .b-snaplist__developer {
   text-transform: capitalize;
 }
 
 
=== modified file 'www/src/js/config.js'
--- www/src/js/config.js	2016-01-27 14:16:35 +0000
+++ www/src/js/config.js	2016-04-26 10:36:16 +0000
@@ -7,7 +7,7 @@
   ],
   NON_INSTALLABLE_IDS: [
     'webdm',
-    'ubuntu-core.ubuntu'
+    'ubuntu-core'
   ],
   NON_INSTALLABLE_TYPES: [
     'gadget'
 
=== modified file 'www/src/js/models/snap.js'
--- www/src/js/models/snap.js	2015-06-03 11:45:59 +0000
+++ www/src/js/models/snap.js	2016-04-26 10:36:16 +0000
@@ -166,8 +166,8 @@
       response.icon = this.defaults.icon;
     }
 
-    if (response.hasOwnProperty('origin') && !response.origin.length) {
-      response.origin = this.defaults.origin;
+    if (response.hasOwnProperty('developer') && !response.developer.length) {
+      response.developer = this.defaults.developer;
     }
 
     if (type) {
@@ -200,28 +200,13 @@
       );
     }
 
-    if (response.hasOwnProperty('ui_port')) {
-      //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
-      var port = response.ui_port;
-      //jscs:enable requireCamelCaseOrUpperCaseIdentifiers
-
-      if (_.isFinite(port) && port > 0) {
-
-        this.set('vendorGuiHref', window.location.protocol + '//' +
-            window.location.hostname + ':' + port + '/'
-        );
-      } else {
-        this.unset('vendorGuiHref');
-      }
-    }
-
     return response;
   },
 
   defaults: {
     icon: '/public/images/default-package-icon.svg',
     installActionString: false,
-    origin: '-',
+    developer: '-',
     isInstallable: true
   }
 
 
=== modified file 'www/src/js/templates/snap-menu.hbs'
--- www/src/js/templates/snap-menu.hbs	2015-06-03 11:33:11 +0000
+++ www/src/js/templates/snap-menu.hbs	2016-04-26 10:36:16 +0000
@@ -8,9 +8,4 @@
   <a class="b-snap__nav-item" href="settings">
     Settings
   </a>
-  {{#if vendorGuiHref}}
-  <a class="b-snap__nav-item" href="{{vendorGuiHref}}" target="_blank">
-    Open / Manage
-  </a>
-  {{/if}}
 </div>
 
=== modified file 'www/src/js/templates/snaplist-item.hbs'
--- www/src/js/templates/snaplist-item.hbs	2015-12-11 15:07:16 +0000
+++ www/src/js/templates/snaplist-item.hbs	2016-04-26 10:36:16 +0000
@@ -6,7 +6,7 @@
   <div class="b-snaplist__version">{{ version }}</div>
 </div>
 <div class="b-snaplist__src">
-  <div class="b-snaplist__origin">{{ origin }}</div>
+  <div class="b-snaplist__developer">{{ developer }}</div>
 </div>
 <div class="b-snaplist__size" title="Installed file size">{{ prettyInstalledSize }}</div>
 <div class="b-snaplist__actions">
 
=== modified file 'www/src/js/templates/storelist-item.hbs'
--- www/src/js/templates/storelist-item.hbs	2015-12-11 15:07:16 +0000
+++ www/src/js/templates/storelist-item.hbs	2016-04-26 10:36:16 +0000
@@ -6,7 +6,7 @@
   <div class="b-snaplist__version">{{ version }}</div>
 </div>
 <div class="b-snaplist__src">
-  <div class="b-snaplist__origin">{{ origin }}</div>
+  <div class="b-snaplist__developer">{{ developer }}</div>
 </div>
 <div class="b-snaplist__actions">
   {{> installer}}
 
=== modified file 'www/tests/modelSpec.js'
--- www/tests/modelSpec.js	2015-06-03 11:45:59 +0000
+++ www/tests/modelSpec.js	2016-04-26 10:36:16 +0000
@@ -88,20 +88,6 @@
       expect(this.model.get('prettyDownloadSize')).toBe('0 B');
     });
 
-    it('should parse response to create vendorGuiHref', function() {
-      this.model.parse({'ui_port': 8080});
-      expect(this.model.get('vendorGuiHref')).toBe('http://localhost:8080/');
-    });
-
-    it('should not set vendorGuiHref if not a finite number', function() {
-      this.model.parse({'ui_port': NaN});
-      expect(this.model.get('vendorGuiHref')).not.toBeDefined();
-      this.model.parse({'ui_port': ''});
-      expect(this.model.get('vendorGuiHref')).not.toBeDefined();
-      this.model.parse({'ui_port': -9});
-      expect(this.model.get('vendorGuiHref')).not.toBeDefined();
-    });
-
   });
 
   describe('sync methods', function() {