Delete instance api

database/instance_db.go

@@ -15,6 +15,9 @@ type InstanceDB interface {
 	// Save saves instance to database.
 	Save(i *instance.Instance) error
 
+	// Delete an instance by instance hash.
+	Delete(hash string) error
+
 	// Close closes underlying database connection.
 	Close() error
 }
@@ -49,24 +52,15 @@ func (d *LevelDBInstanceDB) unmarshal(id string, value []byte) (*instance.Instan
 
 // Get retrives instance by instance hash.
 func (d *LevelDBInstanceDB) Get(hash string) (*instance.Instance, error) {
-	tx, err := d.db.OpenTransaction()
-	if err != nil {
-		return nil, err
-	}
-	b, err := tx.Get([]byte(hash), nil)
+
+	b, err := d.db.Get([]byte(hash), nil)
 	if err != nil {
-		tx.Discard()
 		if err == leveldb.ErrNotFound {
 			return nil, &ErrNotFound{ID: hash}
 		}
 		return nil, err
 	}
-	i, err := d.unmarshal(hash, b)
-	if err != nil {
-		tx.Discard()
-		return nil, err
-	}
-	return i, tx.Commit()
+	return d.unmarshal(hash, b)
 }
 
 // Save saves instance to database.
@@ -76,29 +70,21 @@ func (d *LevelDBInstanceDB) Save(i *instance.Instance) error {
 		return errCannotSaveWithoutHash
 	}
 
-	// open database transaction
-	tx, err := d.db.OpenTransaction()
-	if err != nil {
-		return err
-	}
-
 	// encode service
 	b, err := d.marshal(i)
 	if err != nil {
-		tx.Discard()
-		return err
-	}
-
-	// save instance with hash.
-	if err := tx.Put([]byte(i.Hash), b, nil); err != nil {
-		tx.Discard()
 		return err
 	}
 
-	return tx.Commit()
+	return d.db.Put([]byte(i.Hash), b, nil)
 }
 
 // Close closes database.
 func (d *LevelDBInstanceDB) Close() error {
 	return d.db.Close()
 }
+
+// Delete deletes service from database.
+func (d *LevelDBInstanceDB) Delete(hash string) error {
+	return d.db.Delete([]byte(hash), nil)
+}

database/instance_db_test.go

@@ -0,0 +1,81 @@
+package database
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+
+	"github.com/mesg-foundation/core/instance"
+	"github.com/stretchr/testify/require"
+)
+
+func instancedb(t *testing.T, dir string) InstanceDB {
+	db, err := NewInstanceDB(dir)
+	require.NoError(t, err)
+	return db
+}
+
+func TestFindInstance(t *testing.T) {
+	dir, _ := ioutil.TempDir("", "TestFindInstance")
+	defer os.RemoveAll(dir)
+	db := instancedb(t, dir)
+	defer db.Close()
+	i := &instance.Instance{Hash: "xxx", ServiceHash: "yyy"}
+	db.Save(i)
+	tests := []struct {
+		hash     string
+		hasError bool
+	}{
+		{hash: i.Hash, hasError: false},
+		{hash: "yyy", hasError: true},
+	}
+	for _, test := range tests {
+		instance, err := db.Get(test.hash)
+		if test.hasError {
+			require.Error(t, err)
+			continue
+		}
+		require.NoError(t, err)
+		require.NotNil(t, instance)
+		e, err := db.Get(instance.Hash)
+		require.NoError(t, err)
+		require.NotNil(t, e)
+	}
+}
+
+func TestSaveInstance(t *testing.T) {
+	dir, _ := ioutil.TempDir("", "TestSaveInstance")
+	defer os.RemoveAll(dir)
+	db := instancedb(t, dir)
+	defer db.Close()
+	tests := []struct {
+		instance *instance.Instance
+		hasError bool
+	}{
+		{&instance.Instance{Hash: "xxx"}, false},
+		{&instance.Instance{}, true},
+	}
+	for _, test := range tests {
+		err := db.Save(test.instance)
+		if test.hasError {
+			require.Error(t, err)
+			continue
+		}
+		require.NoError(t, err)
+	}
+}
+
+func TestDeleteInstance(t *testing.T) {
+	dir, _ := ioutil.TempDir("", "TestDeleteInstance")
+	defer os.RemoveAll(dir)
+	db := instancedb(t, dir)
+	defer db.Close()
+	i := &instance.Instance{Hash: "xxx", ServiceHash: "yyy"}
+	db.Save(i)
+	require.NoError(t, db.Delete("xxx"))
+	inst, err := db.Get("xxx")
+	require.Nil(t, inst)
+	require.Error(t, err)
+
+	require.NoError(t, db.Delete("yyy"))
+}

dev

@@ -94,7 +94,7 @@ docker service create \
   --name engine \
   --tty \
   --label com.docker.stack.namespace=engine --label com.docker.stack.image=mesg/engine:$VERSION \
-  --mount type=bind,source=/var/run/docker.sock,destination=/var/run/docker.sock --mount type=bind,source=$HOME/.mesg,destination=/home/root/.mesg \
+  --mount type=bind,source=/var/run/docker.sock,destination=/var/run/docker.sock --mount type=bind,source=$HOME/.mesg,destination=/root/.mesg \
   --network engine --publish 50052:50052 \
   mesg/engine:$VERSION
 

instance/instance.go

@@ -4,6 +4,6 @@ package instance
 // This contains a reference to a service that is running.
 // Multiple instances can run for the same service as long as they have different configurations
 type Instance struct {
-	Hash        string `hash:"-"`
-	ServiceHash string `hash:"serviceHash"`
+	Hash        string
+	ServiceHash string
 }

protobuf/api/instance.proto

@@ -4,6 +4,7 @@ package api;
 
 service Instance {
   rpc Create (CreateInstanceRequest) returns (CreateInstanceResponse) {}
+  rpc Delete (DeleteInstanceRequest) returns (DeleteInstanceResponse) {}
 }
 
 message CreateInstanceRequest {
@@ -15,3 +16,11 @@ message CreateInstanceResponse {
   string hash = 2;        // Service's instance hash.
   string serviceHash = 3; // Service's bare hash.
 }
+
+message DeleteInstanceRequest {
+  string hash = 1;      // Instance hash
+}
+
+message DeleteInstanceResponse {
+  string hash = 1;      // Instance hash
+}