Merge lp:~sergiusens/snapweb/deletePackage into lp:~snappy-dev/snapweb/trunk

[Sergio Schvezov]

Implement package removal by adding DELETE to /v2/packages/

[Stephen Stewart (stephen-stewart)]

wfm

review: Approve

[John Lenton (chipaca)]

Good!

We'll want to update to progress as per lp:~mvo/snappy/snappy-refactor-progress-pkgname before adding much more though.

review: Approve

[Snappy Tarmac (snappydevtarmac)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Sergio Schvezov (sergiusens)]

Out of sync approve

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~sergiusens/webdm/deletePackage into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/gorilla/context now at 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update launchpad.net/snappy failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/gorilla/mux failed; trying to fetch newer version
launchpad.net/snappy now at snappy_tarmac-20150506140221-gy35a67lv7tmc0nl
update github.com/juju/loggo failed; trying to fetch newer version
github.com/gorilla/mux now at e444e69cbd2e2e3e0749a2f3c717cec491552bbf
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/juju/loggo now at 4c7cbce140ca070eeb59a28f4bf9507e511711f9
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
Building
Running tests from /tmp/tmp.H6SJH8Ab6h/src/launchpad.net/webdm
? launchpad.net/webdm/cmd/snappyd [no test files]
? launchpad.net/webdm/oem [no test files]
FAIL launchpad.net/webdm/snappy [build failed]
? launchpad.net/webdm/webprogress [no test files]

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/webdm
cp -a . $GOPATH/src/launchpad.net/webdm/
cd $GOPATH/src/launchpad.net/webdm

./run-checks
gopkg.in/yaml.v2
launchpad.net/webdm/oem
github.com/gorilla/context
github.com/gorilla/mux
github.com/mvo5/goconfigparser
github.com/blakesmith/ar
launchpad.net/snappy/helpers
launchpad.net/snappy/clickdeb
launchpad.net/snappy/coreconfig
github.com/juju/loggo
launchpad.net/snappy/logger
launchpad.net/snappy/partition
launchpad.net/snappy/policy
github.com/cheggaaa/pb
launchpad.net/snappy/progress
launchpad.net/snappy/release
launchpad.net/snappy/systemd
launchpad.net/snappy/snappy
launchpad.net/webdm/webprogress
launchpad.net/webdm/snappy
launchpad.net/webdm/cmd/snappyd
# launchpad.net/webdm/snappy
snappy/converge_test.go:38: s.h.installStatus undefined (type Handler has no field or method installStatus)
snappy/converge_test.go:109: s.h.installStatus undefined (type Handler has no field or method installStatus)
snappy/converge_test.go:216: s.h.installStatus undefined (type Handler has no field or method installStatus)

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~sergiusens/webdm/deletePackage into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/gorilla/context now at 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update launchpad.net/snappy failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/gorilla/mux failed; trying to fetch newer version
launchpad.net/snappy now at snappy_tarmac-20150506140221-gy35a67lv7tmc0nl
update github.com/juju/loggo failed; trying to fetch newer version
github.com/gorilla/mux now at e444e69cbd2e2e3e0749a2f3c717cec491552bbf
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/juju/loggo now at 4c7cbce140ca070eeb59a28f4bf9507e511711f9
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
Building
Running tests from /tmp/tmp.bMPDzwX5ml/src/launchpad.net/webdm
? launchpad.net/webdm/cmd/snappyd [no test files]
? launchpad.net/webdm/oem [no test files]
FAIL launchpad.net/webdm/snappy [build failed]
? launchpad.net/webdm/webprogress [no test files]

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/webdm
cp -a . $GOPATH/src/launchpad.net/webdm/
cd $GOPATH/src/launchpad.net/webdm

