@lansweeper/data-platform-outbound-grpc 0.1.11 → 0.1.13

package/generated-go/outbound_grpc.pb.go

@@ -26,8 +26,9 @@ import (
 const _ = grpc.SupportPackageIsVersion7
 
 const (
-	DataCoreOutboundService_GetEntity_FullMethodName    = "/com.lansweeper.dp.outbound.v1.DataCoreOutboundService/GetEntity"
-	DataCoreOutboundService_ListEntities_FullMethodName = "/com.lansweeper.dp.outbound.v1.DataCoreOutboundService/ListEntities"
+	DataCoreOutboundService_GetEntity_FullMethodName     = "/com.lansweeper.dp.outbound.v1.DataCoreOutboundService/GetEntity"
+	DataCoreOutboundService_ListEntities_FullMethodName  = "/com.lansweeper.dp.outbound.v1.DataCoreOutboundService/ListEntities"
+	DataCoreOutboundService_CatalogLookup_FullMethodName = "/com.lansweeper.dp.outbound.v1.DataCoreOutboundService/CatalogLookup"
 )
 
 // DataCoreOutboundServiceClient is the client API for DataCoreOutboundService service.
@@ -38,6 +39,8 @@ type DataCoreOutboundServiceClient interface {
 	GetEntity(ctx context.Context, in *GetEntityRequest, opts ...grpc.CallOption) (*GetEntityResponse, error)
 	// lists entities for a site or site/type
 	ListEntities(ctx context.Context, in *ListEntityRequest, opts ...grpc.CallOption) (DataCoreOutboundService_ListEntitiesClient, error)
+	// Retrieve a single entity by site/inst-id/type/id
+	CatalogLookup(ctx context.Context, in *CatalogLookupRequest, opts ...grpc.CallOption) (*CatalogLookupResponse, error)
 }
 
 type dataCoreOutboundServiceClient struct {
@@ -89,6 +92,15 @@ func (x *dataCoreOutboundServiceListEntitiesClient) Recv() (*ListEntityResponse,
 	return m, nil
 }
 
+func (c *dataCoreOutboundServiceClient) CatalogLookup(ctx context.Context, in *CatalogLookupRequest, opts ...grpc.CallOption) (*CatalogLookupResponse, error) {
+	out := new(CatalogLookupResponse)
+	err := c.cc.Invoke(ctx, DataCoreOutboundService_CatalogLookup_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // DataCoreOutboundServiceServer is the server API for DataCoreOutboundService service.
 // All implementations must embed UnimplementedDataCoreOutboundServiceServer
 // for forward compatibility
@@ -97,6 +109,8 @@ type DataCoreOutboundServiceServer interface {
 	GetEntity(context.Context, *GetEntityRequest) (*GetEntityResponse, error)
 	// lists entities for a site or site/type
 	ListEntities(*ListEntityRequest, DataCoreOutboundService_ListEntitiesServer) error
+	// Retrieve a single entity by site/inst-id/type/id
+	CatalogLookup(context.Context, *CatalogLookupRequest) (*CatalogLookupResponse, error)
 	mustEmbedUnimplementedDataCoreOutboundServiceServer()
 }
 
@@ -110,6 +124,9 @@ func (UnimplementedDataCoreOutboundServiceServer) GetEntity(context.Context, *Ge
 func (UnimplementedDataCoreOutboundServiceServer) ListEntities(*ListEntityRequest, DataCoreOutboundService_ListEntitiesServer) error {
 	return status.Errorf(codes.Unimplemented, "method ListEntities not implemented")
 }
+func (UnimplementedDataCoreOutboundServiceServer) CatalogLookup(context.Context, *CatalogLookupRequest) (*CatalogLookupResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CatalogLookup not implemented")
+}
 func (UnimplementedDataCoreOutboundServiceServer) mustEmbedUnimplementedDataCoreOutboundServiceServer() {
 }
 
@@ -163,6 +180,24 @@ func (x *dataCoreOutboundServiceListEntitiesServer) Send(m *ListEntityResponse)
 	return x.ServerStream.SendMsg(m)
 }
 
+func _DataCoreOutboundService_CatalogLookup_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CatalogLookupRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DataCoreOutboundServiceServer).CatalogLookup(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: DataCoreOutboundService_CatalogLookup_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DataCoreOutboundServiceServer).CatalogLookup(ctx, req.(*CatalogLookupRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // DataCoreOutboundService_ServiceDesc is the grpc.ServiceDesc for DataCoreOutboundService service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -174,6 +209,10 @@ var DataCoreOutboundService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "GetEntity",
 			Handler:    _DataCoreOutboundService_GetEntity_Handler,
 		},
+		{
+			MethodName: "CatalogLookup",
+			Handler:    _DataCoreOutboundService_CatalogLookup_Handler,
+		},
 	},
 	Streams: []grpc.StreamDesc{
 		{

package/java.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.10",
+  "version": "0.1.12",
   "package": "com.lansweeper.dp.outbound.v1",
   "service": true
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lansweeper/data-platform-outbound-grpc",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Data Platform Outbound gRPC",
   "main": "gen-proto/index.js",
   "types": "gen-proto/index.d.ts",
@@ -9,5 +9,5 @@
     "@grpc/grpc-js": "^1.5.1",
     "google-protobuf": "^3.17.0"
   },
-  "gitHead": "65d1815f27b4535236bbb56aa8f913bcc5e3acbb"
+  "gitHead": "04c17bf03534723b067248f0b76860ce75084e08"
 }

package/proto/outbound.proto

@@ -28,6 +28,8 @@ service DataCoreOutboundService {
   // lists entities for a site or site/type
   rpc ListEntities(ListEntityRequest) returns (stream ListEntityResponse) {}
 
+  // Retrieve a single entity by site/inst-id/type/id
+  rpc CatalogLookup (CatalogLookupRequest) returns (CatalogLookupResponse) {}
 }
 
 /**
@@ -55,6 +57,24 @@ message ListEntityResponse {
   repeated Entity related = 2;
 }
 
+message CatalogLookupRequest {
+  repeated int64 brand_id = 1;
+  repeated int64 model_id = 2;
+  repeated int64 os_id = 3;
+  repeated int64 sw_id = 4;
+  repeated int64 monitor_id = 5;
+
+  optional bool only_requested = 10; // false by default: to avoid to get full path
+}
+
+message CatalogLookupResponse {
+  repeated CatalogBrand brand = 1;
+  repeated CatalogModel model = 2;
+  repeated CatalogOs os = 3;
+  repeated CatalogSoftware sw = 4;
+  repeated CatalogMonitor monitor = 5;
+}
+
 // ----- Data Part ------
 
 message EntityPath {
@@ -106,6 +126,8 @@ message Asset {
 message AssetType {
   // Lansweeper Asset Type. Full list available here: /lansweeperapis/packages/model/masterData/content/masterData.json
   string ls_name = 1;
+  // Lansweeper type ID
+  int32 ls_id = 3;
   // Fing Type
   optional string fing_type = 2;
 }
@@ -126,9 +148,16 @@ message CoreFields {
 
 message HardwareInfo {
   optional int64 type_id = 1;
+
+  // catalog id of: CatalogBrand
   optional int64 make_id = 2;
+
+  // catalog id of: CatalogModel
   optional int64 model_id = 3;
+
+  // catalog id of: CatalogModel
   optional int64 family_id = 4;
+
   optional bool is_family = 6;
   optional string serial = 7;
   optional string type_name = 10;
@@ -139,10 +168,6 @@ message HardwareInfo {
   optional string cpe = 21;
   optional int32 rank = 20;
 
-  optional CatalogBrand catalog_brand = 22;
-  optional CatalogModel catalog_model = 23;
-  optional CatalogModel catalog_family = 25;
-
   optional RawHardwareInfo raw = 24;
 }
 
@@ -154,8 +179,12 @@ message RawHardwareInfo {
 }
 
 message OperatingSystemInfo {
+  // catalog id of: CatalogOs
   optional int64 id = 1;
+
+  // catalog id of: CatalogBrand
   optional int64 make_id = 11;
+
   optional string name = 2;
   optional string version = 3;
   optional string build = 4;
@@ -167,9 +196,6 @@ message OperatingSystemInfo {
 
   optional int32 rank = 8;
 
-  optional CatalogBrand catalog_brand = 9;
-  optional CatalogOs catalog_os = 10;
-
   oneof raw {
     WindowsRawOperatingSystemInfo windows = 32;
   }
@@ -199,13 +225,17 @@ message MonitorInventory {
 
 /* Monitor definition: normalized and with link to raw */
 message Monitor {
+  // catalog id of: CatalogMonitor
+  optional int64 id = 1;
 
-  string model = 1;
-  optional string serial_number = 2;
-  google.protobuf.Timestamp manufacturer_date = 3;
+  // catalog id of: CatalogBrand
+  optional int64 make_id = 2;
 
-  optional CatalogBrand catalog_brand = 10;
-  optional CatalogMonitor catalog_monitor = 11;
+  string make_name = 3;
+  string model_name = 4;
+
+  optional string serial_number = 5;
+  google.protobuf.Timestamp manufacturer_date = 6;
 
   oneof raw {
     WindowsRawMonitorInfo windows = 20;
@@ -235,8 +265,14 @@ message Software {
   optional int32 rank = 1;
   optional int64 type_id = 2;
   optional int64 cat_id = 3;
+
+  // catalog id of: CatalogBrand
   optional int64 make_id = 4;
+
+  // catalog id of: CatalogSoftware
   optional int64 sw_id = 5;
+
+  // catalog id of: CatalogSoftware
   optional int64 parent_id = 6;
 
   optional string type_name = 7;
@@ -252,10 +288,6 @@ message Software {
 
   optional string cpe = 15;
 
-  optional CatalogBrand catalog_brand = 22;
-  optional CatalogSoftware catalog_software = 16;
-  optional CatalogSoftware catalog_latest = 23;
-
   RawSoftware raw = 17;
   optional string raw_hash = 18; // optional raw hash of SW
   optional string nre_hash = 19; // optional NRE hash of SW