Clarify error message on graph updates.

Author: clems4ever

internal/database/mariadb.go

@@ -258,7 +258,7 @@ func hashRelation(relation knowledge.Relation) uint64 {
 func (m *MariaDB) InsertAssets(source string, assets []knowledge.Asset) error {
 	sourceID, err := m.resolveSourceID(source)
 	if err != nil {
-		return fmt.Errorf("Unable to resolve source ID (asset insert): %v", err)
+		return fmt.Errorf("Unable to resolve source ID of source %s for inserting assets: %v", source, err)
 	}
 
 	tx, err := m.db.Begin()
@@ -303,7 +303,7 @@ func (m *MariaDB) InsertAssets(source string, assets []knowledge.Asset) error {
 func (m *MariaDB) InsertRelations(source string, relations []knowledge.Relation) error {
 	sourceID, err := m.resolveSourceID(source)
 	if err != nil {
-		return fmt.Errorf("Unable to resolve source ID (relation insert): %v", err)
+		return fmt.Errorf("Unable to resolve source ID of source %s for inserting relations: %v", source, err)
 	}
 
 	tx, err := m.db.Begin()
@@ -351,7 +351,7 @@ func (m *MariaDB) InsertRelations(source string, relations []knowledge.Relation)
 func (m *MariaDB) RemoveAssets(source string, assets []knowledge.Asset) error {
 	sourceID, err := m.resolveSourceID(source)
 	if err != nil {
-		return fmt.Errorf("Unable to resolve source ID from name %s: %v", source, err)
+		return fmt.Errorf("Unable to resolve source ID of source %s for removing assets: %v", source, err)
 	}
 
 	tx, err := m.db.Begin()
@@ -392,7 +392,7 @@ func (m *MariaDB) RemoveAssets(source string, assets []knowledge.Asset) error {
 func (m *MariaDB) RemoveRelations(source string, relations []knowledge.Relation) error {
 	sourceID, err := m.resolveSourceID(source)
 	if err != nil {
-		return fmt.Errorf("Unable to resolve source ID from name %s: %v", source, err)
+		return fmt.Errorf("Unable to resolve source ID of source %s for removing relations: %v", source, err)
 	}
 
 	tx, err := m.db.Begin()

internal/handlers/handler_update_graph.go

@@ -62,8 +62,8 @@ func PutSchema(registry sources.Registry, graphUpdater *knowledge.GraphUpdater,
 	}, sem)
 }
 
-// PutAsset upsert an asset into the graph of the data source
-func PutAsset(registry sources.Registry, graphUpdater *knowledge.GraphUpdater, sem *semaphore.Weighted) http.HandlerFunc {
+// PutAssets upsert several assets into the graph of the data source
+func PutAssets(registry sources.Registry, graphUpdater *knowledge.GraphUpdater, sem *semaphore.Weighted) http.HandlerFunc {
 	return handleUpdate(registry, func(source string, body io.Reader) error {
 		requestBody := client.PutGraphAssetRequestBody{}
 		if err := json.NewDecoder(body).Decode(&requestBody); err != nil {
@@ -73,14 +73,14 @@ func PutAsset(registry sources.Registry, graphUpdater *knowledge.GraphUpdater, s
 		// TODO(c.michaud): verify compatibility of the schema with graph updates
 		err := graphUpdater.InsertAssets(source, requestBody.Assets)
 		if err != nil {
-			return fmt.Errorf("Unable to insert asset: %v", err)
+			return fmt.Errorf("Unable to insert assets: %v", err)
 		}
 		return nil
 	}, sem)
 }
 
-// PutRelation upsert a relation into the graph of the data source
-func PutRelation(registry sources.Registry, graphUpdater *knowledge.GraphUpdater, sem *semaphore.Weighted) http.HandlerFunc {
+// PutRelations upsert multiple relations into the graph of the data source
+func PutRelations(registry sources.Registry, graphUpdater *knowledge.GraphUpdater, sem *semaphore.Weighted) http.HandlerFunc {
 	return handleUpdate(registry, func(source string, body io.Reader) error {
 		requestBody := client.PutGraphRelationRequestBody{}
 		if err := json.NewDecoder(body).Decode(&requestBody); err != nil {
@@ -96,8 +96,8 @@ func PutRelation(registry sources.Registry, graphUpdater *knowledge.GraphUpdater
 	}, sem)
 }
 
-// DeleteAsset delete an asset from the graph of the data source
-func DeleteAsset(registry sources.Registry, graphUpdater *knowledge.GraphUpdater, sem *semaphore.Weighted) http.HandlerFunc {
+// DeleteAssets delete multiple assets from the graph of the data source
+func DeleteAssets(registry sources.Registry, graphUpdater *knowledge.GraphUpdater, sem *semaphore.Weighted) http.HandlerFunc {
 	return handleUpdate(registry, func(source string, body io.Reader) error {
 		requestBody := client.DeleteGraphAssetRequestBody{}
 		if err := json.NewDecoder(body).Decode(&requestBody); err != nil {
@@ -107,14 +107,14 @@ func DeleteAsset(registry sources.Registry, graphUpdater *knowledge.GraphUpdater
 		// TODO(c.michaud): verify compatibility of the schema with graph updates
 		err := graphUpdater.RemoveAssets(source, requestBody.Assets)
 		if err != nil {
-			return fmt.Errorf("Unable to remove asset: %v", err)
+			return fmt.Errorf("Unable to remove assets: %v", err)
 		}
 		return nil
 	}, sem)
 }
 
-// DeleteRelation upsert a relation into the graph of the data source
-func DeleteRelation(registry sources.Registry, graphUpdater *knowledge.GraphUpdater, sem *semaphore.Weighted) http.HandlerFunc {
+// DeleteRelations remove multiple relations from the graph of the data source
+func DeleteRelations(registry sources.Registry, graphUpdater *knowledge.GraphUpdater, sem *semaphore.Weighted) http.HandlerFunc {
 	return handleUpdate(registry, func(source string, body io.Reader) error {
 		requestBody := client.DeleteGraphRelationRequestBody{}
 		if err := json.NewDecoder(body).Decode(&requestBody); err != nil {

internal/knowledge/graph_updater.go

@@ -50,31 +50,31 @@ func (sl *GraphUpdater) UpdateSchema(source string, sg schema.SchemaGraph) error
 // InsertAssets insert multiple assets in the graph of the data source
 func (sl *GraphUpdater) InsertAssets(source string, assets []Asset) error {
 	if err := sl.graphDB.InsertAssets(source, assets); err != nil {
-		return fmt.Errorf("Unable to insert assets %v from source %s: %v", assets, source, err)
+		return fmt.Errorf("Unable to insert assets from source %s: %v", source, err)
 	}
 	return nil
 }
 
 // InsertRelations insert multiple relations in the graph of the data source
 func (sl *GraphUpdater) InsertRelations(source string, relations []Relation) error {
 	if err := sl.graphDB.InsertRelations(source, relations); err != nil {
-		return fmt.Errorf("Unable to insert relations %v from source %s: %v", relations, source, err)
+		return fmt.Errorf("Unable to insert relations from source %s: %v", source, err)
 	}
 	return nil
 }
 
 // RemoveAssets remove multiple assets from the graph of the data source
 func (sl *GraphUpdater) RemoveAssets(source string, assets []Asset) error {
 	if err := sl.graphDB.RemoveAssets(source, assets); err != nil {
-		return fmt.Errorf("Unable to remove assets %v from source %s: %v", assets, source, err)
+		return fmt.Errorf("Unable to remove assets from source %s: %v", source, err)
 	}
 	return nil
 }
 
 // RemoveRelations remove multiple relations from the graph of the data source
 func (sl *GraphUpdater) RemoveRelations(source string, relations []Relation) error {
 	if err := sl.graphDB.RemoveRelations(source, relations); err != nil {
-		return fmt.Errorf("Unable to remove relation %v from source %s: %v", relations, source, err)
+		return fmt.Errorf("Unable to remove relations from source %s: %v", source, err)
 	}
 	return nil
 }

internal/server/server.go

@@ -219,10 +219,10 @@ func StartServer(listenInterface string,
 	sem := semaphore.NewWeighted(concurrency)
 
 	r.HandleFunc("/api/graph/schema", handlers.PutSchema(sourcesRegistry, graphUpdater, sem)).Methods("PUT")
-	r.HandleFunc("/api/graph/assets", handlers.PutAsset(sourcesRegistry, graphUpdater, sem)).Methods("PUT")
-	r.HandleFunc("/api/graph/assets", handlers.DeleteAsset(sourcesRegistry, graphUpdater, sem)).Methods("DELETE")
-	r.HandleFunc("/api/graph/relations", handlers.PutRelation(sourcesRegistry, graphUpdater, sem)).Methods("PUT")
-	r.HandleFunc("/api/graph/relations", handlers.DeleteRelation(sourcesRegistry, graphUpdater, sem)).Methods("DELETE")
+	r.HandleFunc("/api/graph/assets", handlers.PutAssets(sourcesRegistry, graphUpdater, sem)).Methods("PUT")
+	r.HandleFunc("/api/graph/assets", handlers.DeleteAssets(sourcesRegistry, graphUpdater, sem)).Methods("DELETE")
+	r.HandleFunc("/api/graph/relations", handlers.PutRelations(sourcesRegistry, graphUpdater, sem)).Methods("PUT")
+	r.HandleFunc("/api/graph/relations", handlers.DeleteRelations(sourcesRegistry, graphUpdater, sem)).Methods("DELETE")
 
 	r.HandleFunc("/api/query", postQueryHandler).Methods("POST")
 	r.PathPrefix("/").Handler(http.FileServer(http.Dir("./web/build/")))