./run-checks
gopkg.in/yaml.v2
launchpad.net/webdm/oem
github.com/gorilla/context
github.com/gorilla/mux
github.com/mvo5/goconfigparser
github.com/blakesmith/ar
launchpad.net/snappy/helpers
launchpad.net/snappy/clickdeb
launchpad.net/snappy/coreconfig
github.com/juju/loggo
launchpad.net/snappy/logger
launchpad.net/snappy/partition
launchpad.net/snappy/policy
github.com/cheggaaa/pb
launchpad.net/snappy/progress
launchpad.net/snappy/release
launchpad.net/snappy/systemd
launchpad.net/snappy/snappy
launchpad.net/webdm/webprogress
launchpad.net/webdm/snappy
launchpad.net/webdm/cmd/snappyd
# launchpad.net/webdm/snappy
snappy/converge_test.go:38: s.h.installStatus undefined (type Handler has no field or method installStatus)
snappy/converge_test.go:109: s.h.installStatus undefined (type Handler has no field or method installStatus)
snappy/converge_test.go:216: s.h.installStatus undefined (type Handler has no field or method installStatus)

[Sergio Schvezov (sergiusens)]

review: Approve

[Sergio Schvezov (sergiusens)]

there was an out of order merge

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~sergiusens/webdm/deletePackage into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/gorilla/context now at 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update launchpad.net/snappy failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/gorilla/mux failed; trying to fetch newer version
launchpad.net/snappy now at snappy_tarmac-20150506140221-gy35a67lv7tmc0nl
update github.com/juju/loggo failed; trying to fetch newer version
github.com/gorilla/mux now at e444e69cbd2e2e3e0749a2f3c717cec491552bbf
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/juju/loggo now at 4c7cbce140ca070eeb59a28f4bf9507e511711f9
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
Building
Running tests from /tmp/tmp.2bVlkioIZE/src/launchpad.net/webdm
? launchpad.net/webdm/cmd/snappyd [no test files]
? launchpad.net/webdm/oem [no test files]
FAIL launchpad.net/webdm/snappy [build failed]
? launchpad.net/webdm/webprogress [no test files]

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/webdm
cp -a . $GOPATH/src/launchpad.net/webdm/
cd $GOPATH/src/launchpad.net/webdm

./run-checks
gopkg.in/yaml.v2
launchpad.net/webdm/oem
github.com/gorilla/context
github.com/gorilla/mux
github.com/mvo5/goconfigparser
github.com/blakesmith/ar
launchpad.net/snappy/helpers
launchpad.net/snappy/clickdeb
launchpad.net/snappy/coreconfig
github.com/juju/loggo
launchpad.net/snappy/logger
launchpad.net/snappy/partition
launchpad.net/snappy/policy
github.com/cheggaaa/pb
launchpad.net/snappy/progress
launchpad.net/snappy/release
launchpad.net/snappy/systemd
launchpad.net/snappy/snappy
launchpad.net/webdm/webprogress
launchpad.net/webdm/snappy
launchpad.net/webdm/cmd/snappyd
# launchpad.net/webdm/snappy
snappy/converge_test.go:38: s.h.installStatus undefined (type Handler has no field or method installStatus)
snappy/converge_test.go:109: s.h.installStatus undefined (type Handler has no field or method installStatus)
snappy/converge_test.go:216: s.h.installStatus undefined (type Handler has no field or method installStatus)

[lp:~sergiusens/snapweb/deletePackage]

122. By Sergio Schvezov on 2015-05-06

