Merge branch 'dev' into fix/event-use-instance-hash

database/instance_db.go

@@ -16,9 +16,6 @@ type InstanceDB interface {
 	// GetAll retrieves all instances.
 	GetAll() ([]*instance.Instance, error)
 
-	// GetAllByService retrieves all instances of service by service's hash.
-	GetAllByService(serviceHash hash.Hash) ([]*instance.Instance, error)
-
 	// Save saves instance to database.
 	Save(i *instance.Instance) error
 
@@ -85,21 +82,6 @@ func (d *LevelDBInstanceDB) GetAll() ([]*instance.Instance, error) {
 	return instances, iter.Error()
 }
 
-// GetAllByService retrieves all instances of service by service's hash.
-func (d *LevelDBInstanceDB) GetAllByService(serviceHash hash.Hash) ([]*instance.Instance, error) {
-	instances, err := d.GetAll()
-	if err != nil {
-		return nil, err
-	}
-	someInstances := []*instance.Instance{}
-	for _, instance := range instances {
-		if instance.ServiceHash.Equal(serviceHash) {
-			someInstances = append(someInstances, instance)
-		}
-	}
-	return someInstances, nil
-}
-
 // Save saves instance to database.
 func (d *LevelDBInstanceDB) Save(i *instance.Instance) error {
 	if i.Hash.IsZero() {

execution/execution.go

@@ -34,28 +34,28 @@ func (s Status) String() (r string) {
 
 // Execution stores all information about executions.
 type Execution struct {
-	Hash        hash.Hash              `hash:"-"`
-	ParentHash  hash.Hash              `hash:"name:parentHash"`
-	EventID     string                 `hash:"name:eventID"`
-	Status      Status                 `hash:"-"`
-	ServiceHash hash.Hash              `hash:"name:serviceHash"`
-	TaskKey     string                 `hash:"name:taskKey"`
-	Tags        []string               `hash:"name:tags"`
-	Inputs      map[string]interface{} `hash:"name:inputs"`
-	Outputs     map[string]interface{} `hash:"-"`
-	Error       string                 `hash:"-"`
+	Hash         hash.Hash              `hash:"-"`
+	ParentHash   hash.Hash              `hash:"name:parentHash"`
+	EventID      string                 `hash:"name:eventID"`
+	Status       Status                 `hash:"-"`
+	InstanceHash hash.Hash              `hash:"name:instanceHash"`
+	TaskKey      string                 `hash:"name:taskKey"`
+	Tags         []string               `hash:"name:tags"`
+	Inputs       map[string]interface{} `hash:"name:inputs"`
+	Outputs      map[string]interface{} `hash:"-"`
+	Error        string                 `hash:"-"`
 }
 
 // New returns a new execution. It returns an error if inputs are invalid.
-func New(serviceHash, parentHash hash.Hash, eventID, taskKey string, inputs map[string]interface{}, tags []string) *Execution {
+func New(instanceHash, parentHash hash.Hash, eventID, taskKey string, inputs map[string]interface{}, tags []string) *Execution {
 	exec := &Execution{
-		EventID:     eventID,
-		ServiceHash: serviceHash,
-		ParentHash:  parentHash,
-		Inputs:      inputs,
-		TaskKey:     taskKey,
-		Tags:        tags,
-		Status:      Created,
+		EventID:      eventID,
+		InstanceHash: instanceHash,
+		ParentHash:   parentHash,
+		Inputs:       inputs,
+		TaskKey:      taskKey,
+		Tags:         tags,
+		Status:       Created,
 	}
 	exec.Hash = hash.Dump(exec)
 	return exec

execution/execution_test.go

@@ -20,7 +20,7 @@ func TestNewFromService(t *testing.T) {
 
 	execution := New(hash, parentHash, eventID, taskKey, nil, tags)
 	require.NotNil(t, execution)
-	require.Equal(t, hash, execution.ServiceHash)
+	require.Equal(t, hash, execution.InstanceHash)
 	require.Equal(t, parentHash, execution.ParentHash)
 	require.Equal(t, eventID, execution.EventID)
 	require.Equal(t, taskKey, execution.TaskKey)
@@ -67,8 +67,8 @@ func TestStatus(t *testing.T) {
 func TestExecutionHash(t *testing.T) {
 	ids := make(map[string]bool)
 
-	f := func(serviceHash, parentHash []byte, eventID, taskKey, input string, tags []string) bool {
-		e := New(serviceHash, parentHash, eventID, taskKey, map[string]interface{}{"input": input}, tags)
+	f := func(instanceHash, parentHash []byte, eventID, taskKey, input string, tags []string) bool {
+		e := New(instanceHash, parentHash, eventID, taskKey, map[string]interface{}{"input": input}, tags)
 		if ids[string(e.Hash)] {
 			return false
 		}

protobuf/api/execution.proto

@@ -35,8 +35,8 @@ message StreamExecutionRequest{
     // Status to filter executions.
     definition.Status status = 1;
 
-    // Service's hash to filter executions.
-    string serviceHash = 2;
+    // Instance's hash to filter executions.
+    string instanceHash = 2;
   }
 
   // Filter used to filter a stream of executions.

protobuf/api/instance.proto

@@ -53,8 +53,8 @@ message CreateInstanceRequest {
 
 // The response's data for the `Create` API.
 message CreateInstanceResponse {
-  // The instance created.
-  definition.Instance instance = 1;
+  // The instance's hash created.
+  string hash = 1;
 }
 
 // The request's data for the `Delete` API.