fix: get returns sql.ErrNoRows when hardware not found to avoid 'Unkn…

…own desc = unexpected end of JSON input' error

Signed-off-by: Kelly Deng <kelly@packet.com>

db/db.go

@@ -102,18 +102,11 @@ func get(ctx context.Context, db *sql.DB, query string, args ...interface{}) (st
 
 	buf := []byte{}
 	err := row.Scan(&buf)
-	if err == nil {
-		return string(buf), nil
-	}
-
-	if err != sql.ErrNoRows {
-		err = errors.Wrap(err, "SELECT")
+	if err != nil {
 		logger.Error(err)
-	} else {
-		err = nil
+		return "", errors.Wrap(err, "SELECT")
 	}
-
-	return "", err
+	return string(buf), nil
 }
 
 // buildGetCondition builds a where condition string in the format "column_name = 'field_value' AND"

db/workflow.go

@@ -40,7 +40,7 @@ func (d TinkDB) CreateWorkflow(ctx context.Context, wf Workflow, data string, id
 
 	err = insertActionList(ctx, d.instance, data, id, tx)
 	if err != nil {
-		return errors.Wrap(err, "Failed to insert in workflow_state")
+		return errors.Wrap(err, "failed to insert in workflow_state")
 
 	}
 	err = insertInWorkflow(ctx, d.instance, wf, tx)
@@ -109,9 +109,10 @@ func insertActionList(ctx context.Context, db *sql.DB, yamlData string, id uuid.
 
 		workerID, err := getWorkerID(ctx, db, task.WorkerAddr)
 		if err != nil {
+			if errors.Cause(err) == sql.ErrNoRows {
+				return errors.Wrapf(err, "hardware %s not found", task.WorkerAddr)
+			}
 			return err
-		} else if workerID == "" {
-			return fmt.Errorf("hardware mentioned with reference %s not found", task.WorkerAddr)
 		}
 		workerUID, err := uuid.Parse(workerID)
 		if err != nil {

grpc-server/workflow.go

@@ -69,8 +69,9 @@ func (s *server) CreateWorkflow(ctx context.Context, in *workflow.CreateRequest)
 		if pqErr := db.Error(err); pqErr != nil {
 			l = l.With("detail", pqErr.Detail, "where", pqErr.Where)
 		}
-		l.Error(err)
-		return &workflow.CreateResponse{}, err
+		e := errors.Wrap(err, "failed to create workflow")
+		l.Error(e)
+		return &workflow.CreateResponse{}, e
 	}
 
 	l := logger.With("workflowID", id.String())