Updating tests

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-06 15:03:28 +0000
+++ snappy/converge.go	2015-05-06 17:14:56 +0000
@@ -29,21 +29,21 @@
 )
 
 type snapPkg struct {
-	Name          string          `json:"name"`
-	Origin        string          `json:"origin"`
-	Version       string          `json:"version"`
-	Vendor        string          `json:"vendor"`
-	Description   string          `json:"description"`
-	Icon          string          `json:"icon"`
-	Status        string          `json:"status"`
-	Message       string          `json:"message,omitempty"`
-	IsError       bool            `json:"-"`
-	Progress      float64         `json:"progress,omitempty"`
-	InstalledSize int64           `json:"installed_size,omitempty"`
-	DownloadSize  int64           `json:"download_size,omitempty"`
-	Type          snappy.SnapType `json:"type,omitempty"`
-	UIPort        uint64          `json:"ui_port,omitempty"`
-	UIUri         string          `json:"ui_uri,omitempty"`
+	Name          string             `json:"name"`
+	Origin        string             `json:"origin"`
+	Version       string             `json:"version"`
+	Vendor        string             `json:"vendor"`
+	Description   string             `json:"description"`
+	Icon          string             `json:"icon"`
+	Status        webprogress.Status `json:"status"`
+	Message       string             `json:"message,omitempty"`
+	IsError       bool               `json:"-"`
+	Progress      float64            `json:"progress,omitempty"`
+	InstalledSize int64              `json:"installed_size,omitempty"`
+	DownloadSize  int64              `json:"download_size,omitempty"`
+	Type          snappy.SnapType    `json:"type,omitempty"`
+	UIPort        uint64             `json:"ui_port,omitempty"`
+	UIUri         string             `json:"ui_uri,omitempty"`
 }
 
 type response struct {
@@ -111,6 +111,23 @@
 	return mergeSnaps(installedSnapQs, remoteSnapQs, installedOnly), nil
 }
 
+func (h *Handler) doRemovePackage(progress *webprogress.WebProgress, pkgName string) {
+	err := snappy.Remove(pkgName, 0, progress)
+	progress.ErrorChan <- err
+	close(progress.ErrorChan)
+}
+
+func (h *Handler) removePackage(pkgName string) error {
+	progress, err := h.statusTracker.Add(pkgName, webprogress.OperationRemove)
+	if err != nil {
+		return err
+	}
+
+	go h.doRemovePackage(progress, pkgName)
+
+	return nil
+}
+
 func (h *Handler) doInstallPackage(progress *webprogress.WebProgress, pkgName string) {
 	_, err := snappy.Install(pkgName, 0, progress)
 	progress.ErrorChan <- err
@@ -118,7 +135,7 @@
 }
 
 func (h *Handler) installPackage(pkgName string) error {
-	progress, err := h.installStatus.Add(pkgName)
+	progress, err := h.statusTracker.Add(pkgName, webprogress.OperationInstall)
 	if err != nil {
 		return err
 	}
@@ -197,10 +214,10 @@
 		snap.DownloadSize = snapQ.DownloadSize()
 	}
 
