Add more endpoints

- Added AddNode and SetDependency to the Graph service

Signed-off-by: neilnaveen <[email protected]>

api/v1/service.go

@@ -89,6 +89,34 @@ func (s *Service) GetNodesByGlob(ctx context.Context, req *connect.Request[servi
 	return connect.NewResponse(&service.GetNodesByGlobResponse{Nodes: serviceNodes}), nil
 }
 
+func (s *Service) AddNode(ctx context.Context, req *connect.Request[service.AddNodeRequest]) (*connect.Response[service.AddNodeResponse], error) {
+	resultNode, err := graph.AddNode(s.storage, req.Msg.Node.Type, req.Msg.Node.Metadata, req.Msg.Node.Name)
+	if err != nil {
+		return nil, err
+	}
+	serviceNode, err := NodeToServiceNode(resultNode)
+	if err != nil {
+		return nil, err
+	}
+	return connect.NewResponse(&service.AddNodeResponse{Node: serviceNode}), nil
+}
+
+func (s *Service) SetDependency(ctx context.Context, req *connect.Request[service.SetDependencyRequest]) (*connect.Response[emptypb.Empty], error) {
+	fromNode, err := s.storage.GetNode(req.Msg.NodeId)
+	if err != nil {
+		return nil, err
+	}
+	toNode, err := s.storage.GetNode(req.Msg.DependencyID)
+	if err != nil {
+		return nil, err
+	}
+	err = fromNode.SetDependency(s.storage, toNode)
+	if err != nil {
+		return nil, err
+	}
+	return connect.NewResponse(&emptypb.Empty{}), nil
+}
+
 func (s *Service) Cache(ctx context.Context, req *connect.Request[emptypb.Empty]) (*connect.Response[emptypb.Empty], error) {
 	err := graph.Cache(s.storage)
 	if err != nil {

api/v1/service.proto

@@ -64,6 +64,19 @@ message GetNodesByGlobResponse {
   repeated Node nodes = 1;
 }
 
+message AddNodeRequest {
+  Node node = 1;
+}
+
+message AddNodeResponse {
+  Node node = 1;
+}
+
+message SetDependencyRequest {
+  uint32 nodeId = 1;
+  uint32 dependencyID = 2;
+}
+
 message IngestSBOMRequest {
   bytes sbom = 1;
 }
@@ -98,6 +111,8 @@ service GraphService {
   rpc GetNode(GetNodeRequest) returns (GetNodeResponse) {}
   rpc GetNodesByGlob(GetNodesByGlobRequest) returns (GetNodesByGlobResponse) {}
   rpc GetNodeByName(GetNodeByNameRequest) returns (GetNodeByNameResponse) {}
+  rpc AddNode(AddNodeRequest) returns (AddNodeResponse) {}
+  rpc SetDependency(SetDependencyRequest) returns (google.protobuf.Empty) {}
 }
 
 service IngestService {

api/v1/service_test.go

@@ -186,6 +186,45 @@ func TestIngestScorecard(t *testing.T) {
 	require.NoError(t, err)
 }
 
+func TestAddNode(t *testing.T) {
+	s := setupService()
+	addNodeReq := connect.NewRequest(&service.AddNodeRequest{
+		Node: &service.Node{Name: "test_node", Type: "type1"},
+	})
+	_, err := s.AddNode(context.Background(), addNodeReq)
+	require.NoError(t, err)
+	getNodeReq := connect.NewRequest(&service.GetNodeByNameRequest{Name: "test_node"})
+	resp, err := s.GetNodeByName(context.Background(), getNodeReq)
+	require.NoError(t, err)
+	assert.NotNil(t, resp.Msg.Node)
+	assert.Equal(t, "test_node", resp.Msg.Node.Name)
+}
+
+func TestSetDependency(t *testing.T) {
+	s := setupService()
+	addNodeReq := connect.NewRequest(&service.AddNodeRequest{
+		Node: &service.Node{Name: "test_node"},
+	})
+	node1, err := s.AddNode(context.Background(), addNodeReq)
+	require.NoError(t, err)
+	addNodeReq2 := connect.NewRequest(&service.AddNodeRequest{
+		Node: &service.Node{Name: "test_node2"},
+	})
+	node2, err := s.AddNode(context.Background(), addNodeReq2)
+	require.NoError(t, err)
+	setDependencyReq := connect.NewRequest(&service.SetDependencyRequest{
+		NodeId:       node1.Msg.Node.Id,
+		DependencyID: node2.Msg.Node.Id,
+	})
+	_, err = s.SetDependency(context.Background(), setDependencyReq)
+	require.NoError(t, err)
+	getNodeReq := connect.NewRequest(&service.GetNodeByNameRequest{Name: "test_node"})
+	resp, err := s.GetNodeByName(context.Background(), getNodeReq)
+	require.NoError(t, err)
+	assert.NotNil(t, resp.Msg.Node)
+	assert.Equal(t, resp.Msg.Node.Dependencies[0], node2.Msg.Node.Id)
+}
+
 func TestHealthCheck(t *testing.T) {
 	s := setupService()
 	req := connect.NewRequest(&emptypb.Empty{})

cmd/query/getMetadata/getMetadata_test.go

@@ -12,6 +12,7 @@ import (
 	apiv1 "github.com/bitbomdev/minefield/gen/api/v1"
 	"github.com/spf13/cobra"
 	"github.com/zeebo/assert"
+	"google.golang.org/protobuf/types/known/emptypb"
 )
 
 func TestFormatTable(t *testing.T) {
@@ -48,6 +49,8 @@ type mockGraphServiceClient struct {
 	GetNodesByGlobFunc func(ctx context.Context, req *connect.Request[apiv1.GetNodesByGlobRequest]) (*connect.Response[apiv1.GetNodesByGlobResponse], error)
 	GetNodeFunc        func(ctx context.Context, req *connect.Request[apiv1.GetNodeRequest]) (*connect.Response[apiv1.GetNodeResponse], error)
 	GetNodeByNameFunc  func(ctx context.Context, req *connect.Request[apiv1.GetNodeByNameRequest]) (*connect.Response[apiv1.GetNodeByNameResponse], error)
+	AddNodeFunc        func(ctx context.Context, req *connect.Request[apiv1.AddNodeRequest]) (*connect.Response[apiv1.AddNodeResponse], error)
+	SetDependencyFunc  func(ctx context.Context, req *connect.Request[apiv1.SetDependencyRequest]) (*connect.Response[emptypb.Empty], error)
 }
 
 func (m *mockGraphServiceClient) GetNodesByGlob(ctx context.Context, req *connect.Request[apiv1.GetNodesByGlobRequest]) (*connect.Response[apiv1.GetNodesByGlobResponse], error) {
@@ -62,6 +65,14 @@ func (m *mockGraphServiceClient) GetNodeByName(ctx context.Context, req *connect
 	return m.GetNodeByNameFunc(ctx, req)
 }
 
+func (m *mockGraphServiceClient) AddNode(ctx context.Context, req *connect.Request[apiv1.AddNodeRequest]) (*connect.Response[apiv1.AddNodeResponse], error) {
+	return m.AddNodeFunc(ctx, req)
+}
+
+func (m *mockGraphServiceClient) SetDependency(ctx context.Context, req *connect.Request[apiv1.SetDependencyRequest]) (*connect.Response[emptypb.Empty], error) {
+	return m.SetDependencyFunc(ctx, req)
+}
+
 func TestRun(t *testing.T) {
 	tests := []struct {
 		name                string

cmd/query/globsearch/globsearch_test.go

@@ -15,6 +15,7 @@ import (
 	apiv1 "github.com/bitbomdev/minefield/gen/api/v1"
 	"github.com/spf13/cobra"
 	"github.com/zeebo/assert"
+	"google.golang.org/protobuf/types/known/emptypb"
 )
 
 func TestFormatTable(t *testing.T) {
@@ -163,6 +164,8 @@ type mockGraphServiceClient struct {
 	GetNodesByGlobFunc func(ctx context.Context, req *connect.Request[apiv1.GetNodesByGlobRequest]) (*connect.Response[apiv1.GetNodesByGlobResponse], error)
 	GetNodeFunc        func(ctx context.Context, req *connect.Request[apiv1.GetNodeRequest]) (*connect.Response[apiv1.GetNodeResponse], error)
 	GetNodeByNameFunc  func(ctx context.Context, req *connect.Request[apiv1.GetNodeByNameRequest]) (*connect.Response[apiv1.GetNodeByNameResponse], error)
+	SetDependencyFunc  func(ctx context.Context, req *connect.Request[apiv1.SetDependencyRequest]) (*connect.Response[emptypb.Empty], error)
+	AddNodeFunc        func(ctx context.Context, req *connect.Request[apiv1.AddNodeRequest]) (*connect.Response[apiv1.AddNodeResponse], error)
 }
 
 func (m *mockGraphServiceClient) GetNodesByGlob(ctx context.Context, req *connect.Request[apiv1.GetNodesByGlobRequest]) (*connect.Response[apiv1.GetNodesByGlobResponse], error) {
@@ -177,6 +180,13 @@ func (m *mockGraphServiceClient) GetNodeByName(ctx context.Context, req *connect
 	return m.GetNodeByNameFunc(ctx, req)
 }
 
+func (m *mockGraphServiceClient) AddNode(ctx context.Context, req *connect.Request[apiv1.AddNodeRequest]) (*connect.Response[apiv1.AddNodeResponse], error) {
+	return m.AddNodeFunc(ctx, req)
+}
+
+func (m *mockGraphServiceClient) SetDependency(ctx context.Context, req *connect.Request[apiv1.SetDependencyRequest]) (*connect.Response[emptypb.Empty], error) {
+	return m.SetDependencyFunc(ctx, req)
+}
 func TestRun(t *testing.T) {
 	tests := []struct {
 		name                string