diff --git a/backend/inventory/app/server.go b/backend/inventory/app/server.go index 7b208fd42d..419836b677 100644 --- a/backend/inventory/app/server.go +++ b/backend/inventory/app/server.go @@ -22,9 +22,17 @@ func (s *Server) ListEntities(ctx context.Context, req *pb.ListEntitiesRequest) return nil, status.Error(codes.Internal, "could not list entities") } - var result []*pb.Entity - for _, v := range entities { - result = append(result, &pb.Entity{Uri: v}) + var result []*pb.GetEntityReply + for _, entity := range entities { + var facts []*pb.Fact + factTuples, err := s.Storage.GetFacts(entity) + if err != nil { + return nil, status.Error(codes.Internal, fmt.Sprintf("could not get facts for %v", entity)) + } + for key, value := range factTuples { + facts = append(facts, &pb.Fact{Name: key, Value: value}) + } + result = append(result, &pb.GetEntityReply{Entity: &pb.Entity{Uri: entity}, Facts: facts}) } return &pb.ListEntitiesReply{Entities: result}, nil @@ -41,18 +49,20 @@ func (s *Server) CreateEntity(ctx context.Context, req *pb.CreateEntityRequest) // GetEntity returns an inventory Entity with the selected facts func (s *Server) GetEntity(ctx context.Context, req *pb.GetEntityRequest) (*pb.GetEntityReply, error) { var facts []*pb.Fact + entityUri, err := s.Storage.GetEntity(req.GetEntity().GetUri()) if err != nil { return nil, status.Error(codes.Internal, fmt.Sprintf("could not get entity %v", err)) } - for _, factName := range req.GetIncludeFacts() { - value, err := s.Storage.GetFact(entityUri, factName) - if err != nil { - return nil, status.Error(codes.Internal, fmt.Sprintf("could not get fact %v for %v", factName, entityUri)) - } - facts = append(facts, &pb.Fact{Name: factName, Value: value}) + + factTuples, err := s.Storage.GetFacts(entityUri) + if err != nil { + return nil, status.Error(codes.Internal, fmt.Sprintf("could not get facts for %v", entityUri)) } + for key, value := range factTuples { + facts = append(facts, &pb.Fact{Name: key, Value: value}) + } return &pb.GetEntityReply{Entity: &pb.Entity{Uri: entityUri}, Facts: facts}, nil } diff --git a/backend/inventory/app/server_test.go b/backend/inventory/app/server_test.go index 5cb46c06e2..f1ad4b8ff0 100644 --- a/backend/inventory/app/server_test.go +++ b/backend/inventory/app/server_test.go @@ -15,86 +15,65 @@ import ( var entityURI = "boss://test/test" -func TestServerListEntities(t *testing.T) { +func TestServer(t *testing.T) { testStorage := NewTestStorage() defer testStorage.Close() s := Server{Storage: testStorage.Storage} - entity := &pb.Entity{Uri: entityURI} + t.Run("Listing Entities matching prefix", func(t *testing.T) { + entity := &pb.Entity{Uri: entityURI} - _, err := s.CreateEntity(context.Background(), &pb.CreateEntityRequest{Entity: entity}) - if err != nil { - t.Errorf("ServerTest(TestServerListEntities) could not create: %v", err) - } + s.CreateEntity(context.Background(), &pb.CreateEntityRequest{Entity: entity}) + setFactReq := &pb.SetFactRequest{EntityUri: entityURI, Name: "test-name", Value: "test-value"} + s.SetFact(context.Background(), setFactReq) - list, err := s.ListEntities(context.Background(), &pb.ListEntitiesRequest{UriPrefix: ""}) - if err != nil { - t.Errorf("ServerTest(TestServerListEntities) could not list: %v", err) - } - if len(list.GetEntities()) != 1 { - t.Errorf("ServerTest(TestServerListEntities) expected %v items, got %v", 1, len(list.GetEntities())) - } - if list.GetEntities()[0].GetUri() != entityURI { - t.Errorf("ServerTest(TestServerListEntities) expected uri %v, got %v", "boss://test/test", list.GetEntities()[0].GetUri()) - } + list, err := s.ListEntities(context.Background(), &pb.ListEntitiesRequest{UriPrefix: ""}) + if err != nil { + t.Errorf("ServerTest(ListEntities) could not list: %v", err) + } + if len(list.GetEntities()) != 1 { + t.Errorf("ServerTest(ListEntities) expected %v items, got %v", 1, len(list.GetEntities())) + } + if list.GetEntities()[0].GetEntity().GetUri() != entityURI { + t.Errorf("ServerTest(ListEntities) expected uri %v, got %v", "boss://test/test", list.GetEntities()[0].GetEntity().GetUri()) + } + expectedFacts := []*pb.Fact{{Name: "test-name", Value: "test-value"}} + if !reflect.DeepEqual(list.GetEntities()[0].GetFacts(), expectedFacts) { + t.Errorf("ServerTest(ListEntities) got %v, wanted %v", list.GetEntities()[0].GetFacts(), expectedFacts) + } + }) - list, err = s.ListEntities(context.Background(), &pb.ListEntitiesRequest{UriPrefix: "boss://test2"}) - if err != nil { - t.Errorf("ServerTest(TestServerListEntities) could not list: %v", err) - } - if len(list.GetEntities()) != 0 { - t.Errorf("ServerTest(TestServerListEntities) expected %v items, got %v", 0, len(list.GetEntities())) - } -} + t.Run("Listing Entities not matching prefix", func(t *testing.T) { + entity := &pb.Entity{Uri: entityURI} -func TestServerCreateEntity(t *testing.T) { - testStorage := NewTestStorage() - defer testStorage.Close() - s := Server{Storage: testStorage.Storage} - - entity := &pb.Entity{Uri: entityURI} - createReq := &pb.CreateEntityRequest{Entity: entity} - resp, err := s.CreateEntity(context.Background(), createReq) - if err != nil { - t.Errorf("ServerTest(CreateEntity) got unexpected error %v", err) - } - if resp.GetEntity().GetUri() != entity.GetUri() { - t.Errorf("ServerTest(CreateEntity) expected %v, but got %v", entity.GetUri(), resp.GetEntity().GetUri()) - } -} - -func TestServerGetEntity(t *testing.T) { - t.Run("Get entity", func(t *testing.T) { - testStorage := NewTestStorage() - defer testStorage.Close() - s := Server{Storage: testStorage.Storage} + s.CreateEntity(context.Background(), &pb.CreateEntityRequest{Entity: entity}) + list, err := s.ListEntities(context.Background(), &pb.ListEntitiesRequest{UriPrefix: "boss://test2"}) + if err != nil { + t.Errorf("ServerTest(TestServerListEntities) could not list: %v", err) + } + if len(list.GetEntities()) != 0 { + t.Errorf("ServerTest(TestServerListEntities) expected %v items, got %v", 0, len(list.GetEntities())) + } + }) + t.Run("Creating entity", func(t *testing.T) { entity := &pb.Entity{Uri: entityURI} createReq := &pb.CreateEntityRequest{Entity: entity} - s.CreateEntity(context.Background(), createReq) - - req := &pb.GetEntityRequest{Entity: entity} - resp, err := s.GetEntity(context.Background(), req) + resp, err := s.CreateEntity(context.Background(), createReq) if err != nil { - t.Errorf("ServerTest(GetEntity) got unexpected error %v", err) - } - if resp == nil { - t.Errorf("ServerTest(GetEntity) returned nil") + t.Errorf("ServerTest(CreateEntity) got unexpected error %v", err) } if resp.GetEntity().GetUri() != entity.GetUri() { - t.Errorf("ServerTest(GetEntity) got %v, wanted %v", resp.GetEntity().GetUri(), entity.GetUri()) + t.Errorf("ServerTest(CreateEntity) expected %v, but got %v", entity.GetUri(), resp.GetEntity().GetUri()) } }) t.Run("Get entity with included facts", func(t *testing.T) { - testStorage := NewTestStorage() - defer testStorage.Close() - s := Server{Storage: testStorage.Storage} setFactReq := &pb.SetFactRequest{EntityUri: entityURI, Name: "test-name", Value: "test-value"} s.SetFact(context.Background(), setFactReq) entity := &pb.Entity{Uri: entityURI} - req := &pb.GetEntityRequest{Entity: entity, IncludeFacts: []string{"test-name"}} + req := &pb.GetEntityRequest{Entity: entity} resp, err := s.GetEntity(context.Background(), req) if err != nil { @@ -108,14 +87,7 @@ func TestServerGetEntity(t *testing.T) { t.Errorf("ServerTest(GetEntity) got %v, wanted %v", resp.GetFacts(), expectedFacts) } }) -} - -func TestServerSetFactForExistingEntity(t *testing.T) { t.Run("Set fact for existing entity", func(t *testing.T) { - testStorage := NewTestStorage() - defer testStorage.Close() - s := Server{Storage: testStorage.Storage} - entity := &pb.Entity{Uri: entityURI} createReq := &pb.CreateEntityRequest{Entity: entity} s.CreateEntity(context.Background(), createReq) @@ -134,10 +106,6 @@ func TestServerSetFactForExistingEntity(t *testing.T) { }) t.Run("Set fact for non-existing entity", func(t *testing.T) { - testStorage := NewTestStorage() - defer testStorage.Close() - s := Server{Storage: testStorage.Storage} - req := &pb.SetFactRequest{EntityUri: entityURI, Name: "test-name", Value: "test-value"} resp, err := s.SetFact(context.Background(), req) if err != nil { diff --git a/backend/inventory/go.mod b/backend/inventory/go.mod index a7148725b1..7a2e505cf6 100644 --- a/backend/inventory/go.mod +++ b/backend/inventory/go.mod @@ -8,5 +8,8 @@ require ( github.com/golang/protobuf v1.3.3 github.com/spotify/backstage/proto v0.0.0-00010101000000-000000000000 go.etcd.io/bbolt v1.3.3 + golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 // indirect + golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 // indirect google.golang.org/grpc v1.27.0 + honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc // indirect ) diff --git a/backend/inventory/storage/storage.go b/backend/inventory/storage/storage.go index 8b88000fe6..aa91cbc4c2 100644 --- a/backend/inventory/storage/storage.go +++ b/backend/inventory/storage/storage.go @@ -121,3 +121,25 @@ func (s *Storage) GetEntity(entityUri string) (string, error) { return entityUri, nil } + +func (s *Storage) GetFacts(entityUri string) (map[string]string, error) { + facts := make(map[string]string) + + err := s.db.View(func(tx *bbolt.Tx) error { + entityBucket := tx.Bucket([]byte(entityUri)) + if entityBucket == nil { + return fmt.Errorf("bucket '%s' does not exist", entityUri) + } + c := entityBucket.Cursor() + for k, v := c.First(); k != nil; k, v = c.Next() { + facts[string(k)] = string(v) + } + return nil + }) + + if err != nil { + return nil, err + } + + return facts, nil +} diff --git a/backend/proto/inventory/v1/inventory.pb.go b/backend/proto/inventory/v1/inventory.pb.go index 589ed3154f..7eedf84f76 100644 --- a/backend/proto/inventory/v1/inventory.pb.go +++ b/backend/proto/inventory/v1/inventory.pb.go @@ -64,10 +64,10 @@ func (m *ListEntitiesRequest) GetUriPrefix() string { } type ListEntitiesReply struct { - Entities []*Entity `protobuf:"bytes,1,rep,name=entities,proto3" json:"entities,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Entities []*GetEntityReply `protobuf:"bytes,1,rep,name=entities,proto3" json:"entities,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListEntitiesReply) Reset() { *m = ListEntitiesReply{} } @@ -95,7 +95,7 @@ func (m *ListEntitiesReply) XXX_DiscardUnknown() { var xxx_messageInfo_ListEntitiesReply proto.InternalMessageInfo -func (m *ListEntitiesReply) GetEntities() []*Entity { +func (m *ListEntitiesReply) GetEntities() []*GetEntityReply { if m != nil { return m.Entities } @@ -558,36 +558,36 @@ func init() { func init() { proto.RegisterFile("inventory/v1/inventory.proto", fileDescriptor_70be9028e322f9d8) } var fileDescriptor_70be9028e322f9d8 = []byte{ - // 457 bytes of a gzipped FileDescriptorProto + // 459 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x41, 0x8f, 0x93, 0x40, - 0x14, 0x0e, 0x85, 0xad, 0xf2, 0xca, 0x6e, 0x76, 0x67, 0x3d, 0x10, 0xb2, 0x31, 0xcd, 0x68, 0x4c, - 0x0f, 0x86, 0x5d, 0xda, 0x8b, 0xf1, 0xe0, 0xa1, 0x46, 0xd1, 0xc4, 0x83, 0xa1, 0x69, 0x34, 0x5e, - 0x0c, 0xad, 0xd3, 0x66, 0x62, 0x0b, 0x15, 0x06, 0x94, 0xff, 0xe0, 0x4f, 0xf2, 0xc7, 0x99, 0x19, - 0xa6, 0x03, 0xd5, 0x66, 0xa1, 0x69, 0x6f, 0x33, 0xef, 0xcd, 0xf7, 0xbe, 0xef, 0x3d, 0xde, 0x17, - 0xe0, 0x86, 0x46, 0x39, 0x89, 0x58, 0x9c, 0x14, 0xb7, 0xb9, 0x77, 0xab, 0x2e, 0xee, 0x26, 0x89, - 0x59, 0x8c, 0x1e, 0xa7, 0x9b, 0x98, 0xd1, 0x45, 0xe1, 0xce, 0xc2, 0xf9, 0xf7, 0x94, 0x85, 0x4b, - 0xe2, 0x56, 0x4f, 0x72, 0x0f, 0x8f, 0xe0, 0xfa, 0x03, 0x4d, 0xd9, 0x9b, 0x88, 0x51, 0x46, 0x49, - 0x1a, 0x90, 0x1f, 0x19, 0x49, 0x19, 0xba, 0x01, 0x33, 0x4b, 0xe8, 0xc7, 0x84, 0x2c, 0xe8, 0x2f, - 0x5b, 0xeb, 0x6b, 0x03, 0x33, 0xa8, 0x02, 0xf8, 0x13, 0x5c, 0xed, 0x82, 0x36, 0xab, 0x02, 0x8d, - 0xe1, 0x21, 0x91, 0x01, 0x5b, 0xeb, 0xeb, 0x83, 0xde, 0xf0, 0x99, 0x7b, 0x3f, 0xb9, 0x2b, 0x0a, - 0x14, 0x81, 0xc2, 0xe1, 0x9f, 0x70, 0xe9, 0x13, 0x26, 0xc3, 0x52, 0xca, 0x2b, 0xe8, 0x8a, 0x7c, - 0x21, 0x74, 0xb4, 0xaf, 0x2a, 0x51, 0xe8, 0x09, 0x9c, 0xd3, 0x68, 0xbe, 0xca, 0xbe, 0x91, 0xaf, - 0x8b, 0x70, 0xce, 0x52, 0xbb, 0xd3, 0xd7, 0x07, 0x66, 0x60, 0xc9, 0xe0, 0x5b, 0x1e, 0xc3, 0xbf, - 0x35, 0xb8, 0xa8, 0x31, 0xf3, 0x7e, 0x8e, 0xe5, 0x7d, 0x09, 0x67, 0x15, 0x5f, 0x6f, 0xf8, 0xb4, - 0x09, 0xce, 0x85, 0x04, 0x25, 0x04, 0x4f, 0xe1, 0xfa, 0x75, 0x42, 0x42, 0x46, 0x4e, 0x3a, 0x0a, - 0x3c, 0x81, 0xab, 0xdd, 0xb2, 0x27, 0xe8, 0x13, 0x7f, 0x86, 0x8b, 0x09, 0x61, 0x42, 0x7d, 0xb5, - 0x3c, 0x65, 0x6e, 0x9a, 0xd0, 0xed, 0xf2, 0xa8, 0x00, 0x42, 0x60, 0x44, 0xe1, 0x9a, 0xd8, 0x1d, - 0x91, 0x10, 0x67, 0xf4, 0x08, 0xce, 0xf2, 0x70, 0x95, 0x11, 0x5b, 0x17, 0xc1, 0xf2, 0x82, 0xdf, - 0x81, 0xa5, 0x2a, 0x73, 0xa5, 0x2f, 0xc0, 0xe0, 0xe3, 0x91, 0x3a, 0xdb, 0x0d, 0x54, 0x20, 0xf0, - 0x58, 0x7c, 0xdd, 0xa3, 0x34, 0x72, 0x35, 0xfe, 0x69, 0xd4, 0x38, 0xd0, 0x2d, 0x67, 0x88, 0x2e, - 0x41, 0xcf, 0x14, 0x3f, 0x3f, 0xe2, 0x3b, 0x30, 0xf8, 0x4b, 0xa5, 0x40, 0xdb, 0x37, 0xa5, 0x4e, - 0x6d, 0x4a, 0xc3, 0x3f, 0x06, 0x98, 0xef, 0xb7, 0x4c, 0x28, 0x07, 0xab, 0x6e, 0x4d, 0x34, 0x6a, - 0xd2, 0xb5, 0xc7, 0xfd, 0x8e, 0x77, 0x18, 0x88, 0x4f, 0x63, 0x0d, 0xa6, 0xf2, 0x0f, 0xba, 0x6b, - 0xc2, 0xff, 0x6b, 0x72, 0xc7, 0x3d, 0x00, 0xc1, 0xe9, 0x72, 0xb0, 0xea, 0x9b, 0xdc, 0xdc, 0xe6, - 0x1e, 0x3b, 0x35, 0xb7, 0xf9, 0xbf, 0x59, 0x96, 0xf0, 0x40, 0xae, 0x24, 0x6a, 0x94, 0xbc, 0xeb, - 0x0a, 0xe7, 0x79, 0xeb, 0xf7, 0x92, 0xc8, 0x6f, 0x4b, 0xe4, 0x1f, 0x48, 0x54, 0x5f, 0xe3, 0xf1, - 0xf9, 0x97, 0x9e, 0x4a, 0xe6, 0xde, 0xac, 0x2b, 0x7e, 0x1b, 0xa3, 0xbf, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x0f, 0x08, 0x7c, 0x37, 0x56, 0x06, 0x00, 0x00, + 0x14, 0x0e, 0x85, 0xad, 0xf2, 0xe8, 0x6e, 0x76, 0x67, 0x3d, 0x90, 0x66, 0x63, 0x9a, 0xd1, 0x98, + 0x1e, 0x0c, 0x5b, 0xe8, 0xc5, 0x78, 0xf0, 0x50, 0xa3, 0xa8, 0xf1, 0x60, 0x68, 0x9a, 0x18, 0x2f, + 0x0d, 0xad, 0xd3, 0x66, 0x62, 0x0b, 0x15, 0x06, 0x94, 0xff, 0xe0, 0x4f, 0xf2, 0xc7, 0x99, 0x19, + 0xe8, 0x00, 0xb1, 0x59, 0x4a, 0xda, 0x1b, 0xf3, 0xde, 0x7c, 0xef, 0xfb, 0xde, 0xd7, 0xf7, 0xa6, + 0x70, 0x47, 0x83, 0x94, 0x04, 0x2c, 0x8c, 0xb2, 0xfb, 0xd4, 0xbe, 0x97, 0x07, 0x6b, 0x17, 0x85, + 0x2c, 0x44, 0x4f, 0xe3, 0x5d, 0xc8, 0xe8, 0x2a, 0xb3, 0x16, 0xfe, 0xf2, 0x47, 0xcc, 0xfc, 0x35, + 0xb1, 0xca, 0x2b, 0xa9, 0x8d, 0xc7, 0x70, 0xfb, 0x99, 0xc6, 0xec, 0x5d, 0xc0, 0x28, 0xa3, 0x24, + 0xf6, 0xc8, 0xcf, 0x84, 0xc4, 0x0c, 0xdd, 0x81, 0x9e, 0x44, 0xf4, 0x4b, 0x44, 0x56, 0xf4, 0xb7, + 0xa9, 0x0c, 0x94, 0xa1, 0xee, 0x95, 0x01, 0x3c, 0x87, 0x9b, 0x3a, 0x68, 0xb7, 0xc9, 0xd0, 0x27, + 0x78, 0x4c, 0x8a, 0x80, 0xa9, 0x0c, 0xd4, 0xa1, 0xe1, 0x58, 0xd6, 0xc3, 0xe4, 0x96, 0x4b, 0xf2, + 0x1a, 0x99, 0xa8, 0xe0, 0x49, 0x3c, 0xfe, 0x05, 0xd7, 0x95, 0x5c, 0x2e, 0xe9, 0x0d, 0x74, 0x45, + 0x3e, 0x13, 0x7a, 0x0c, 0xe7, 0x45, 0x53, 0xf5, 0x02, 0x5e, 0xa0, 0xd0, 0x33, 0xb8, 0xa4, 0xc1, + 0x72, 0x93, 0x7c, 0x27, 0xf3, 0x95, 0xbf, 0x64, 0xb1, 0xd9, 0x19, 0xa8, 0x43, 0xdd, 0xeb, 0x15, + 0xc1, 0xf7, 0x3c, 0x86, 0xff, 0x28, 0x70, 0x55, 0x57, 0x75, 0x32, 0xef, 0x6b, 0xb8, 0x28, 0xf9, + 0x0c, 0xe7, 0x79, 0x13, 0x9c, 0x0b, 0xf1, 0x72, 0x08, 0x9e, 0xc1, 0xed, 0xdb, 0x88, 0xf8, 0x8c, + 0x9c, 0xd5, 0x0a, 0x3c, 0x85, 0x9b, 0x7a, 0xd9, 0x33, 0xf4, 0x89, 0xbf, 0xc2, 0xd5, 0x94, 0x30, + 0xa1, 0xbe, 0x1c, 0xa2, 0x3c, 0x37, 0x8b, 0xe8, 0x7e, 0x88, 0x64, 0x00, 0x21, 0xd0, 0x02, 0x7f, + 0x4b, 0xcc, 0x8e, 0x48, 0x88, 0x6f, 0xf4, 0x04, 0x2e, 0x52, 0x7f, 0x93, 0x10, 0x53, 0x15, 0xc1, + 0xfc, 0x80, 0x3f, 0x40, 0x4f, 0x56, 0xe6, 0x4a, 0x5f, 0x81, 0xc6, 0xed, 0x29, 0x74, 0x1e, 0x67, + 0xa8, 0x40, 0xe0, 0x89, 0xf8, 0x75, 0x4f, 0xd2, 0xc8, 0xd5, 0xb8, 0xe7, 0x51, 0xd3, 0x87, 0x6e, + 0xee, 0x21, 0xba, 0x06, 0x35, 0x91, 0xfc, 0xfc, 0x13, 0x8f, 0x40, 0xe3, 0x37, 0xa5, 0x02, 0xe5, + 0x90, 0x4b, 0x9d, 0x8a, 0x4b, 0xce, 0x5f, 0x0d, 0xf4, 0x8f, 0x7b, 0x26, 0x94, 0x42, 0xaf, 0xba, + 0xa2, 0x68, 0xdc, 0xa4, 0xeb, 0xc0, 0x2b, 0xd0, 0xb7, 0xdb, 0x81, 0xb8, 0x1b, 0x5b, 0xd0, 0xe5, + 0xfe, 0xa0, 0x51, 0x8b, 0x07, 0x20, 0x67, 0x6c, 0xf9, 0x64, 0xf0, 0x36, 0xab, 0x93, 0xdc, 0xdc, + 0xe6, 0x81, 0x75, 0x6a, 0x6e, 0xf3, 0xff, 0x65, 0x59, 0xc3, 0xa3, 0x62, 0x24, 0x51, 0xa3, 0xe4, + 0xfa, 0x56, 0xf4, 0x5f, 0x1e, 0x7d, 0xbf, 0x20, 0x72, 0x8f, 0x25, 0x72, 0x5b, 0x12, 0x55, 0xc7, + 0x78, 0x72, 0xf9, 0xcd, 0x90, 0xc9, 0xd4, 0x5e, 0x74, 0xc5, 0xdf, 0xc7, 0xf8, 0x5f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x4c, 0xd9, 0x78, 0x44, 0x5e, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/frontend/packages/proto/src/generated/inventory/v1/inventory_pb.d.ts b/frontend/packages/proto/src/generated/inventory/v1/inventory_pb.d.ts index 139857b3e2..65bd236016 100644 --- a/frontend/packages/proto/src/generated/inventory/v1/inventory_pb.d.ts +++ b/frontend/packages/proto/src/generated/inventory/v1/inventory_pb.d.ts @@ -19,10 +19,10 @@ export namespace ListEntitiesRequest { } export class ListEntitiesReply extends jspb.Message { - getEntitiesList(): Array; - setEntitiesList(value: Array): void; + getEntitiesList(): Array; + setEntitiesList(value: Array): void; clearEntitiesList(): void; - addEntities(value?: Entity, index?: number): Entity; + addEntities(value?: GetEntityReply, index?: number): GetEntityReply; serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): ListEntitiesReply.AsObject; @@ -34,7 +34,7 @@ export class ListEntitiesReply extends jspb.Message { export namespace ListEntitiesReply { export type AsObject = { - entitiesList: Array, + entitiesList: Array, } } diff --git a/frontend/packages/proto/src/generated/inventory/v1/inventory_pb.js b/frontend/packages/proto/src/generated/inventory/v1/inventory_pb.js index f3f2c5d8c9..abf0fd6a3b 100644 --- a/frontend/packages/proto/src/generated/inventory/v1/inventory_pb.js +++ b/frontend/packages/proto/src/generated/inventory/v1/inventory_pb.js @@ -442,7 +442,7 @@ proto.spotify.backstage.inventory.v1.ListEntitiesReply.prototype.toObject = func proto.spotify.backstage.inventory.v1.ListEntitiesReply.toObject = function(includeInstance, msg) { var f, obj = { entitiesList: jspb.Message.toObjectList(msg.getEntitiesList(), - proto.spotify.backstage.inventory.v1.Entity.toObject, includeInstance) + proto.spotify.backstage.inventory.v1.GetEntityReply.toObject, includeInstance) }; if (includeInstance) { @@ -480,8 +480,8 @@ proto.spotify.backstage.inventory.v1.ListEntitiesReply.deserializeBinaryFromRead var field = reader.getFieldNumber(); switch (field) { case 1: - var value = new proto.spotify.backstage.inventory.v1.Entity; - reader.readMessage(value,proto.spotify.backstage.inventory.v1.Entity.deserializeBinaryFromReader); + var value = new proto.spotify.backstage.inventory.v1.GetEntityReply; + reader.readMessage(value,proto.spotify.backstage.inventory.v1.GetEntityReply.deserializeBinaryFromReader); msg.addEntities(value); break; default: @@ -518,35 +518,35 @@ proto.spotify.backstage.inventory.v1.ListEntitiesReply.serializeBinaryToWriter = writer.writeRepeatedMessage( 1, f, - proto.spotify.backstage.inventory.v1.Entity.serializeBinaryToWriter + proto.spotify.backstage.inventory.v1.GetEntityReply.serializeBinaryToWriter ); } }; /** - * repeated Entity entities = 1; - * @return {!Array} + * repeated GetEntityReply entities = 1; + * @return {!Array} */ proto.spotify.backstage.inventory.v1.ListEntitiesReply.prototype.getEntitiesList = function() { - return /** @type{!Array} */ ( - jspb.Message.getRepeatedWrapperField(this, proto.spotify.backstage.inventory.v1.Entity, 1)); + return /** @type{!Array} */ ( + jspb.Message.getRepeatedWrapperField(this, proto.spotify.backstage.inventory.v1.GetEntityReply, 1)); }; -/** @param {!Array} value */ +/** @param {!Array} value */ proto.spotify.backstage.inventory.v1.ListEntitiesReply.prototype.setEntitiesList = function(value) { jspb.Message.setRepeatedWrapperField(this, 1, value); }; /** - * @param {!proto.spotify.backstage.inventory.v1.Entity=} opt_value + * @param {!proto.spotify.backstage.inventory.v1.GetEntityReply=} opt_value * @param {number=} opt_index - * @return {!proto.spotify.backstage.inventory.v1.Entity} + * @return {!proto.spotify.backstage.inventory.v1.GetEntityReply} */ proto.spotify.backstage.inventory.v1.ListEntitiesReply.prototype.addEntities = function(opt_value, opt_index) { - return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.spotify.backstage.inventory.v1.Entity, opt_index); + return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.spotify.backstage.inventory.v1.GetEntityReply, opt_index); }; diff --git a/proto/inventory/v1/inventory.proto b/proto/inventory/v1/inventory.proto index c8aca22c2b..eaf58bb61a 100644 --- a/proto/inventory/v1/inventory.proto +++ b/proto/inventory/v1/inventory.proto @@ -17,7 +17,7 @@ message ListEntitiesRequest { } message ListEntitiesReply { - repeated Entity entities = 1; + repeated GetEntityReply entities = 1; } message GetEntityRequest {