-	if stat, ok := h.installStatus.Get(snap.Name); ok {
+	if stat, ok := h.statusTracker.Get(snap.Name); ok {
 		snap.Status = stat.Status
 		if stat.Done() {
-			defer h.installStatus.Remove(snap.Name)
+			defer h.statusTracker.Remove(snap.Name)
 
 			if stat.Error != nil {
 				snap.Message = stat.Error.Error()

=== modified file 'snappy/converge_test.go'
--- snappy/converge_test.go	2015-05-06 12:49:52 +0000
+++ snappy/converge_test.go	2015-05-06 17:14:56 +0000
@@ -35,7 +35,7 @@
 
 func (s *PayloadSuite) SetUpTest(c *C) {
 	os.Setenv("SNAP_APP_DATA_PATH", c.MkDir())
-	s.h.installStatus = webprogress.New()
+	s.h.statusTracker = webprogress.New()
 }
 
 func (s *PayloadSuite) TestPayloadWithNoServices(c *C) {
@@ -106,7 +106,7 @@
 
 func (s *MergeSuite) SetUpTest(c *C) {
 	os.Setenv("SNAP_APP_DATA_PATH", c.MkDir())
-	s.h.installStatus = webprogress.New()
+	s.h.statusTracker = webprogress.New()
 }
 
 func (s *MergeSuite) TestOneInstalledAndNoRemote(c *C) {
@@ -213,7 +213,7 @@
 }
 
 func (s *MergeSuite) TestManyInstalledAndManyRemotesSomeInstalling(c *C) {
-	s.h.installStatus.Add("app4.ubuntu")
+	s.h.statusTracker.Add("app4.ubuntu", webprogress.OperationInstall)
 
 	installed := []snapPkg{
 		s.h.snapQueryToPayload(newFakePart("app1.canonical", "1.0", true)),

=== modified file 'snappy/handlers.go'
--- snappy/handlers.go	2015-05-06 10:24:29 +0000
+++ snappy/handlers.go	2015-05-06 17:14:56 +0000
@@ -32,13 +32,13 @@
 
 // Handler implements snappy's packages api.
 type Handler struct {
-	installStatus *webprogress.Status
+	statusTracker *webprogress.StatusTracker
 }
 
 // NewHandler creates an instance that implements snappy's packages api.
 func NewHandler() *Handler {
 	return &Handler{
-		installStatus: webprogress.New(),
+		statusTracker: webprogress.New(),
 	}
 }
 
@@ -101,18 +101,54 @@
 	vars := mux.Vars(r)
 	pkgName := vars["pkg"]
 
-	var msg string
-	var status int
-
 	err := h.installPackage(pkgName)
-
+	msg, status := respond(err)
+
+	response := response{Message: msg, Package: pkgName}
+	bs, err := json.Marshal(response)
+	if err != nil {
+		// giving up on json
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprintf(w, "Error: %s", err)
+		log.Print(err)
+		return
+	}
+
+	w.WriteHeader(status)
+	w.Write(bs)
+}
+
+func (h *Handler) remove(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+	// Get the Key.
+	vars := mux.Vars(r)
+	pkgName := vars["pkg"]
+
+	err := h.removePackage(pkgName)
+	msg, status := respond(err)
+
+	response := response{Message: msg, Package: pkgName}
+	bs, err := json.Marshal(response)
+	if err != nil {
+		// giving up on json
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprintf(w, "Error: %s", err)
+		log.Print(err)
+		return
+	}
+
+	w.WriteHeader(status)
+	w.Write(bs)
+}
+
+func respond(err error) (msg string, status int) {
 	switch err {
 	case snappy.ErrAlreadyInstalled:
 		status = http.StatusOK
 		msg = "Installed"
 	case webprogress.ErrPackageInstallInProgress:
 		status = http.StatusBadRequest
-		msg = "Installation in progress"
+		msg = "Operation in progress"
 	case snappy.ErrPackageNotFound:
 		status = http.StatusNotFound
 		msg = "Package not found"
@@ -124,18 +160,7 @@
 		msg = "Processing error"
 	}
 
-	response := response{Message: msg, Package: pkgName}
-	bs, err := json.Marshal(response)
-	if err != nil {
-		// giving up on json
-		w.WriteHeader(http.StatusInternalServerError)
-		fmt.Fprintf(w, "Error: %s", err)
-		log.Print(err)
-		return
-	}
-
-	w.WriteHeader(status)
-	w.Write(bs)
+	return msg, status
 }
 
 // MakeMuxer sets up the handlers multiplexing to handle requests against snappy's
@@ -158,5 +183,8 @@
 	// Add a package
 	m.HandleFunc("/{pkg}", h.add).Methods("PUT")
 
+	// Remove a package
+	m.HandleFunc("/{pkg}", h.remove).Methods("DELETE")
+
 	return m
 }

=== modified file 'webprogress/meter.go'
--- webprogress/meter.go	2015-05-06 15:54:38 +0000
+++ webprogress/meter.go	2015-05-06 17:14:56 +0000
@@ -19,13 +19,28 @@
 
 import "launchpad.net/snappy/progress"
 
+// Operation indicates the desired operation to perform
+type Operation uint
+
+const (
+	// OperationInstall indicates that a package needs installing
+	OperationInstall Operation = iota
+	// OperationRemove indicates that a package needs uninstalling
+	OperationRemove
+)
+
+// Status indicates the status a package is in.
+type Status string
+
 const (
 	// StatusInstalled indicates the package is in an installed state.
-	StatusInstalled = "installed"
+	StatusInstalled Status = "installed"
 	// StatusUninstalled indicates the package is in an uninstalled state.
-	StatusUninstalled = "uninstalled"
+	StatusUninstalled Status = "uninstalled"
 	// StatusInstalling indicates the package is in an installing state.
-	StatusInstalling = "installing"
+	StatusInstalling Status = "installing"
+	// StatusUninstalling indicates the package is in an uninstalling state.
+	StatusUninstalling Status = "uninstalling"
 )
 
 // WebProgress show progress on the terminal
@@ -33,18 +48,30 @@
 	progress.Meter
 	total               float64
 	current             float64
-	Status              string
+	Status              Status
 	statusMessage       string
 	notificationMessage string
 	Error               error
 	ErrorChan           chan error
+	operation           Operation
 }
 
 // NewWebProgress returns a new WebProgress type
-func NewWebProgress() *WebProgress {
+func NewWebProgress(op Operation) *WebProgress {
+	var status Status
+	switch op {
+	case OperationInstall:
+		status = StatusInstalling
+	case OperationRemove:
+		status = StatusUninstalling
+	default:
+		panic("Not a valid Operation")
+	}
+
 	t := &WebProgress{
 		ErrorChan: make(chan error),
-		Status:    StatusInstalling,
+		Status:    status,
+		operation: op,
 	}
 
 	go func() {
@@ -54,7 +81,16 @@
 			t.Status = StatusUninstalled
 			t.Error = err
 		} else {
-			t.Status = StatusInstalled
+			var status Status
+			switch op {
+			case OperationInstall:
+				status = StatusInstalled
+			case OperationRemove:
+				status = StatusUninstalled
+			default:
+				panic("Not a valid Operation")
+			}
+			t.Status = status
 		}
 	}()
 
@@ -64,7 +100,6 @@
 // Start starts showing progress
 func (t *WebProgress) Start(pkgName string, total float64) {
 	t.total = total
-	t.Status = StatusInstalling
 }
 
 // Set sets the progress to the current value

=== modified file 'webprogress/progress.go'
--- webprogress/progress.go	2015-05-03 20:46:10 +0000
+++ webprogress/progress.go	2015-05-06 17:14:56 +0000
@@ -28,19 +28,19 @@
 	ErrPackageInstallInProgress = errors.New("package installion in progress")
 )
 
-// Status holds the state of all operations that require progress information.
-type Status struct {
+// StatusTracker holds the state of all operations that require progress information.
+type StatusTracker struct {
 	status map[string]*WebProgress
 	l      sync.Mutex
 }
 
 // New creates a new Status.
-func New() *Status {
-	return &Status{status: make(map[string]*WebProgress)}
+func New() *StatusTracker {
+	return &StatusTracker{status: make(map[string]*WebProgress)}
 }
 
 // Add add pkg to the list of progresses to track, it is idempotent
-func (i *Status) Add(pkg string) (*WebProgress, error) {
+func (i *StatusTracker) Add(pkg string, op Operation) (*WebProgress, error) {
 	i.l.Lock()
 	defer i.l.Unlock()
 
@@ -48,14 +48,14 @@
 		return nil, ErrPackageInstallInProgress
 	}
 
-	i.status[pkg] = NewWebProgress()
+	i.status[pkg] = NewWebProgress(op)
 
 	return i.status[pkg], nil
 }
 
 // Remove removes pkg to the list of progresses to track, it is a no op
 // to remove multiple times.
-func (i *Status) Remove(pkg string) {
+func (i *StatusTracker) Remove(pkg string) {
 	i.l.Lock()
 	defer i.l.Unlock()
 
@@ -63,7 +63,7 @@
 }
 
 // Get returns a *WebProgress corresponding to pkg or nil if not tracked.
-func (i *Status) Get(pkg string) (*WebProgress, bool) {
+func (i *StatusTracker) Get(pkg string) (*WebProgress, bool) {
 	i.l.Lock()
 	defer i.l.Unlock()