From 0c73515b5f5cff1dc197f0f272c3c1f79e251c1c Mon Sep 17 00:00:00 2001 From: Agustin Isasmendi Date: Mon, 10 Mar 2025 12:33:05 +0100 Subject: [PATCH 1/9] feat: SP-2140 define new methods for transitive dependencies --- .../v2/scanoss-dependencies.proto | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto index d965da2..c9e1192 100644 --- a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto +++ b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto @@ -78,6 +78,14 @@ service Dependencies { body: "*" }; }; + + rpc GetTransitiveDependencies(TransitiveDependencyRequest) returns(DependencyResponse) { + option (google.api.http) = { + post: "/api/v2/dependencies/transitive" + body: "*" + }; + }; + } /* @@ -134,4 +142,30 @@ message DependencyResponse { repeated Files files = 1; // Response status (required?) scanoss.api.common.v2.StatusResponse status = 2; +} + +/* + * Transitive dependency request data (JSON payload) + */ + +message TransitiveDependencyRequest { + string ecosystem = 1; + // List of Purls from the same ecosystem + scanoss.api.common.v2.PurlRequest purls = 2; + // Depth to go when searching dependencies + int32 depth = 3; +} + +/* + * Transitive dependency response data (JSON payload) + */ +message TransitiveDependencyResponse { + message Dependencies { + string purl = 2; + string version = 3; + } + // Dependency response details + repeated Dependencies dependencies = 1; + // Response status (required?) + scanoss.api.common.v2.StatusResponse status = 2; } \ No newline at end of file From 63c3dc3fa469fb88cef009745b723fc8650ff512 Mon Sep 17 00:00:00 2001 From: Agustin Isasmendi Date: Mon, 10 Mar 2025 12:33:05 +0100 Subject: [PATCH 2/9] feat: SP-2140 define new methods for transitive dependencies --- .../v2/scanoss-dependencies.proto | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto index d965da2..c9e1192 100644 --- a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto +++ b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto @@ -78,6 +78,14 @@ service Dependencies { body: "*" }; }; + + rpc GetTransitiveDependencies(TransitiveDependencyRequest) returns(DependencyResponse) { + option (google.api.http) = { + post: "/api/v2/dependencies/transitive" + body: "*" + }; + }; + } /* @@ -134,4 +142,30 @@ message DependencyResponse { repeated Files files = 1; // Response status (required?) scanoss.api.common.v2.StatusResponse status = 2; +} + +/* + * Transitive dependency request data (JSON payload) + */ + +message TransitiveDependencyRequest { + string ecosystem = 1; + // List of Purls from the same ecosystem + scanoss.api.common.v2.PurlRequest purls = 2; + // Depth to go when searching dependencies + int32 depth = 3; +} + +/* + * Transitive dependency response data (JSON payload) + */ +message TransitiveDependencyResponse { + message Dependencies { + string purl = 2; + string version = 3; + } + // Dependency response details + repeated Dependencies dependencies = 1; + // Response status (required?) + scanoss.api.common.v2.StatusResponse status = 2; } \ No newline at end of file From f942dbe8adbd5fe96ccbfe3f253b1c875b13e574 Mon Sep 17 00:00:00 2001 From: Agustin Groh Date: Tue, 11 Mar 2025 07:56:47 -0300 Subject: [PATCH 3/9] chore: Creates transitive dependencies stub --- .../scanoss-dependencies_grpc.pb.go | 79 ++++++++-- .../v2/scanoss-dependencies.swagger.json | 135 ++++++++++++++---- 2 files changed, 175 insertions(+), 39 deletions(-) diff --git a/api/dependenciesv2/scanoss-dependencies_grpc.pb.go b/api/dependenciesv2/scanoss-dependencies_grpc.pb.go index e5c5039..c81fe3e 100644 --- a/api/dependenciesv2/scanoss-dependencies_grpc.pb.go +++ b/api/dependenciesv2/scanoss-dependencies_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.29.3 // source: scanoss/api/dependencies/v2/scanoss-dependencies.proto package dependenciesv2 @@ -43,22 +43,26 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( - Dependencies_Echo_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/Echo" - Dependencies_GetDependencies_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/GetDependencies" + Dependencies_Echo_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/Echo" + Dependencies_GetDependencies_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/GetDependencies" + Dependencies_GetTransitiveDependencies_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/GetTransitiveDependencies" ) // DependenciesClient is the client API for Dependencies service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +// +// Expose all of the SCANOSS Dependency RPCs here type DependenciesClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) // Get dependency details GetDependencies(ctx context.Context, in *DependencyRequest, opts ...grpc.CallOption) (*DependencyResponse, error) + GetTransitiveDependencies(ctx context.Context, in *TransitiveDependencyRequest, opts ...grpc.CallOption) (*DependencyResponse, error) } type dependenciesClient struct { @@ -70,8 +74,9 @@ func NewDependenciesClient(cc grpc.ClientConnInterface) DependenciesClient { } func (c *dependenciesClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Dependencies_Echo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Dependencies_Echo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -79,8 +84,19 @@ func (c *dependenciesClient) Echo(ctx context.Context, in *commonv2.EchoRequest, } func (c *dependenciesClient) GetDependencies(ctx context.Context, in *DependencyRequest, opts ...grpc.CallOption) (*DependencyResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(DependencyResponse) + err := c.cc.Invoke(ctx, Dependencies_GetDependencies_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *dependenciesClient) GetTransitiveDependencies(ctx context.Context, in *TransitiveDependencyRequest, opts ...grpc.CallOption) (*DependencyResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DependencyResponse) - err := c.cc.Invoke(ctx, Dependencies_GetDependencies_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Dependencies_GetTransitiveDependencies_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -89,18 +105,24 @@ func (c *dependenciesClient) GetDependencies(ctx context.Context, in *Dependency // DependenciesServer is the server API for Dependencies service. // All implementations must embed UnimplementedDependenciesServer -// for forward compatibility +// for forward compatibility. +// +// Expose all of the SCANOSS Dependency RPCs here type DependenciesServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) // Get dependency details GetDependencies(context.Context, *DependencyRequest) (*DependencyResponse, error) + GetTransitiveDependencies(context.Context, *TransitiveDependencyRequest) (*DependencyResponse, error) mustEmbedUnimplementedDependenciesServer() } -// UnimplementedDependenciesServer must be embedded to have forward compatible implementations. -type UnimplementedDependenciesServer struct { -} +// UnimplementedDependenciesServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedDependenciesServer struct{} func (UnimplementedDependenciesServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -108,7 +130,11 @@ func (UnimplementedDependenciesServer) Echo(context.Context, *commonv2.EchoReque func (UnimplementedDependenciesServer) GetDependencies(context.Context, *DependencyRequest) (*DependencyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetDependencies not implemented") } +func (UnimplementedDependenciesServer) GetTransitiveDependencies(context.Context, *TransitiveDependencyRequest) (*DependencyResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetTransitiveDependencies not implemented") +} func (UnimplementedDependenciesServer) mustEmbedUnimplementedDependenciesServer() {} +func (UnimplementedDependenciesServer) testEmbeddedByValue() {} // UnsafeDependenciesServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to DependenciesServer will @@ -118,6 +144,13 @@ type UnsafeDependenciesServer interface { } func RegisterDependenciesServer(s grpc.ServiceRegistrar, srv DependenciesServer) { + // If the following call pancis, it indicates UnimplementedDependenciesServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Dependencies_ServiceDesc, srv) } @@ -157,6 +190,24 @@ func _Dependencies_GetDependencies_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } +func _Dependencies_GetTransitiveDependencies_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(TransitiveDependencyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(DependenciesServer).GetTransitiveDependencies(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Dependencies_GetTransitiveDependencies_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(DependenciesServer).GetTransitiveDependencies(ctx, req.(*TransitiveDependencyRequest)) + } + return interceptor(ctx, in, info, handler) +} + // Dependencies_ServiceDesc is the grpc.ServiceDesc for Dependencies service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -172,6 +223,10 @@ var Dependencies_ServiceDesc = grpc.ServiceDesc{ MethodName: "GetDependencies", Handler: _Dependencies_GetDependencies_Handler, }, + { + MethodName: "GetTransitiveDependencies", + Handler: _Dependencies_GetTransitiveDependencies_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "scanoss/api/dependencies/v2/scanoss-dependencies.proto", diff --git a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json index 85b24c0..3608bd0 100644 --- a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json +++ b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json @@ -98,35 +98,48 @@ "Dependencies" ] } - } - }, - "definitions": { - "DependencyResponseDependencies": { - "type": "object", - "properties": { - "component": { - "type": "string" - }, - "purl": { - "type": "string" - }, - "version": { - "type": "string" - }, - "licenses": { - "type": "array", - "items": { - "$ref": "#/definitions/DependencyResponseLicenses" + }, + "/api/v2/dependencies/transitive": { + "post": { + "operationId": "Dependencies_GetTransitiveDependencies", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/v2DependencyResponse" + } + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "type": "string", + "format": "string" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, - "url": { - "type": "string" - }, - "comment": { - "type": "string" - } + "parameters": [ + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/v2TransitiveDependencyRequest" + } + } + ], + "tags": [ + "Dependencies" + ] } - }, + } + }, + "definitions": { "DependencyResponseLicenses": { "type": "object", "properties": { @@ -246,6 +259,32 @@ }, "title": "Dependency response data (JSON payload)" }, + "v2DependencyResponseDependencies": { + "type": "object", + "properties": { + "component": { + "type": "string" + }, + "purl": { + "type": "string" + }, + "version": { + "type": "string" + }, + "licenses": { + "type": "array", + "items": { + "$ref": "#/definitions/DependencyResponseLicenses" + } + }, + "url": { + "type": "string" + }, + "comment": { + "type": "string" + } + } + }, "v2DependencyResponseFiles": { "type": "object", "properties": { @@ -261,7 +300,7 @@ "dependencies": { "type": "array", "items": { - "$ref": "#/definitions/DependencyResponseDependencies" + "$ref": "#/definitions/v2DependencyResponseDependencies" } } } @@ -284,6 +323,31 @@ }, "title": "Echo Message Response" }, + "v2PurlRequest": { + "type": "object", + "properties": { + "purls": { + "type": "array", + "items": { + "$ref": "#/definitions/v2PurlRequestPurls" + }, + "title": "JSON request purls" + } + }, + "title": "Purl request data (JSON payload)" + }, + "v2PurlRequestPurls": { + "type": "object", + "properties": { + "purl": { + "type": "string", + "title": "@description: purl to be requested" + }, + "requirement": { + "type": "string" + } + } + }, "v2StatusCode": { "type": "string", "enum": [ @@ -309,6 +373,23 @@ } }, "title": "Detailed response details" + }, + "v2TransitiveDependencyRequest": { + "type": "object", + "properties": { + "ecosystem": { + "type": "string" + }, + "purls": { + "$ref": "#/definitions/v2PurlRequest", + "title": "List of Purls from the same ecosystem" + }, + "depth": { + "type": "integer", + "format": "int32", + "title": "Depth to go when searching dependencies" + } + } } } } From e43fdc228fd4b29682ad68c30a7648e8d3c8b924 Mon Sep 17 00:00:00 2001 From: Agustin Groh Date: Tue, 11 Mar 2025 08:14:25 -0300 Subject: [PATCH 4/9] chore: Creates transitive dependencies stub --- api/commonv2/scanoss-common.pb.go | 255 ++++---- api/componentsv2/scanoss-components.pb.go | 397 +++--------- api/componentsv2/scanoss-components.pb.gw.go | 237 +++---- .../scanoss-components_grpc.pb.go | 43 +- api/cryptographyv2/scanoss-cryptography.pb.go | 390 +++-------- .../scanoss-cryptography.pb.gw.go | 345 ++++------ .../scanoss-cryptography_grpc.pb.go | 49 +- api/dependenciesv2/scanoss-dependencies.pb.go | 609 +++++++++++------- .../scanoss-dependencies.pb.gw.go | 194 +++--- .../scanoss-dependencies_grpc.pb.go | 10 +- api/provenancev2/scanoss-provenance.pb.go | 132 +--- api/provenancev2/scanoss-provenance.pb.gw.go | 129 ++-- .../scanoss-provenance_grpc.pb.go | 39 +- api/scanningv2/scanoss-scanning.pb.go | 211 ++---- api/scanningv2/scanoss-scanning.pb.gw.go | 153 ++--- api/scanningv2/scanoss-scanning_grpc.pb.go | 39 +- api/semgrepv2/scanoss-semgrep.pb.go | 141 ++-- api/semgrepv2/scanoss-semgrep.pb.gw.go | 129 ++-- api/semgrepv2/scanoss-semgrep_grpc.pb.go | 37 +- .../scanoss-vulnerabilities.pb.go | 238 ++----- .../scanoss-vulnerabilities.pb.gw.go | 183 ++---- .../scanoss-vulnerabilities_grpc.pb.go | 40 +- .../api/common/v2/scanoss-common.proto | 8 + .../v2/scanoss-components.swagger.json | 3 +- .../v2/scanoss-dependencies.proto | 16 +- .../v2/scanoss-dependencies.swagger.json | 67 +- .../v2/scanoss-provenance.swagger.json | 3 +- .../scanning/v2/scanoss-scanning.swagger.json | 4 +- .../semgrep/v2/scanoss-semgrep.swagger.json | 3 +- 29 files changed, 1653 insertions(+), 2451 deletions(-) diff --git a/api/commonv2/scanoss-common.pb.go b/api/commonv2/scanoss-common.pb.go index ad5d147..3c4df67 100644 --- a/api/commonv2/scanoss-common.pb.go +++ b/api/commonv2/scanoss-common.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.36.1 +// protoc v5.29.3 // source: scanoss/api/common/v2/scanoss-common.proto package commonv2 @@ -47,7 +47,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Status code Enum type StatusCode int32 @@ -104,26 +103,22 @@ func (StatusCode) EnumDescriptor() ([]byte, []int) { return file_scanoss_api_common_v2_scanoss_common_proto_rawDescGZIP(), []int{0} } -// // Detailed response details type StatusResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // response status Status StatusCode `protobuf:"varint,1,opt,name=status,proto3,enum=scanoss.api.common.v2.StatusCode" json:"status,omitempty"` // Status message - Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *StatusResponse) Reset() { *x = StatusResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StatusResponse) String() string { @@ -134,7 +129,7 @@ func (*StatusResponse) ProtoMessage() {} func (x *StatusResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -163,23 +158,19 @@ func (x *StatusResponse) GetMessage() string { return "" } -// // Echo Message Request type EchoRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` unknownFields protoimpl.UnknownFields - - Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` + sizeCache protoimpl.SizeCache } func (x *EchoRequest) Reset() { *x = EchoRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *EchoRequest) String() string { @@ -190,7 +181,7 @@ func (*EchoRequest) ProtoMessage() {} func (x *EchoRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -212,23 +203,19 @@ func (x *EchoRequest) GetMessage() string { return "" } -// // Echo Message Response type EchoResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` unknownFields protoimpl.UnknownFields - - Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` + sizeCache protoimpl.SizeCache } func (x *EchoResponse) Reset() { *x = EchoResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *EchoResponse) String() string { @@ -239,7 +226,7 @@ func (*EchoResponse) ProtoMessage() {} func (x *EchoResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -261,24 +248,20 @@ func (x *EchoResponse) GetMessage() string { return "" } -// // Purl request data (JSON payload) type PurlRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // JSON request purls - Purls []*PurlRequest_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` + Purls []*PurlRequest_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PurlRequest) Reset() { *x = PurlRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PurlRequest) String() string { @@ -289,7 +272,7 @@ func (*PurlRequest) ProtoMessage() {} func (x *PurlRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -311,23 +294,74 @@ func (x *PurlRequest) GetPurls() []*PurlRequest_Purls { return nil } -type PurlRequest_Purls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache +// Purl to be requested +type Purl struct { + state protoimpl.MessageState `protogen:"open.v1"` + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *Purl) Reset() { + *x = Purl{} + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Purl) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Purl) ProtoMessage() {} + +func (x *Purl) ProtoReflect() protoreflect.Message { + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} +// Deprecated: Use Purl.ProtoReflect.Descriptor instead. +func (*Purl) Descriptor() ([]byte, []int) { + return file_scanoss_api_common_v2_scanoss_common_proto_rawDescGZIP(), []int{4} +} + +func (x *Purl) GetPurl() string { + if x != nil { + return x.Purl + } + return "" +} + +func (x *Purl) GetRequirement() string { + if x != nil { + return x.Requirement + } + return "" +} + +// TODO: Replace by Purl message +type PurlRequest_Purls struct { + state protoimpl.MessageState `protogen:"open.v1"` // @description: purl to be requested - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PurlRequest_Purls) Reset() { *x = PurlRequest_Purls{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PurlRequest_Purls) String() string { @@ -337,8 +371,8 @@ func (x *PurlRequest_Purls) String() string { func (*PurlRequest_Purls) ProtoMessage() {} func (x *PurlRequest_Purls) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[5] + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -394,17 +428,21 @@ var file_scanoss_api_common_v2_scanoss_common_proto_rawDesc = []byte{ 0x05, 0x50, 0x75, 0x72, 0x6c, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0b, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2a, 0x60, 0x0a, 0x0a, - 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, - 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, - 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x55, 0x43, 0x43, - 0x45, 0x45, 0x44, 0x45, 0x44, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x49, - 0x4e, 0x47, 0x53, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, - 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x04, 0x42, 0x2f, - 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, - 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, - 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x32, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x32, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0b, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3c, 0x0a, 0x04, + 0x50, 0x75, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x71, 0x75, + 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, + 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2a, 0x60, 0x0a, 0x0a, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, + 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, + 0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x55, 0x43, 0x43, 0x45, 0x45, + 0x44, 0x45, 0x44, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, + 0x53, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x03, + 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x04, 0x42, 0x2f, 0x5a, 0x2d, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, + 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, + 0x6f, 0x6e, 0x76, 0x32, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x32, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -420,18 +458,19 @@ func file_scanoss_api_common_v2_scanoss_common_proto_rawDescGZIP() []byte { } var file_scanoss_api_common_v2_scanoss_common_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_scanoss_api_common_v2_scanoss_common_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_scanoss_api_common_v2_scanoss_common_proto_goTypes = []interface{}{ +var file_scanoss_api_common_v2_scanoss_common_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_scanoss_api_common_v2_scanoss_common_proto_goTypes = []any{ (StatusCode)(0), // 0: scanoss.api.common.v2.StatusCode (*StatusResponse)(nil), // 1: scanoss.api.common.v2.StatusResponse (*EchoRequest)(nil), // 2: scanoss.api.common.v2.EchoRequest (*EchoResponse)(nil), // 3: scanoss.api.common.v2.EchoResponse (*PurlRequest)(nil), // 4: scanoss.api.common.v2.PurlRequest - (*PurlRequest_Purls)(nil), // 5: scanoss.api.common.v2.PurlRequest.Purls + (*Purl)(nil), // 5: scanoss.api.common.v2.Purl + (*PurlRequest_Purls)(nil), // 6: scanoss.api.common.v2.PurlRequest.Purls } var file_scanoss_api_common_v2_scanoss_common_proto_depIdxs = []int32{ 0, // 0: scanoss.api.common.v2.StatusResponse.status:type_name -> scanoss.api.common.v2.StatusCode - 5, // 1: scanoss.api.common.v2.PurlRequest.purls:type_name -> scanoss.api.common.v2.PurlRequest.Purls + 6, // 1: scanoss.api.common.v2.PurlRequest.purls:type_name -> scanoss.api.common.v2.PurlRequest.Purls 2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name @@ -444,75 +483,13 @@ func file_scanoss_api_common_v2_scanoss_common_proto_init() { if File_scanoss_api_common_v2_scanoss_common_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StatusResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EchoRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EchoResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PurlRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PurlRequest_Purls); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_scanoss_api_common_v2_scanoss_common_proto_rawDesc, NumEnums: 1, - NumMessages: 5, + NumMessages: 6, NumExtensions: 0, NumServices: 0, }, diff --git a/api/componentsv2/scanoss-components.pb.go b/api/componentsv2/scanoss-components.pb.go index d03174c..f54ef68 100644 --- a/api/componentsv2/scanoss-components.pb.go +++ b/api/componentsv2/scanoss-components.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.36.1 +// protoc v5.29.3 // source: scanoss/api/components/v2/scanoss-components.proto package componentsv2 @@ -50,13 +50,9 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Component Search request data (JSON payload) type CompSearchRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Component to search for (vendor/component/purl). Search is exclusive (will override vendor/component) Search string `protobuf:"bytes,1,opt,name=search,proto3" json:"search,omitempty"` // Vendor to search for. Vendor can be combined with Component @@ -68,16 +64,16 @@ type CompSearchRequest struct { // Number of matches to return - default 50 Limit int32 `protobuf:"varint,6,opt,name=limit,proto3" json:"limit,omitempty"` // Offset to submit to return the next (limit) of component matches - Offset int32 `protobuf:"varint,7,opt,name=offset,proto3" json:"offset,omitempty"` + Offset int32 `protobuf:"varint,7,opt,name=offset,proto3" json:"offset,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CompSearchRequest) Reset() { *x = CompSearchRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompSearchRequest) String() string { @@ -88,7 +84,7 @@ func (*CompSearchRequest) ProtoMessage() {} func (x *CompSearchRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -146,23 +142,20 @@ func (x *CompSearchRequest) GetOffset() int32 { } type CompStatistic struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` TotalSourceFiles int32 `protobuf:"varint,1,opt,name=total_source_files,json=totalSourceFiles,proto3" json:"total_source_files,omitempty"` TotalLines int32 `protobuf:"varint,2,opt,name=total_lines,json=totalLines,proto3" json:"total_lines,omitempty"` TotalBlankLines int32 `protobuf:"varint,3,opt,name=total_blank_lines,json=totalBlankLines,proto3" json:"total_blank_lines,omitempty"` Languages []*CompStatistic_Language `protobuf:"bytes,4,rep,name=languages,proto3" json:"languages,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CompStatistic) Reset() { *x = CompStatistic{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompStatistic) String() string { @@ -173,7 +166,7 @@ func (*CompStatistic) ProtoMessage() {} func (x *CompStatistic) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -216,26 +209,22 @@ func (x *CompStatistic) GetLanguages() []*CompStatistic_Language { return nil } -// // Component Statistics response data (JSON payload) type CompStatisticResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Component statistic details Purls []*CompStatisticResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CompStatisticResponse) Reset() { *x = CompStatisticResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompStatisticResponse) String() string { @@ -246,7 +235,7 @@ func (*CompStatisticResponse) ProtoMessage() {} func (x *CompStatisticResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -275,26 +264,22 @@ func (x *CompStatisticResponse) GetStatus() *commonv2.StatusResponse { return nil } -// // Component Search response data (JSON payload) type CompSearchResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Component response details Components []*CompSearchResponse_Component `protobuf:"bytes,1,rep,name=components,proto3" json:"components,omitempty"` // Response status (required?) - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CompSearchResponse) Reset() { *x = CompSearchResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompSearchResponse) String() string { @@ -305,7 +290,7 @@ func (*CompSearchResponse) ProtoMessage() {} func (x *CompSearchResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -334,26 +319,22 @@ func (x *CompSearchResponse) GetStatus() *commonv2.StatusResponse { return nil } -// // Component Version request data (JSON payload) type CompVersionRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Component to search for (purl) Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // Number of versions to return - default 20 - Limit int32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` + Limit int32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CompVersionRequest) Reset() { *x = CompVersionRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompVersionRequest) String() string { @@ -364,7 +345,7 @@ func (*CompVersionRequest) ProtoMessage() {} func (x *CompVersionRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -393,26 +374,22 @@ func (x *CompVersionRequest) GetLimit() int32 { return 0 } -// // Component Search response data (JSON payload) type CompVersionResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Component response details Component *CompVersionResponse_Component `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CompVersionResponse) Reset() { *x = CompVersionResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompVersionResponse) String() string { @@ -423,7 +400,7 @@ func (*CompVersionResponse) ProtoMessage() {} func (x *CompVersionResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -453,21 +430,18 @@ func (x *CompVersionResponse) GetStatus() *commonv2.StatusResponse { } type CompStatistic_Language struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Files int32 `protobuf:"varint,2,opt,name=files,proto3" json:"files,omitempty"` unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Files int32 `protobuf:"varint,2,opt,name=files,proto3" json:"files,omitempty"` + sizeCache protoimpl.SizeCache } func (x *CompStatistic_Language) Reset() { *x = CompStatistic_Language{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompStatistic_Language) String() string { @@ -478,7 +452,7 @@ func (*CompStatistic_Language) ProtoMessage() {} func (x *CompStatistic_Language) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -508,22 +482,19 @@ func (x *CompStatistic_Language) GetFiles() int32 { } type CompStatisticResponse_Purls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` + Statistics *CompStatistic `protobuf:"bytes,3,opt,name=statistics,proto3" json:"statistics,omitempty"` unknownFields protoimpl.UnknownFields - - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` - Statistics *CompStatistic `protobuf:"bytes,3,opt,name=statistics,proto3" json:"statistics,omitempty"` + sizeCache protoimpl.SizeCache } func (x *CompStatisticResponse_Purls) Reset() { *x = CompStatisticResponse_Purls{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompStatisticResponse_Purls) String() string { @@ -534,7 +505,7 @@ func (*CompStatisticResponse_Purls) ProtoMessage() {} func (x *CompStatisticResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -572,22 +543,19 @@ func (x *CompStatisticResponse_Purls) GetStatistics() *CompStatistic { // Component details type CompSearchResponse_Component struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` + Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` + Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` unknownFields protoimpl.UnknownFields - - Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` - Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` - Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` + sizeCache protoimpl.SizeCache } func (x *CompSearchResponse_Component) Reset() { *x = CompSearchResponse_Component{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompSearchResponse_Component) String() string { @@ -598,7 +566,7 @@ func (*CompSearchResponse_Component) ProtoMessage() {} func (x *CompSearchResponse_Component) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -636,23 +604,20 @@ func (x *CompSearchResponse_Component) GetUrl() string { // License details type CompVersionResponse_License struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SpdxId string `protobuf:"bytes,2,opt,name=spdx_id,json=spdxId,proto3" json:"spdx_id,omitempty"` - IsSpdxApproved bool `protobuf:"varint,3,opt,name=is_spdx_approved,json=isSpdxApproved,proto3" json:"is_spdx_approved,omitempty"` - Url string `protobuf:"bytes,4,opt,name=url,proto3" json:"url,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + SpdxId string `protobuf:"bytes,2,opt,name=spdx_id,json=spdxId,proto3" json:"spdx_id,omitempty"` + IsSpdxApproved bool `protobuf:"varint,3,opt,name=is_spdx_approved,json=isSpdxApproved,proto3" json:"is_spdx_approved,omitempty"` + Url string `protobuf:"bytes,4,opt,name=url,proto3" json:"url,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CompVersionResponse_License) Reset() { *x = CompVersionResponse_License{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompVersionResponse_License) String() string { @@ -663,7 +628,7 @@ func (*CompVersionResponse_License) ProtoMessage() {} func (x *CompVersionResponse_License) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -708,21 +673,18 @@ func (x *CompVersionResponse_License) GetUrl() string { // Version details (including license) type CompVersionResponse_Version struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` + Licenses []*CompVersionResponse_License `protobuf:"bytes,4,rep,name=licenses,proto3" json:"licenses,omitempty"` unknownFields protoimpl.UnknownFields - - Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` - Licenses []*CompVersionResponse_License `protobuf:"bytes,4,rep,name=licenses,proto3" json:"licenses,omitempty"` + sizeCache protoimpl.SizeCache } func (x *CompVersionResponse_Version) Reset() { *x = CompVersionResponse_Version{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompVersionResponse_Version) String() string { @@ -733,7 +695,7 @@ func (*CompVersionResponse_Version) ProtoMessage() {} func (x *CompVersionResponse_Version) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -764,23 +726,20 @@ func (x *CompVersionResponse_Version) GetLicenses() []*CompVersionResponse_Licen // Component details (including versions) type CompVersionResponse_Component struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` + Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` + Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` + Versions []*CompVersionResponse_Version `protobuf:"bytes,4,rep,name=versions,proto3" json:"versions,omitempty"` unknownFields protoimpl.UnknownFields - - Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` - Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` - Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` - Versions []*CompVersionResponse_Version `protobuf:"bytes,4,rep,name=versions,proto3" json:"versions,omitempty"` + sizeCache protoimpl.SizeCache } func (x *CompVersionResponse_Component) Reset() { *x = CompVersionResponse_Component{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CompVersionResponse_Component) String() string { @@ -791,7 +750,7 @@ func (*CompVersionResponse_Component) ProtoMessage() {} func (x *CompVersionResponse_Component) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1023,7 +982,7 @@ func file_scanoss_api_components_v2_scanoss_components_proto_rawDescGZIP() []byt } var file_scanoss_api_components_v2_scanoss_components_proto_msgTypes = make([]protoimpl.MessageInfo, 12) -var file_scanoss_api_components_v2_scanoss_components_proto_goTypes = []interface{}{ +var file_scanoss_api_components_v2_scanoss_components_proto_goTypes = []any{ (*CompSearchRequest)(nil), // 0: scanoss.api.components.v2.CompSearchRequest (*CompStatistic)(nil), // 1: scanoss.api.components.v2.CompStatistic (*CompStatisticResponse)(nil), // 2: scanoss.api.components.v2.CompStatisticResponse @@ -1072,152 +1031,6 @@ func file_scanoss_api_components_v2_scanoss_components_proto_init() { if File_scanoss_api_components_v2_scanoss_components_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompSearchRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompStatistic); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompStatisticResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompSearchResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompVersionRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompVersionResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompStatistic_Language); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompStatisticResponse_Purls); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompSearchResponse_Component); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompVersionResponse_License); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompVersionResponse_Version); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CompVersionResponse_Component); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/componentsv2/scanoss-components.pb.gw.go b/api/componentsv2/scanoss-components.pb.gw.go index b5cdbf6..f6268b8 100644 --- a/api/componentsv2/scanoss-components.pb.gw.go +++ b/api/componentsv2/scanoss-components.pb.gw.go @@ -10,6 +10,7 @@ package componentsv2 import ( "context" + "errors" "io" "net/http" @@ -25,164 +26,125 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = errors.New + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join +) func request_Components_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client ComponentsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Components_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server ComponentsServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err - } func request_Components_SearchComponents_0(ctx context.Context, marshaler runtime.Marshaler, client ComponentsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq CompSearchRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq CompSearchRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.SearchComponents(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Components_SearchComponents_0(ctx context.Context, marshaler runtime.Marshaler, server ComponentsServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq CompSearchRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq CompSearchRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.SearchComponents(ctx, &protoReq) return msg, metadata, err - } func request_Components_GetComponentVersions_0(ctx context.Context, marshaler runtime.Marshaler, client ComponentsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq CompVersionRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq CompVersionRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetComponentVersions(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Components_GetComponentVersions_0(ctx context.Context, marshaler runtime.Marshaler, server ComponentsServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq CompVersionRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq CompVersionRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetComponentVersions(ctx, &protoReq) return msg, metadata, err - } func request_Components_GetComponentStatistics_0(ctx context.Context, marshaler runtime.Marshaler, client ComponentsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetComponentStatistics(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Components_GetComponentStatistics_0(ctx context.Context, marshaler runtime.Marshaler, server ComponentsServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetComponentStatistics(ctx, &protoReq) return msg, metadata, err - } // RegisterComponentsHandlerServer registers the http handlers for service Components to "mux". // UnaryRPC :call ComponentsServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterComponentsHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ComponentsServer) error { - - mux.Handle("POST", pattern_Components_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Components_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -194,20 +156,15 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Components_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Components_SearchComponents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Components_SearchComponents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -219,20 +176,15 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Components_SearchComponents_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Components_GetComponentVersions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Components_GetComponentVersions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -244,20 +196,15 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Components_GetComponentVersions_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Components_GetComponentStatistics_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Components_GetComponentStatistics_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -269,9 +216,7 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Components_GetComponentStatistics_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -280,25 +225,24 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, // RegisterComponentsHandlerFromEndpoint is same as RegisterComponentsHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterComponentsHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterComponentsHandler(ctx, mux, conn) } @@ -312,16 +256,13 @@ func RegisterComponentsHandler(ctx context.Context, mux *runtime.ServeMux, conn // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ComponentsClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ComponentsClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "ComponentsClient" to call the correct interceptors. +// "ComponentsClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ComponentsClient) error { - - mux.Handle("POST", pattern_Components_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Components_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -332,18 +273,13 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Components_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Components_SearchComponents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Components_SearchComponents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -354,18 +290,13 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Components_SearchComponents_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Components_GetComponentVersions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Components_GetComponentVersions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -376,18 +307,13 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Components_GetComponentVersions_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Components_GetComponentStatistics_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Components_GetComponentStatistics_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -398,30 +324,21 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Components_GetComponentStatistics_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - return nil } var ( - pattern_Components_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "echo"}, "")) - - pattern_Components_SearchComponents_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "search"}, "")) - - pattern_Components_GetComponentVersions_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "versions"}, "")) - + pattern_Components_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "echo"}, "")) + pattern_Components_SearchComponents_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "search"}, "")) + pattern_Components_GetComponentVersions_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "versions"}, "")) pattern_Components_GetComponentStatistics_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "statistics"}, "")) ) var ( - forward_Components_Echo_0 = runtime.ForwardResponseMessage - - forward_Components_SearchComponents_0 = runtime.ForwardResponseMessage - - forward_Components_GetComponentVersions_0 = runtime.ForwardResponseMessage - + forward_Components_Echo_0 = runtime.ForwardResponseMessage + forward_Components_SearchComponents_0 = runtime.ForwardResponseMessage + forward_Components_GetComponentVersions_0 = runtime.ForwardResponseMessage forward_Components_GetComponentStatistics_0 = runtime.ForwardResponseMessage ) diff --git a/api/componentsv2/scanoss-components_grpc.pb.go b/api/componentsv2/scanoss-components_grpc.pb.go index f030596..aeae933 100644 --- a/api/componentsv2/scanoss-components_grpc.pb.go +++ b/api/componentsv2/scanoss-components_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.29.3 // source: scanoss/api/components/v2/scanoss-components.proto package componentsv2 @@ -43,8 +43,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( Components_Echo_FullMethodName = "/scanoss.api.components.v2.Components/Echo" @@ -56,6 +56,8 @@ const ( // ComponentsClient is the client API for Components service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +// +// Expose all of the SCANOSS Component RPCs here type ComponentsClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -76,8 +78,9 @@ func NewComponentsClient(cc grpc.ClientConnInterface) ComponentsClient { } func (c *componentsClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Components_Echo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Components_Echo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -85,8 +88,9 @@ func (c *componentsClient) Echo(ctx context.Context, in *commonv2.EchoRequest, o } func (c *componentsClient) SearchComponents(ctx context.Context, in *CompSearchRequest, opts ...grpc.CallOption) (*CompSearchResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CompSearchResponse) - err := c.cc.Invoke(ctx, Components_SearchComponents_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Components_SearchComponents_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -94,8 +98,9 @@ func (c *componentsClient) SearchComponents(ctx context.Context, in *CompSearchR } func (c *componentsClient) GetComponentVersions(ctx context.Context, in *CompVersionRequest, opts ...grpc.CallOption) (*CompVersionResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CompVersionResponse) - err := c.cc.Invoke(ctx, Components_GetComponentVersions_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Components_GetComponentVersions_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -103,8 +108,9 @@ func (c *componentsClient) GetComponentVersions(ctx context.Context, in *CompVer } func (c *componentsClient) GetComponentStatistics(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*CompStatisticResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CompStatisticResponse) - err := c.cc.Invoke(ctx, Components_GetComponentStatistics_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Components_GetComponentStatistics_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -113,7 +119,9 @@ func (c *componentsClient) GetComponentStatistics(ctx context.Context, in *commo // ComponentsServer is the server API for Components service. // All implementations must embed UnimplementedComponentsServer -// for forward compatibility +// for forward compatibility. +// +// Expose all of the SCANOSS Component RPCs here type ComponentsServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -126,9 +134,12 @@ type ComponentsServer interface { mustEmbedUnimplementedComponentsServer() } -// UnimplementedComponentsServer must be embedded to have forward compatible implementations. -type UnimplementedComponentsServer struct { -} +// UnimplementedComponentsServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedComponentsServer struct{} func (UnimplementedComponentsServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -143,6 +154,7 @@ func (UnimplementedComponentsServer) GetComponentStatistics(context.Context, *co return nil, status.Errorf(codes.Unimplemented, "method GetComponentStatistics not implemented") } func (UnimplementedComponentsServer) mustEmbedUnimplementedComponentsServer() {} +func (UnimplementedComponentsServer) testEmbeddedByValue() {} // UnsafeComponentsServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to ComponentsServer will @@ -152,6 +164,13 @@ type UnsafeComponentsServer interface { } func RegisterComponentsServer(s grpc.ServiceRegistrar, srv ComponentsServer) { + // If the following call pancis, it indicates UnimplementedComponentsServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Components_ServiceDesc, srv) } diff --git a/api/cryptographyv2/scanoss-cryptography.pb.go b/api/cryptographyv2/scanoss-cryptography.pb.go index c4cfc71..9019fb6 100644 --- a/api/cryptographyv2/scanoss-cryptography.pb.go +++ b/api/cryptographyv2/scanoss-cryptography.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.36.1 +// protoc v5.29.3 // source: scanoss/api/cryptography/v2/scanoss-cryptography.proto package cryptographyv2 @@ -50,26 +50,22 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Cryptographic algorithm details type Algorithm struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Name of the detected algorithm Algorithm string `protobuf:"bytes,1,opt,name=algorithm,proto3" json:"algorithm,omitempty"` // Algorithm strength - Strength string `protobuf:"bytes,2,opt,name=strength,proto3" json:"strength,omitempty"` + Strength string `protobuf:"bytes,2,opt,name=strength,proto3" json:"strength,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Algorithm) Reset() { *x = Algorithm{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Algorithm) String() string { @@ -80,7 +76,7 @@ func (*Algorithm) ProtoMessage() {} func (x *Algorithm) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -109,26 +105,22 @@ func (x *Algorithm) GetStrength() string { return "" } -// // Cryptographic Algorithm response data type AlgorithmResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Cryptography details Purls []*AlgorithmResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AlgorithmResponse) Reset() { *x = AlgorithmResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AlgorithmResponse) String() string { @@ -139,7 +131,7 @@ func (*AlgorithmResponse) ProtoMessage() {} func (x *AlgorithmResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -168,26 +160,22 @@ func (x *AlgorithmResponse) GetStatus() *commonv2.StatusResponse { return nil } -// // Cryptographic Algorithm response data for a given range or criteria type AlgorithmsInRangeResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Cryptography details Purls []*AlgorithmsInRangeResponse_Purl `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AlgorithmsInRangeResponse) Reset() { *x = AlgorithmsInRangeResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AlgorithmsInRangeResponse) String() string { @@ -198,7 +186,7 @@ func (*AlgorithmsInRangeResponse) ProtoMessage() {} func (x *AlgorithmsInRangeResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -227,26 +215,22 @@ func (x *AlgorithmsInRangeResponse) GetStatus() *commonv2.StatusResponse { return nil } -// -// Versions with/without cryptographic algorithms detected for the given range or criteria +// Versions with/without cryptographic algorithms detected for the given range or criteria type VersionsInRangeResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Cryptography details Purls []*VersionsInRangeResponse_Purl `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *VersionsInRangeResponse) Reset() { *x = VersionsInRangeResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VersionsInRangeResponse) String() string { @@ -257,7 +241,7 @@ func (*VersionsInRangeResponse) ProtoMessage() {} func (x *VersionsInRangeResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -286,13 +270,9 @@ func (x *VersionsInRangeResponse) GetStatus() *commonv2.StatusResponse { return nil } -// // Structure to record hints of Encryption protocols, libraries, SDKs and frameworks type Hint struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // unique id Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // Name of protocol/library/sdk/framework @@ -304,16 +284,16 @@ type Hint struct { // Link to project main page, repository or documentation Url *string `protobuf:"bytes,5,opt,name=url,proto3,oneof" json:"url,omitempty"` // The purl of the original library/sdk/framework - Purl *string `protobuf:"bytes,6,opt,name=purl,proto3,oneof" json:"purl,omitempty"` + Purl *string `protobuf:"bytes,6,opt,name=purl,proto3,oneof" json:"purl,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Hint) Reset() { *x = Hint{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Hint) String() string { @@ -324,7 +304,7 @@ func (*Hint) ProtoMessage() {} func (x *Hint) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -381,26 +361,22 @@ func (x *Hint) GetPurl() string { return "" } -// // Encryption Hints response data type HintsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Purl encryption Hint Purls []*HintsResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HintsResponse) Reset() { *x = HintsResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HintsResponse) String() string { @@ -411,7 +387,7 @@ func (*HintsResponse) ProtoMessage() {} func (x *HintsResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -440,26 +416,23 @@ func (x *HintsResponse) GetStatus() *commonv2.StatusResponse { return nil } -//* +// * // Hints of Encryption protocols, libraries, SDKs and frameworks for a purls in range type HintsInRangeResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Purl encryption hints Purls []*HintsInRangeResponse_Purl `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HintsInRangeResponse) Reset() { *x = HintsInRangeResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HintsInRangeResponse) String() string { @@ -470,7 +443,7 @@ func (*HintsInRangeResponse) ProtoMessage() {} func (x *HintsInRangeResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -501,25 +474,22 @@ func (x *HintsInRangeResponse) GetStatus() *commonv2.StatusResponse { // Information for a given purl type AlgorithmResponse_Purls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The requested purl. Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // PURL version Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` // Algorithms list detected for that version - Algorithms []*Algorithm `protobuf:"bytes,3,rep,name=algorithms,proto3" json:"algorithms,omitempty"` + Algorithms []*Algorithm `protobuf:"bytes,3,rep,name=algorithms,proto3" json:"algorithms,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AlgorithmResponse_Purls) Reset() { *x = AlgorithmResponse_Purls{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AlgorithmResponse_Purls) String() string { @@ -530,7 +500,7 @@ func (*AlgorithmResponse_Purls) ProtoMessage() {} func (x *AlgorithmResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -568,25 +538,22 @@ func (x *AlgorithmResponse_Purls) GetAlgorithms() []*Algorithm { // Information for a given PURL type AlgorithmsInRangeResponse_Purl struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The requested purl Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // List of versions in that range that contains cryptography Versions []string `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"` // Algorithms list detected in that range - Algorithms []*Algorithm `protobuf:"bytes,3,rep,name=algorithms,proto3" json:"algorithms,omitempty"` + Algorithms []*Algorithm `protobuf:"bytes,3,rep,name=algorithms,proto3" json:"algorithms,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AlgorithmsInRangeResponse_Purl) Reset() { *x = AlgorithmsInRangeResponse_Purl{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AlgorithmsInRangeResponse_Purl) String() string { @@ -597,7 +564,7 @@ func (*AlgorithmsInRangeResponse_Purl) ProtoMessage() {} func (x *AlgorithmsInRangeResponse_Purl) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -635,25 +602,22 @@ func (x *AlgorithmsInRangeResponse_Purl) GetAlgorithms() []*Algorithm { // Information for a given PURL type VersionsInRangeResponse_Purl struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The requested purl Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // List of versions that contains cryptography VersionsWith []string `protobuf:"bytes,2,rep,name=versions_with,json=versionsWith,proto3" json:"versions_with,omitempty"` // List of versions that do not contain cryptography VersionsWithout []string `protobuf:"bytes,3,rep,name=versions_without,json=versionsWithout,proto3" json:"versions_without,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *VersionsInRangeResponse_Purl) Reset() { *x = VersionsInRangeResponse_Purl{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VersionsInRangeResponse_Purl) String() string { @@ -664,7 +628,7 @@ func (*VersionsInRangeResponse_Purl) ProtoMessage() {} func (x *VersionsInRangeResponse_Purl) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -702,25 +666,22 @@ func (x *VersionsInRangeResponse_Purl) GetVersionsWithout() []string { // Information for a given purl type HintsResponse_Purls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The requested purl. Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // PURL version Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` // Algorithms list detected for that version - Hints []*Hint `protobuf:"bytes,3,rep,name=hints,proto3" json:"hints,omitempty"` + Hints []*Hint `protobuf:"bytes,3,rep,name=hints,proto3" json:"hints,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HintsResponse_Purls) Reset() { *x = HintsResponse_Purls{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HintsResponse_Purls) String() string { @@ -731,7 +692,7 @@ func (*HintsResponse_Purls) ProtoMessage() {} func (x *HintsResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -769,25 +730,22 @@ func (x *HintsResponse_Purls) GetHints() []*Hint { // Information about the requested purl type HintsInRangeResponse_Purl struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The requested purl Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // List of versions in range Versions []string `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"` // Encryption hints - Hints []*Hint `protobuf:"bytes,3,rep,name=hints,proto3" json:"hints,omitempty"` + Hints []*Hint `protobuf:"bytes,3,rep,name=hints,proto3" json:"hints,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HintsInRangeResponse_Purl) Reset() { *x = HintsInRangeResponse_Purl{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HintsInRangeResponse_Purl) String() string { @@ -798,7 +756,7 @@ func (*HintsInRangeResponse_Purl) ProtoMessage() {} func (x *HintsInRangeResponse_Purl) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1044,7 +1002,7 @@ func file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_rawDescGZIP() [ } var file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes = make([]protoimpl.MessageInfo, 12) -var file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_goTypes = []interface{}{ +var file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_goTypes = []any{ (*Algorithm)(nil), // 0: scanoss.api.cryptography.v2.Algorithm (*AlgorithmResponse)(nil), // 1: scanoss.api.cryptography.v2.AlgorithmResponse (*AlgorithmsInRangeResponse)(nil), // 2: scanoss.api.cryptography.v2.AlgorithmsInRangeResponse @@ -1101,153 +1059,7 @@ func file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_init() { if File_scanoss_api_cryptography_v2_scanoss_cryptography_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Algorithm); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AlgorithmResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AlgorithmsInRangeResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VersionsInRangeResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Hint); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HintsResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HintsInRangeResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AlgorithmResponse_Purls); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AlgorithmsInRangeResponse_Purl); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VersionsInRangeResponse_Purl); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HintsResponse_Purls); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HintsInRangeResponse_Purl); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4].OneofWrappers = []interface{}{} + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/cryptographyv2/scanoss-cryptography.pb.gw.go b/api/cryptographyv2/scanoss-cryptography.pb.gw.go index 65d1623..76d2093 100644 --- a/api/cryptographyv2/scanoss-cryptography.pb.gw.go +++ b/api/cryptographyv2/scanoss-cryptography.pb.gw.go @@ -10,6 +10,7 @@ package cryptographyv2 import ( "context" + "errors" "io" "net/http" @@ -25,232 +26,173 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = errors.New + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join +) func request_Cryptography_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Cryptography_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err - } func request_Cryptography_GetAlgorithms_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetAlgorithms(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Cryptography_GetAlgorithms_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetAlgorithms(ctx, &protoReq) return msg, metadata, err - } func request_Cryptography_GetAlgorithmsInRange_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetAlgorithmsInRange(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Cryptography_GetAlgorithmsInRange_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetAlgorithmsInRange(ctx, &protoReq) return msg, metadata, err - } func request_Cryptography_GetVersionsInRange_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetVersionsInRange(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Cryptography_GetVersionsInRange_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetVersionsInRange(ctx, &protoReq) return msg, metadata, err - } func request_Cryptography_GetHintsInRange_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetHintsInRange(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Cryptography_GetHintsInRange_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetHintsInRange(ctx, &protoReq) return msg, metadata, err - } func request_Cryptography_GetEncryptionHints_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetEncryptionHints(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Cryptography_GetEncryptionHints_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetEncryptionHints(ctx, &protoReq) return msg, metadata, err - } // RegisterCryptographyHandlerServer registers the http handlers for service Cryptography to "mux". // UnaryRPC :call CryptographyServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterCryptographyHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMux, server CryptographyServer) error { - - mux.Handle("POST", pattern_Cryptography_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -262,20 +204,15 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Cryptography_GetAlgorithms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_GetAlgorithms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -287,20 +224,15 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetAlgorithms_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Cryptography_GetAlgorithmsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_GetAlgorithmsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -312,20 +244,15 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetAlgorithmsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Cryptography_GetVersionsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_GetVersionsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -337,20 +264,15 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetVersionsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Cryptography_GetHintsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_GetHintsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -362,20 +284,15 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetHintsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Cryptography_GetEncryptionHints_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_GetEncryptionHints_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -387,9 +304,7 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetEncryptionHints_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -398,25 +313,24 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu // RegisterCryptographyHandlerFromEndpoint is same as RegisterCryptographyHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterCryptographyHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterCryptographyHandler(ctx, mux, conn) } @@ -430,16 +344,13 @@ func RegisterCryptographyHandler(ctx context.Context, mux *runtime.ServeMux, con // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "CryptographyClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "CryptographyClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "CryptographyClient" to call the correct interceptors. +// "CryptographyClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMux, client CryptographyClient) error { - - mux.Handle("POST", pattern_Cryptography_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -450,18 +361,13 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Cryptography_GetAlgorithms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_GetAlgorithms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -472,18 +378,13 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetAlgorithms_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Cryptography_GetAlgorithmsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_GetAlgorithmsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -494,18 +395,13 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetAlgorithmsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Cryptography_GetVersionsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_GetVersionsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -516,18 +412,13 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetVersionsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Cryptography_GetHintsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_GetHintsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -538,18 +429,13 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetHintsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Cryptography_GetEncryptionHints_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Cryptography_GetEncryptionHints_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -560,38 +446,25 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetEncryptionHints_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - return nil } var ( - pattern_Cryptography_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "echo"}, "")) - - pattern_Cryptography_GetAlgorithms_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "algorithms"}, "")) - + pattern_Cryptography_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "echo"}, "")) + pattern_Cryptography_GetAlgorithms_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "algorithms"}, "")) pattern_Cryptography_GetAlgorithmsInRange_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "algorithmsInRange"}, "")) - - pattern_Cryptography_GetVersionsInRange_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "versionsInRange"}, "")) - - pattern_Cryptography_GetHintsInRange_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "hintsInRange"}, "")) - - pattern_Cryptography_GetEncryptionHints_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "hints"}, "")) + pattern_Cryptography_GetVersionsInRange_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "versionsInRange"}, "")) + pattern_Cryptography_GetHintsInRange_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "hintsInRange"}, "")) + pattern_Cryptography_GetEncryptionHints_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "hints"}, "")) ) var ( - forward_Cryptography_Echo_0 = runtime.ForwardResponseMessage - - forward_Cryptography_GetAlgorithms_0 = runtime.ForwardResponseMessage - + forward_Cryptography_Echo_0 = runtime.ForwardResponseMessage + forward_Cryptography_GetAlgorithms_0 = runtime.ForwardResponseMessage forward_Cryptography_GetAlgorithmsInRange_0 = runtime.ForwardResponseMessage - - forward_Cryptography_GetVersionsInRange_0 = runtime.ForwardResponseMessage - - forward_Cryptography_GetHintsInRange_0 = runtime.ForwardResponseMessage - - forward_Cryptography_GetEncryptionHints_0 = runtime.ForwardResponseMessage + forward_Cryptography_GetVersionsInRange_0 = runtime.ForwardResponseMessage + forward_Cryptography_GetHintsInRange_0 = runtime.ForwardResponseMessage + forward_Cryptography_GetEncryptionHints_0 = runtime.ForwardResponseMessage ) diff --git a/api/cryptographyv2/scanoss-cryptography_grpc.pb.go b/api/cryptographyv2/scanoss-cryptography_grpc.pb.go index b886ce8..c69f5c9 100644 --- a/api/cryptographyv2/scanoss-cryptography_grpc.pb.go +++ b/api/cryptographyv2/scanoss-cryptography_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.29.3 // source: scanoss/api/cryptography/v2/scanoss-cryptography.proto package cryptographyv2 @@ -43,8 +43,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( Cryptography_Echo_FullMethodName = "/scanoss.api.cryptography.v2.Cryptography/Echo" @@ -58,6 +58,8 @@ const ( // CryptographyClient is the client API for Cryptography service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +// +// Expose all of the SCANOSS Cryptography RPCs here type CryptographyClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -82,8 +84,9 @@ func NewCryptographyClient(cc grpc.ClientConnInterface) CryptographyClient { } func (c *cryptographyClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Cryptography_Echo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Cryptography_Echo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -91,8 +94,9 @@ func (c *cryptographyClient) Echo(ctx context.Context, in *commonv2.EchoRequest, } func (c *cryptographyClient) GetAlgorithms(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*AlgorithmResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(AlgorithmResponse) - err := c.cc.Invoke(ctx, Cryptography_GetAlgorithms_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Cryptography_GetAlgorithms_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -100,8 +104,9 @@ func (c *cryptographyClient) GetAlgorithms(ctx context.Context, in *commonv2.Pur } func (c *cryptographyClient) GetAlgorithmsInRange(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*AlgorithmsInRangeResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(AlgorithmsInRangeResponse) - err := c.cc.Invoke(ctx, Cryptography_GetAlgorithmsInRange_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Cryptography_GetAlgorithmsInRange_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -109,8 +114,9 @@ func (c *cryptographyClient) GetAlgorithmsInRange(ctx context.Context, in *commo } func (c *cryptographyClient) GetVersionsInRange(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*VersionsInRangeResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(VersionsInRangeResponse) - err := c.cc.Invoke(ctx, Cryptography_GetVersionsInRange_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Cryptography_GetVersionsInRange_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -118,8 +124,9 @@ func (c *cryptographyClient) GetVersionsInRange(ctx context.Context, in *commonv } func (c *cryptographyClient) GetHintsInRange(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*HintsInRangeResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(HintsInRangeResponse) - err := c.cc.Invoke(ctx, Cryptography_GetHintsInRange_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Cryptography_GetHintsInRange_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -127,8 +134,9 @@ func (c *cryptographyClient) GetHintsInRange(ctx context.Context, in *commonv2.P } func (c *cryptographyClient) GetEncryptionHints(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*HintsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(HintsResponse) - err := c.cc.Invoke(ctx, Cryptography_GetEncryptionHints_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Cryptography_GetEncryptionHints_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -137,7 +145,9 @@ func (c *cryptographyClient) GetEncryptionHints(ctx context.Context, in *commonv // CryptographyServer is the server API for Cryptography service. // All implementations must embed UnimplementedCryptographyServer -// for forward compatibility +// for forward compatibility. +// +// Expose all of the SCANOSS Cryptography RPCs here type CryptographyServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -154,9 +164,12 @@ type CryptographyServer interface { mustEmbedUnimplementedCryptographyServer() } -// UnimplementedCryptographyServer must be embedded to have forward compatible implementations. -type UnimplementedCryptographyServer struct { -} +// UnimplementedCryptographyServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedCryptographyServer struct{} func (UnimplementedCryptographyServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -177,6 +190,7 @@ func (UnimplementedCryptographyServer) GetEncryptionHints(context.Context, *comm return nil, status.Errorf(codes.Unimplemented, "method GetEncryptionHints not implemented") } func (UnimplementedCryptographyServer) mustEmbedUnimplementedCryptographyServer() {} +func (UnimplementedCryptographyServer) testEmbeddedByValue() {} // UnsafeCryptographyServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to CryptographyServer will @@ -186,6 +200,13 @@ type UnsafeCryptographyServer interface { } func RegisterCryptographyServer(s grpc.ServiceRegistrar, srv CryptographyServer) { + // If the following call pancis, it indicates UnimplementedCryptographyServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Cryptography_ServiceDesc, srv) } diff --git a/api/dependenciesv2/scanoss-dependencies.pb.go b/api/dependenciesv2/scanoss-dependencies.pb.go index c5bfd75..6b37dbe 100644 --- a/api/dependenciesv2/scanoss-dependencies.pb.go +++ b/api/dependenciesv2/scanoss-dependencies.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.36.1 +// protoc v5.29.3 // source: scanoss/api/dependencies/v2/scanoss-dependencies.proto package dependenciesv2 @@ -50,26 +50,22 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Dependency request data (JSON payload) type DependencyRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // List of dependency files Files []*DependencyRequest_Files `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"` // Depth to go when searching dependencies - Depth int32 `protobuf:"varint,2,opt,name=depth,proto3" json:"depth,omitempty"` + Depth int32 `protobuf:"varint,2,opt,name=depth,proto3" json:"depth,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *DependencyRequest) Reset() { *x = DependencyRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DependencyRequest) String() string { @@ -80,7 +76,7 @@ func (*DependencyRequest) ProtoMessage() {} func (x *DependencyRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -109,26 +105,22 @@ func (x *DependencyRequest) GetDepth() int32 { return 0 } -// // Dependency response data (JSON payload) type DependencyResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Dependency response details Files []*DependencyResponse_Files `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"` // Response status (required?) - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *DependencyResponse) Reset() { *x = DependencyResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DependencyResponse) String() string { @@ -139,7 +131,7 @@ func (*DependencyResponse) ProtoMessage() {} func (x *DependencyResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -168,25 +160,148 @@ func (x *DependencyResponse) GetStatus() *commonv2.StatusResponse { return nil } -// List of Purls/requirements -type DependencyRequest_Purls struct { - state protoimpl.MessageState +type TransitiveDependencyRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Ecosystem string `protobuf:"bytes,1,opt,name=ecosystem,proto3" json:"ecosystem,omitempty"` + // Depth to go when searching dependencies + Depth int32 `protobuf:"varint,2,opt,name=depth,proto3" json:"depth,omitempty"` + // Limit used on response + Limit int32 `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"` + // List of Purls from the same ecosystem + Purls []*commonv2.Purl `protobuf:"bytes,4,rep,name=purls,proto3" json:"purls,omitempty"` + unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache +} + +func (x *TransitiveDependencyRequest) Reset() { + *x = TransitiveDependencyRequest{} + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *TransitiveDependencyRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TransitiveDependencyRequest) ProtoMessage() {} + +func (x *TransitiveDependencyRequest) ProtoReflect() protoreflect.Message { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TransitiveDependencyRequest.ProtoReflect.Descriptor instead. +func (*TransitiveDependencyRequest) Descriptor() ([]byte, []int) { + return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP(), []int{2} +} + +func (x *TransitiveDependencyRequest) GetEcosystem() string { + if x != nil { + return x.Ecosystem + } + return "" +} + +func (x *TransitiveDependencyRequest) GetDepth() int32 { + if x != nil { + return x.Depth + } + return 0 +} + +func (x *TransitiveDependencyRequest) GetLimit() int32 { + if x != nil { + return x.Limit + } + return 0 +} + +func (x *TransitiveDependencyRequest) GetPurls() []*commonv2.Purl { + if x != nil { + return x.Purls + } + return nil +} + +// Transitive dependency response data (JSON payload) +type TransitiveDependencyResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Dependency response details + Dependencies []*TransitiveDependencyResponse_Dependencies `protobuf:"bytes,1,rep,name=dependencies,proto3" json:"dependencies,omitempty"` + // Response status + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *TransitiveDependencyResponse) Reset() { + *x = TransitiveDependencyResponse{} + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *TransitiveDependencyResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TransitiveDependencyResponse) ProtoMessage() {} + +func (x *TransitiveDependencyResponse) ProtoReflect() protoreflect.Message { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TransitiveDependencyResponse.ProtoReflect.Descriptor instead. +func (*TransitiveDependencyResponse) Descriptor() ([]byte, []int) { + return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP(), []int{3} +} + +func (x *TransitiveDependencyResponse) GetDependencies() []*TransitiveDependencyResponse_Dependencies { + if x != nil { + return x.Dependencies + } + return nil +} + +func (x *TransitiveDependencyResponse) GetStatus() *commonv2.StatusResponse { + if x != nil { + return x.Status + } + return nil +} +// List of Purls/requirements +type DependencyRequest_Purls struct { + state protoimpl.MessageState `protogen:"open.v1"` // Purl name Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // requirement - optional - Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` // string scope = 3; // TODO what did we want scope for? + Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` // string scope = 3; // TODO what did we want scope for? + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *DependencyRequest_Purls) Reset() { *x = DependencyRequest_Purls{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DependencyRequest_Purls) String() string { @@ -196,8 +311,8 @@ func (x *DependencyRequest_Purls) String() string { func (*DependencyRequest_Purls) ProtoMessage() {} func (x *DependencyRequest_Purls) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -228,23 +343,20 @@ func (x *DependencyRequest_Purls) GetRequirement() string { // List of dependency files type DependencyRequest_Files struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // dependency filename File string `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"` // List of purls - Purls []*DependencyRequest_Purls `protobuf:"bytes,2,rep,name=purls,proto3" json:"purls,omitempty"` + Purls []*DependencyRequest_Purls `protobuf:"bytes,2,rep,name=purls,proto3" json:"purls,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *DependencyRequest_Files) Reset() { *x = DependencyRequest_Files{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DependencyRequest_Files) String() string { @@ -254,8 +366,8 @@ func (x *DependencyRequest_Files) String() string { func (*DependencyRequest_Files) ProtoMessage() {} func (x *DependencyRequest_Files) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -285,23 +397,20 @@ func (x *DependencyRequest_Files) GetPurls() []*DependencyRequest_Purls { } type DependencyResponse_Licenses struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SpdxId string `protobuf:"bytes,2,opt,name=spdx_id,json=spdxId,proto3" json:"spdx_id,omitempty"` - IsSpdxApproved bool `protobuf:"varint,3,opt,name=is_spdx_approved,json=isSpdxApproved,proto3" json:"is_spdx_approved,omitempty"` - Url string `protobuf:"bytes,4,opt,name=url,proto3" json:"url,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + SpdxId string `protobuf:"bytes,2,opt,name=spdx_id,json=spdxId,proto3" json:"spdx_id,omitempty"` + IsSpdxApproved bool `protobuf:"varint,3,opt,name=is_spdx_approved,json=isSpdxApproved,proto3" json:"is_spdx_approved,omitempty"` + Url string `protobuf:"bytes,4,opt,name=url,proto3" json:"url,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *DependencyResponse_Licenses) Reset() { *x = DependencyResponse_Licenses{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DependencyResponse_Licenses) String() string { @@ -311,8 +420,8 @@ func (x *DependencyResponse_Licenses) String() string { func (*DependencyResponse_Licenses) ProtoMessage() {} func (x *DependencyResponse_Licenses) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -356,25 +465,22 @@ func (x *DependencyResponse_Licenses) GetUrl() string { } type DependencyResponse_Dependencies struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` + Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` + Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` + Licenses []*DependencyResponse_Licenses `protobuf:"bytes,4,rep,name=licenses,proto3" json:"licenses,omitempty"` + Url string `protobuf:"bytes,5,opt,name=url,proto3" json:"url,omitempty"` + Comment string `protobuf:"bytes,6,opt,name=comment,proto3" json:"comment,omitempty"` // string scope = 7; unknownFields protoimpl.UnknownFields - - Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` - Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` - Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` - Licenses []*DependencyResponse_Licenses `protobuf:"bytes,4,rep,name=licenses,proto3" json:"licenses,omitempty"` - Url string `protobuf:"bytes,5,opt,name=url,proto3" json:"url,omitempty"` - Comment string `protobuf:"bytes,6,opt,name=comment,proto3" json:"comment,omitempty"` // string scope = 7; + sizeCache protoimpl.SizeCache } func (x *DependencyResponse_Dependencies) Reset() { *x = DependencyResponse_Dependencies{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DependencyResponse_Dependencies) String() string { @@ -384,8 +490,8 @@ func (x *DependencyResponse_Dependencies) String() string { func (*DependencyResponse_Dependencies) ProtoMessage() {} func (x *DependencyResponse_Dependencies) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[7] + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -443,23 +549,20 @@ func (x *DependencyResponse_Dependencies) GetComment() string { } type DependencyResponse_Files struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + File string `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"` + Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` + Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"` + Dependencies []*DependencyResponse_Dependencies `protobuf:"bytes,4,rep,name=dependencies,proto3" json:"dependencies,omitempty"` unknownFields protoimpl.UnknownFields - - File string `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"` - Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` - Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"` - Dependencies []*DependencyResponse_Dependencies `protobuf:"bytes,4,rep,name=dependencies,proto3" json:"dependencies,omitempty"` + sizeCache protoimpl.SizeCache } func (x *DependencyResponse_Files) Reset() { *x = DependencyResponse_Files{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DependencyResponse_Files) String() string { @@ -469,8 +572,8 @@ func (x *DependencyResponse_Files) String() string { func (*DependencyResponse_Files) ProtoMessage() {} func (x *DependencyResponse_Files) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[8] + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -513,6 +616,58 @@ func (x *DependencyResponse_Files) GetDependencies() []*DependencyResponse_Depen return nil } +type TransitiveDependencyResponse_Dependencies struct { + state protoimpl.MessageState `protogen:"open.v1"` + Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` + Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *TransitiveDependencyResponse_Dependencies) Reset() { + *x = TransitiveDependencyResponse_Dependencies{} + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *TransitiveDependencyResponse_Dependencies) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TransitiveDependencyResponse_Dependencies) ProtoMessage() {} + +func (x *TransitiveDependencyResponse_Dependencies) ProtoReflect() protoreflect.Message { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[9] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TransitiveDependencyResponse_Dependencies.ProtoReflect.Descriptor instead. +func (*TransitiveDependencyResponse_Dependencies) Descriptor() ([]byte, []int) { + return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP(), []int{3, 0} +} + +func (x *TransitiveDependencyResponse_Dependencies) GetPurl() string { + if x != nil { + return x.Purl + } + return "" +} + +func (x *TransitiveDependencyResponse_Dependencies) GetVersion() string { + if x != nil { + return x.Version + } + return "" +} + var File_scanoss_api_dependencies_v2_scanoss_dependencies_proto protoreflect.FileDescriptor var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDesc = []byte{ @@ -588,44 +743,83 @@ var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDesc = []byte 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x52, 0x0c, - 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x32, 0xa8, 0x02, 0x0a, - 0x0c, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x75, 0x0a, - 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, - 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, - 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, - 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, - 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x24, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x01, 0x2a, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x76, 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2f, - 0x65, 0x63, 0x68, 0x6f, 0x12, 0xa0, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, - 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x2e, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, - 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, - 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x26, 0x3a, 0x01, 0x2a, 0x22, 0x21, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, - 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x42, 0x9c, 0x02, 0x92, 0x41, 0xdd, 0x01, 0x12, 0x77, - 0x0a, 0x1a, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, - 0x65, 0x6e, 0x63, 0x79, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x54, 0x0a, 0x14, - 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, - 0x63, 0x69, 0x65, 0x73, 0x12, 0x27, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, - 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x1a, 0x13, 0x73, - 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, - 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, - 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, - 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, - 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, - 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x5a, 0x39, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, - 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x3b, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, - 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x22, 0x9a, 0x01, 0x0a, + 0x1b, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, + 0x65, 0x63, 0x6f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x65, 0x63, 0x6f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, + 0x70, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x70, 0x74, 0x68, + 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x31, 0x0a, 0x05, 0x70, 0x75, 0x72, 0x6c, 0x73, 0x18, + 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x75, + 0x72, 0x6c, 0x52, 0x05, 0x70, 0x75, 0x72, 0x6c, 0x73, 0x22, 0x87, 0x02, 0x0a, 0x1c, 0x54, 0x72, + 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, + 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6a, 0x0a, 0x0c, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x46, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, + 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x54, + 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x65, 0x70, 0x65, + 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x52, 0x0c, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, + 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x3d, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x06, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a, 0x3c, 0x0a, 0x0c, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x32, 0xe7, 0x03, 0x0a, 0x0c, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, + 0x63, 0x69, 0x65, 0x73, 0x12, 0x75, 0x0a, 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x22, 0x2e, 0x73, + 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, + 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x01, 0x2a, + 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, + 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x12, 0xa0, 0x01, 0x0a, 0x0f, + 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, + 0x2e, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x2f, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x3a, 0x01, 0x2a, 0x22, 0x21, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, + 0x73, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0xbc, + 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, + 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x38, 0x2e, 0x73, + 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, + 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x39, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, + 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, + 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x3a, 0x01, 0x2a, 0x22, 0x1f, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, + 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x42, 0x9c, 0x02, + 0x92, 0x41, 0xdd, 0x01, 0x12, 0x77, 0x0a, 0x1a, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, + 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x22, 0x54, 0x0a, 0x14, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x27, 0x68, 0x74, 0x74, 0x70, + 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, + 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x69, 0x65, 0x73, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, + 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, + 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, + 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, + 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, + 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, + 0x07, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, + 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, + 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x3b, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -640,35 +834,44 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP() [ return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescData } -var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_goTypes = []interface{}{ - (*DependencyRequest)(nil), // 0: scanoss.api.dependencies.v2.DependencyRequest - (*DependencyResponse)(nil), // 1: scanoss.api.dependencies.v2.DependencyResponse - (*DependencyRequest_Purls)(nil), // 2: scanoss.api.dependencies.v2.DependencyRequest.Purls - (*DependencyRequest_Files)(nil), // 3: scanoss.api.dependencies.v2.DependencyRequest.Files - (*DependencyResponse_Licenses)(nil), // 4: scanoss.api.dependencies.v2.DependencyResponse.Licenses - (*DependencyResponse_Dependencies)(nil), // 5: scanoss.api.dependencies.v2.DependencyResponse.Dependencies - (*DependencyResponse_Files)(nil), // 6: scanoss.api.dependencies.v2.DependencyResponse.Files - (*commonv2.StatusResponse)(nil), // 7: scanoss.api.common.v2.StatusResponse - (*commonv2.EchoRequest)(nil), // 8: scanoss.api.common.v2.EchoRequest - (*commonv2.EchoResponse)(nil), // 9: scanoss.api.common.v2.EchoResponse +var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_goTypes = []any{ + (*DependencyRequest)(nil), // 0: scanoss.api.dependencies.v2.DependencyRequest + (*DependencyResponse)(nil), // 1: scanoss.api.dependencies.v2.DependencyResponse + (*TransitiveDependencyRequest)(nil), // 2: scanoss.api.dependencies.v2.TransitiveDependencyRequest + (*TransitiveDependencyResponse)(nil), // 3: scanoss.api.dependencies.v2.TransitiveDependencyResponse + (*DependencyRequest_Purls)(nil), // 4: scanoss.api.dependencies.v2.DependencyRequest.Purls + (*DependencyRequest_Files)(nil), // 5: scanoss.api.dependencies.v2.DependencyRequest.Files + (*DependencyResponse_Licenses)(nil), // 6: scanoss.api.dependencies.v2.DependencyResponse.Licenses + (*DependencyResponse_Dependencies)(nil), // 7: scanoss.api.dependencies.v2.DependencyResponse.Dependencies + (*DependencyResponse_Files)(nil), // 8: scanoss.api.dependencies.v2.DependencyResponse.Files + (*TransitiveDependencyResponse_Dependencies)(nil), // 9: scanoss.api.dependencies.v2.TransitiveDependencyResponse.Dependencies + (*commonv2.StatusResponse)(nil), // 10: scanoss.api.common.v2.StatusResponse + (*commonv2.Purl)(nil), // 11: scanoss.api.common.v2.Purl + (*commonv2.EchoRequest)(nil), // 12: scanoss.api.common.v2.EchoRequest + (*commonv2.EchoResponse)(nil), // 13: scanoss.api.common.v2.EchoResponse } var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_depIdxs = []int32{ - 3, // 0: scanoss.api.dependencies.v2.DependencyRequest.files:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Files - 6, // 1: scanoss.api.dependencies.v2.DependencyResponse.files:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Files - 7, // 2: scanoss.api.dependencies.v2.DependencyResponse.status:type_name -> scanoss.api.common.v2.StatusResponse - 2, // 3: scanoss.api.dependencies.v2.DependencyRequest.Files.purls:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Purls - 4, // 4: scanoss.api.dependencies.v2.DependencyResponse.Dependencies.licenses:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Licenses - 5, // 5: scanoss.api.dependencies.v2.DependencyResponse.Files.dependencies:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Dependencies - 8, // 6: scanoss.api.dependencies.v2.Dependencies.Echo:input_type -> scanoss.api.common.v2.EchoRequest - 0, // 7: scanoss.api.dependencies.v2.Dependencies.GetDependencies:input_type -> scanoss.api.dependencies.v2.DependencyRequest - 9, // 8: scanoss.api.dependencies.v2.Dependencies.Echo:output_type -> scanoss.api.common.v2.EchoResponse - 1, // 9: scanoss.api.dependencies.v2.Dependencies.GetDependencies:output_type -> scanoss.api.dependencies.v2.DependencyResponse - 8, // [8:10] is the sub-list for method output_type - 6, // [6:8] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name + 5, // 0: scanoss.api.dependencies.v2.DependencyRequest.files:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Files + 8, // 1: scanoss.api.dependencies.v2.DependencyResponse.files:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Files + 10, // 2: scanoss.api.dependencies.v2.DependencyResponse.status:type_name -> scanoss.api.common.v2.StatusResponse + 11, // 3: scanoss.api.dependencies.v2.TransitiveDependencyRequest.purls:type_name -> scanoss.api.common.v2.Purl + 9, // 4: scanoss.api.dependencies.v2.TransitiveDependencyResponse.dependencies:type_name -> scanoss.api.dependencies.v2.TransitiveDependencyResponse.Dependencies + 10, // 5: scanoss.api.dependencies.v2.TransitiveDependencyResponse.status:type_name -> scanoss.api.common.v2.StatusResponse + 4, // 6: scanoss.api.dependencies.v2.DependencyRequest.Files.purls:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Purls + 6, // 7: scanoss.api.dependencies.v2.DependencyResponse.Dependencies.licenses:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Licenses + 7, // 8: scanoss.api.dependencies.v2.DependencyResponse.Files.dependencies:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Dependencies + 12, // 9: scanoss.api.dependencies.v2.Dependencies.Echo:input_type -> scanoss.api.common.v2.EchoRequest + 0, // 10: scanoss.api.dependencies.v2.Dependencies.GetDependencies:input_type -> scanoss.api.dependencies.v2.DependencyRequest + 2, // 11: scanoss.api.dependencies.v2.Dependencies.GetTransitiveDependencies:input_type -> scanoss.api.dependencies.v2.TransitiveDependencyRequest + 13, // 12: scanoss.api.dependencies.v2.Dependencies.Echo:output_type -> scanoss.api.common.v2.EchoResponse + 1, // 13: scanoss.api.dependencies.v2.Dependencies.GetDependencies:output_type -> scanoss.api.dependencies.v2.DependencyResponse + 3, // 14: scanoss.api.dependencies.v2.Dependencies.GetTransitiveDependencies:output_type -> scanoss.api.dependencies.v2.TransitiveDependencyResponse + 12, // [12:15] is the sub-list for method output_type + 9, // [9:12] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() } @@ -676,99 +879,13 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() { if File_scanoss_api_dependencies_v2_scanoss_dependencies_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyRequest_Purls); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyRequest_Files); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyResponse_Licenses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyResponse_Dependencies); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyResponse_Files); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 10, NumExtensions: 0, NumServices: 1, }, diff --git a/api/dependenciesv2/scanoss-dependencies.pb.gw.go b/api/dependenciesv2/scanoss-dependencies.pb.gw.go index e8635ba..49ea0b8 100644 --- a/api/dependenciesv2/scanoss-dependencies.pb.gw.go +++ b/api/dependenciesv2/scanoss-dependencies.pb.gw.go @@ -10,6 +10,7 @@ package dependenciesv2 import ( "context" + "errors" "io" "net/http" @@ -25,96 +26,101 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = errors.New + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join +) func request_Dependencies_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client DependenciesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Dependencies_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server DependenciesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err - } func request_Dependencies_GetDependencies_0(ctx context.Context, marshaler runtime.Marshaler, client DependenciesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq DependencyRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq DependencyRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetDependencies(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Dependencies_GetDependencies_0(ctx context.Context, marshaler runtime.Marshaler, server DependenciesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq DependencyRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq DependencyRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetDependencies(ctx, &protoReq) return msg, metadata, err +} + +func request_Dependencies_GetTransitiveDependencies_0(ctx context.Context, marshaler runtime.Marshaler, client DependenciesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var ( + protoReq TransitiveDependencyRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + msg, err := client.GetTransitiveDependencies(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err +} +func local_request_Dependencies_GetTransitiveDependencies_0(ctx context.Context, marshaler runtime.Marshaler, server DependenciesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var ( + protoReq TransitiveDependencyRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + msg, err := server.GetTransitiveDependencies(ctx, &protoReq) + return msg, metadata, err } // RegisterDependenciesHandlerServer registers the http handlers for service Dependencies to "mux". // UnaryRPC :call DependenciesServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterDependenciesHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMux, server DependenciesServer) error { - - mux.Handle("POST", pattern_Dependencies_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Dependencies_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -126,20 +132,15 @@ func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Dependencies_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Dependencies_GetDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Dependencies_GetDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -151,9 +152,27 @@ func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Dependencies_GetDependencies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - + }) + mux.Handle(http.MethodPost, pattern_Dependencies_GetTransitiveDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetTransitiveDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/transitive")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Dependencies_GetTransitiveDependencies_0(annotatedContext, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + forward_Dependencies_GetTransitiveDependencies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) return nil @@ -162,25 +181,24 @@ func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMu // RegisterDependenciesHandlerFromEndpoint is same as RegisterDependenciesHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterDependenciesHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterDependenciesHandler(ctx, mux, conn) } @@ -194,16 +212,13 @@ func RegisterDependenciesHandler(ctx context.Context, mux *runtime.ServeMux, con // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "DependenciesClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "DependenciesClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "DependenciesClient" to call the correct interceptors. +// "DependenciesClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterDependenciesHandlerClient(ctx context.Context, mux *runtime.ServeMux, client DependenciesClient) error { - - mux.Handle("POST", pattern_Dependencies_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Dependencies_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -214,18 +229,13 @@ func RegisterDependenciesHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Dependencies_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Dependencies_GetDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Dependencies_GetDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -236,22 +246,36 @@ func RegisterDependenciesHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Dependencies_GetDependencies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - + mux.Handle(http.MethodPost, pattern_Dependencies_GetTransitiveDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetTransitiveDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/transitive")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Dependencies_GetTransitiveDependencies_0(annotatedContext, inboundMarshaler, client, req, pathParams) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + forward_Dependencies_GetTransitiveDependencies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil } var ( - pattern_Dependencies_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "dependencies", "echo"}, "")) - - pattern_Dependencies_GetDependencies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2}, []string{"api", "v2", "dependencies"}, "")) + pattern_Dependencies_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "dependencies", "echo"}, "")) + pattern_Dependencies_GetDependencies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2}, []string{"api", "v2", "dependencies"}, "")) + pattern_Dependencies_GetTransitiveDependencies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "dependencies", "transitive"}, "")) ) var ( - forward_Dependencies_Echo_0 = runtime.ForwardResponseMessage - - forward_Dependencies_GetDependencies_0 = runtime.ForwardResponseMessage + forward_Dependencies_Echo_0 = runtime.ForwardResponseMessage + forward_Dependencies_GetDependencies_0 = runtime.ForwardResponseMessage + forward_Dependencies_GetTransitiveDependencies_0 = runtime.ForwardResponseMessage ) diff --git a/api/dependenciesv2/scanoss-dependencies_grpc.pb.go b/api/dependenciesv2/scanoss-dependencies_grpc.pb.go index c81fe3e..105c3da 100644 --- a/api/dependenciesv2/scanoss-dependencies_grpc.pb.go +++ b/api/dependenciesv2/scanoss-dependencies_grpc.pb.go @@ -62,7 +62,7 @@ type DependenciesClient interface { Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) // Get dependency details GetDependencies(ctx context.Context, in *DependencyRequest, opts ...grpc.CallOption) (*DependencyResponse, error) - GetTransitiveDependencies(ctx context.Context, in *TransitiveDependencyRequest, opts ...grpc.CallOption) (*DependencyResponse, error) + GetTransitiveDependencies(ctx context.Context, in *TransitiveDependencyRequest, opts ...grpc.CallOption) (*TransitiveDependencyResponse, error) } type dependenciesClient struct { @@ -93,9 +93,9 @@ func (c *dependenciesClient) GetDependencies(ctx context.Context, in *Dependency return out, nil } -func (c *dependenciesClient) GetTransitiveDependencies(ctx context.Context, in *TransitiveDependencyRequest, opts ...grpc.CallOption) (*DependencyResponse, error) { +func (c *dependenciesClient) GetTransitiveDependencies(ctx context.Context, in *TransitiveDependencyRequest, opts ...grpc.CallOption) (*TransitiveDependencyResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(DependencyResponse) + out := new(TransitiveDependencyResponse) err := c.cc.Invoke(ctx, Dependencies_GetTransitiveDependencies_FullMethodName, in, out, cOpts...) if err != nil { return nil, err @@ -113,7 +113,7 @@ type DependenciesServer interface { Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) // Get dependency details GetDependencies(context.Context, *DependencyRequest) (*DependencyResponse, error) - GetTransitiveDependencies(context.Context, *TransitiveDependencyRequest) (*DependencyResponse, error) + GetTransitiveDependencies(context.Context, *TransitiveDependencyRequest) (*TransitiveDependencyResponse, error) mustEmbedUnimplementedDependenciesServer() } @@ -130,7 +130,7 @@ func (UnimplementedDependenciesServer) Echo(context.Context, *commonv2.EchoReque func (UnimplementedDependenciesServer) GetDependencies(context.Context, *DependencyRequest) (*DependencyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetDependencies not implemented") } -func (UnimplementedDependenciesServer) GetTransitiveDependencies(context.Context, *TransitiveDependencyRequest) (*DependencyResponse, error) { +func (UnimplementedDependenciesServer) GetTransitiveDependencies(context.Context, *TransitiveDependencyRequest) (*TransitiveDependencyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetTransitiveDependencies not implemented") } func (UnimplementedDependenciesServer) mustEmbedUnimplementedDependenciesServer() {} diff --git a/api/provenancev2/scanoss-provenance.pb.go b/api/provenancev2/scanoss-provenance.pb.go index b6a0b36..99af586 100644 --- a/api/provenancev2/scanoss-provenance.pb.go +++ b/api/provenancev2/scanoss-provenance.pb.go @@ -26,8 +26,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.36.1 +// protoc v5.29.3 // source: scanoss/api/provenance/v2/scanoss-provenance.proto package provenancev2 @@ -49,26 +49,23 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -//* +// * // Component level Provenance Response data (JSON payload) type ProvenanceResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Provenance details Purls []*ProvenanceResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProvenanceResponse) Reset() { *x = ProvenanceResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProvenanceResponse) String() string { @@ -79,7 +76,7 @@ func (*ProvenanceResponse) ProtoMessage() {} func (x *ProvenanceResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -110,23 +107,20 @@ func (x *ProvenanceResponse) GetStatus() *commonv2.StatusResponse { // Declared location for the project type ProvenanceResponse_DeclaredLocation struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Declared location could be either from the owner or a contributor Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` // Country/State/City/Province/Place declared on the repo - Location string `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"` + Location string `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProvenanceResponse_DeclaredLocation) Reset() { *x = ProvenanceResponse_DeclaredLocation{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProvenanceResponse_DeclaredLocation) String() string { @@ -137,7 +131,7 @@ func (*ProvenanceResponse_DeclaredLocation) ProtoMessage() {} func (x *ProvenanceResponse_DeclaredLocation) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -168,23 +162,20 @@ func (x *ProvenanceResponse_DeclaredLocation) GetLocation() string { // Curated provenance information about the project type ProvenanceResponse_CuratedLocation struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Country for the owner or contributor Country string `protobuf:"bytes,1,opt,name=country,proto3" json:"country,omitempty"` // Ocurrences for users or contributors on this specific country - Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` + Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProvenanceResponse_CuratedLocation) Reset() { *x = ProvenanceResponse_CuratedLocation{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProvenanceResponse_CuratedLocation) String() string { @@ -195,7 +186,7 @@ func (*ProvenanceResponse_CuratedLocation) ProtoMessage() {} func (x *ProvenanceResponse_CuratedLocation) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -226,10 +217,7 @@ func (x *ProvenanceResponse_CuratedLocation) GetCount() int32 { // Information about a given purl type ProvenanceResponse_Purls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The purl string Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // The purl version @@ -238,15 +226,15 @@ type ProvenanceResponse_Purls struct { DeclaredLocations []*ProvenanceResponse_DeclaredLocation `protobuf:"bytes,3,rep,name=declared_locations,json=declaredLocations,proto3" json:"declared_locations,omitempty"` // List of craft curated location CuratedLocations []*ProvenanceResponse_CuratedLocation `protobuf:"bytes,4,rep,name=curated_locations,json=curatedLocations,proto3" json:"curated_locations,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProvenanceResponse_Purls) Reset() { *x = ProvenanceResponse_Purls{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProvenanceResponse_Purls) String() string { @@ -257,7 +245,7 @@ func (*ProvenanceResponse_Purls) ProtoMessage() {} func (x *ProvenanceResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -402,7 +390,7 @@ func file_scanoss_api_provenance_v2_scanoss_provenance_proto_rawDescGZIP() []byt } var file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_scanoss_api_provenance_v2_scanoss_provenance_proto_goTypes = []interface{}{ +var file_scanoss_api_provenance_v2_scanoss_provenance_proto_goTypes = []any{ (*ProvenanceResponse)(nil), // 0: scanoss.api.provenance.v2.ProvenanceResponse (*ProvenanceResponse_DeclaredLocation)(nil), // 1: scanoss.api.provenance.v2.ProvenanceResponse.DeclaredLocation (*ProvenanceResponse_CuratedLocation)(nil), // 2: scanoss.api.provenance.v2.ProvenanceResponse.CuratedLocation @@ -433,56 +421,6 @@ func file_scanoss_api_provenance_v2_scanoss_provenance_proto_init() { if File_scanoss_api_provenance_v2_scanoss_provenance_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProvenanceResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProvenanceResponse_DeclaredLocation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProvenanceResponse_CuratedLocation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProvenanceResponse_Purls); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/provenancev2/scanoss-provenance.pb.gw.go b/api/provenancev2/scanoss-provenance.pb.gw.go index 1c659f8..92191f8 100644 --- a/api/provenancev2/scanoss-provenance.pb.gw.go +++ b/api/provenancev2/scanoss-provenance.pb.gw.go @@ -10,6 +10,7 @@ package provenancev2 import ( "context" + "errors" "io" "net/http" @@ -25,96 +26,77 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = errors.New + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join +) func request_Provenance_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client ProvenanceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Provenance_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server ProvenanceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err - } func request_Provenance_GetComponentProvenance_0(ctx context.Context, marshaler runtime.Marshaler, client ProvenanceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetComponentProvenance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Provenance_GetComponentProvenance_0(ctx context.Context, marshaler runtime.Marshaler, server ProvenanceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetComponentProvenance(ctx, &protoReq) return msg, metadata, err - } // RegisterProvenanceHandlerServer registers the http handlers for service Provenance to "mux". // UnaryRPC :call ProvenanceServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterProvenanceHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ProvenanceServer) error { - - mux.Handle("POST", pattern_Provenance_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Provenance_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -126,20 +108,15 @@ func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Provenance_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Provenance_GetComponentProvenance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Provenance_GetComponentProvenance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -151,9 +128,7 @@ func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Provenance_GetComponentProvenance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -162,25 +137,24 @@ func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, // RegisterProvenanceHandlerFromEndpoint is same as RegisterProvenanceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterProvenanceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterProvenanceHandler(ctx, mux, conn) } @@ -194,16 +168,13 @@ func RegisterProvenanceHandler(ctx context.Context, mux *runtime.ServeMux, conn // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ProvenanceClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ProvenanceClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "ProvenanceClient" to call the correct interceptors. +// "ProvenanceClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterProvenanceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ProvenanceClient) error { - - mux.Handle("POST", pattern_Provenance_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Provenance_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -214,18 +185,13 @@ func RegisterProvenanceHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Provenance_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Provenance_GetComponentProvenance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Provenance_GetComponentProvenance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -236,22 +202,17 @@ func RegisterProvenanceHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Provenance_GetComponentProvenance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - return nil } var ( - pattern_Provenance_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "provenance", "echo"}, "")) - + pattern_Provenance_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "provenance", "echo"}, "")) pattern_Provenance_GetComponentProvenance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "provenance", "countries"}, "")) ) var ( - forward_Provenance_Echo_0 = runtime.ForwardResponseMessage - + forward_Provenance_Echo_0 = runtime.ForwardResponseMessage forward_Provenance_GetComponentProvenance_0 = runtime.ForwardResponseMessage ) diff --git a/api/provenancev2/scanoss-provenance_grpc.pb.go b/api/provenancev2/scanoss-provenance_grpc.pb.go index bfad79f..6a46c6c 100644 --- a/api/provenancev2/scanoss-provenance_grpc.pb.go +++ b/api/provenancev2/scanoss-provenance_grpc.pb.go @@ -26,8 +26,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.29.3 // source: scanoss/api/provenance/v2/scanoss-provenance.proto package provenancev2 @@ -42,8 +42,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( Provenance_Echo_FullMethodName = "/scanoss.api.provenance.v2.Provenance/Echo" @@ -53,6 +53,9 @@ const ( // ProvenanceClient is the client API for Provenance service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +// +// * +// Expose all of the SCANOSS Provenance RPCs here type ProvenanceClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -69,8 +72,9 @@ func NewProvenanceClient(cc grpc.ClientConnInterface) ProvenanceClient { } func (c *provenanceClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Provenance_Echo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Provenance_Echo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -78,8 +82,9 @@ func (c *provenanceClient) Echo(ctx context.Context, in *commonv2.EchoRequest, o } func (c *provenanceClient) GetComponentProvenance(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*ProvenanceResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ProvenanceResponse) - err := c.cc.Invoke(ctx, Provenance_GetComponentProvenance_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Provenance_GetComponentProvenance_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -88,7 +93,10 @@ func (c *provenanceClient) GetComponentProvenance(ctx context.Context, in *commo // ProvenanceServer is the server API for Provenance service. // All implementations must embed UnimplementedProvenanceServer -// for forward compatibility +// for forward compatibility. +// +// * +// Expose all of the SCANOSS Provenance RPCs here type ProvenanceServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -97,9 +105,12 @@ type ProvenanceServer interface { mustEmbedUnimplementedProvenanceServer() } -// UnimplementedProvenanceServer must be embedded to have forward compatible implementations. -type UnimplementedProvenanceServer struct { -} +// UnimplementedProvenanceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedProvenanceServer struct{} func (UnimplementedProvenanceServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -108,6 +119,7 @@ func (UnimplementedProvenanceServer) GetComponentProvenance(context.Context, *co return nil, status.Errorf(codes.Unimplemented, "method GetComponentProvenance not implemented") } func (UnimplementedProvenanceServer) mustEmbedUnimplementedProvenanceServer() {} +func (UnimplementedProvenanceServer) testEmbeddedByValue() {} // UnsafeProvenanceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to ProvenanceServer will @@ -117,6 +129,13 @@ type UnsafeProvenanceServer interface { } func RegisterProvenanceServer(s grpc.ServiceRegistrar, srv ProvenanceServer) { + // If the following call pancis, it indicates UnimplementedProvenanceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Provenance_ServiceDesc, srv) } diff --git a/api/scanningv2/scanoss-scanning.pb.go b/api/scanningv2/scanoss-scanning.pb.go index 515a29c..0a8309c 100644 --- a/api/scanningv2/scanoss-scanning.pb.go +++ b/api/scanningv2/scanoss-scanning.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.21.12 +// protoc-gen-go v1.36.1 +// protoc v5.29.3 // source: scanoss/api/scanning/v2/scanoss-scanning.proto package scanningv2 @@ -52,25 +52,22 @@ const ( // High precision Folder Hashing scan request type HFHRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Report best match (most hits) or not. Default: false BestMatch bool `protobuf:"varint,1,opt,name=best_match,json=bestMatch,proto3" json:"best_match,omitempty"` // Detection threshold (distance) for component selection. Default: 60 Threshold int32 `protobuf:"varint,2,opt,name=threshold,proto3" json:"threshold,omitempty"` // Folder root node to be scanned - Root *HFHRequest_Children `protobuf:"bytes,3,opt,name=root,proto3" json:"root,omitempty"` + Root *HFHRequest_Children `protobuf:"bytes,3,opt,name=root,proto3" json:"root,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HFHRequest) Reset() { *x = HFHRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HFHRequest) String() string { @@ -81,7 +78,7 @@ func (*HFHRequest) ProtoMessage() {} func (x *HFHRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -119,22 +116,19 @@ func (x *HFHRequest) GetRoot() *HFHRequest_Children { // High precision Folder Hashing scan response type HFHResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // List of folders containing unique components - Results []*HFHResponse_Result `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"` - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Results []*HFHResponse_Result `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HFHResponse) Reset() { *x = HFHResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HFHResponse) String() string { @@ -145,7 +139,7 @@ func (*HFHResponse) ProtoMessage() {} func (x *HFHResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -176,10 +170,7 @@ func (x *HFHResponse) GetStatus() *commonv2.StatusResponse { // Child node from the folder structure type HFHRequest_Children struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Folder path (can be actual or obfuscated) PathId string `protobuf:"bytes,1,opt,name=path_id,json=pathId,proto3" json:"path_id,omitempty"` // Proximity hash calculated from this nodes filenames (and their children). @@ -187,16 +178,16 @@ type HFHRequest_Children struct { // Proximity hash calculated from this nodes file contents (and their children). SimHashContent string `protobuf:"bytes,3,opt,name=sim_hash_content,json=simHashContent,proto3" json:"sim_hash_content,omitempty"` // Sub-folders inside this child - Children []*HFHRequest_Children `protobuf:"bytes,4,rep,name=children,proto3" json:"children,omitempty"` + Children []*HFHRequest_Children `protobuf:"bytes,4,rep,name=children,proto3" json:"children,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HFHRequest_Children) Reset() { *x = HFHRequest_Children{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HFHRequest_Children) String() string { @@ -207,7 +198,7 @@ func (*HFHRequest_Children) ProtoMessage() {} func (x *HFHRequest_Children) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -252,25 +243,22 @@ func (x *HFHRequest_Children) GetChildren() []*HFHRequest_Children { // Matched component details type HFHResponse_Component struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Component PURL Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // Component match version (could be multiple) Versions []string `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"` // Result confidence percentage - Confidence float32 `protobuf:"fixed32,3,opt,name=confidence,proto3" json:"confidence,omitempty"` + Confidence float32 `protobuf:"fixed32,3,opt,name=confidence,proto3" json:"confidence,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HFHResponse_Component) Reset() { *x = HFHResponse_Component{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HFHResponse_Component) String() string { @@ -281,7 +269,7 @@ func (*HFHResponse_Component) ProtoMessage() {} func (x *HFHResponse_Component) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -319,23 +307,20 @@ func (x *HFHResponse_Component) GetConfidence() float32 { // Result item, link a path with a list of components type HFHResponse_Result struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Folder path (can be actual or obfuscated) PathId string `protobuf:"bytes,1,opt,name=path_id,json=pathId,proto3" json:"path_id,omitempty"` // List of matching components - Components []*HFHResponse_Component `protobuf:"bytes,2,rep,name=components,proto3" json:"components,omitempty"` + Components []*HFHResponse_Component `protobuf:"bytes,2,rep,name=components,proto3" json:"components,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HFHResponse_Result) Reset() { *x = HFHResponse_Result{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HFHResponse_Result) String() string { @@ -346,7 +331,7 @@ func (*HFHResponse_Result) ProtoMessage() {} func (x *HFHResponse_Result) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -439,34 +424,34 @@ var file_scanoss_api_scanning_v2_scanoss_scanning_proto_rawDesc = []byte{ 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x2f, 0x65, 0x63, - 0x68, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x81, 0x01, 0x0a, 0x0e, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, + 0x6e, 0x73, 0x65, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x3a, 0x01, 0x2a, 0x22, 0x15, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, + 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x12, 0x81, 0x01, 0x0a, 0x0e, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x53, 0x63, 0x61, 0x6e, 0x12, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x46, 0x48, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x46, 0x48, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x2f, 0x68, 0x66, - 0x68, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x3a, 0x01, 0x2a, 0x42, 0x8a, 0x02, 0x5a, 0x31, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, - 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, - 0x6e, 0x67, 0x76, 0x32, 0x3b, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x76, 0x32, 0x92, - 0x41, 0xd3, 0x01, 0x12, 0x6d, 0x0a, 0x18, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x53, - 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, - 0x4c, 0x0a, 0x10, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x73, 0x63, 0x61, 0x6e, 0x6e, - 0x69, 0x6e, 0x67, 0x12, 0x23, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, - 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, - 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, - 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, - 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, - 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, - 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, - 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x73, 0x65, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x01, 0x2a, 0x22, 0x19, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, + 0x2f, 0x68, 0x66, 0x68, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x42, 0x8a, 0x02, 0x92, 0x41, 0xd3, 0x01, + 0x12, 0x6d, 0x0a, 0x18, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x53, 0x63, 0x61, 0x6e, + 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x4c, 0x0a, 0x10, + 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, + 0x12, 0x23, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x73, 0x63, 0x61, + 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, + 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, + 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, + 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, + 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, + 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, + 0x02, 0x01, 0x07, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x76, 0x32, 0x3b, 0x73, 0x63, 0x61, 0x6e, + 0x6e, 0x69, 0x6e, 0x67, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -482,7 +467,7 @@ func file_scanoss_api_scanning_v2_scanoss_scanning_proto_rawDescGZIP() []byte { } var file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_scanoss_api_scanning_v2_scanoss_scanning_proto_goTypes = []interface{}{ +var file_scanoss_api_scanning_v2_scanoss_scanning_proto_goTypes = []any{ (*HFHRequest)(nil), // 0: scanoss.api.scanning.v2.HFHRequest (*HFHResponse)(nil), // 1: scanoss.api.scanning.v2.HFHResponse (*HFHRequest_Children)(nil), // 2: scanoss.api.scanning.v2.HFHRequest.Children @@ -514,68 +499,6 @@ func file_scanoss_api_scanning_v2_scanoss_scanning_proto_init() { if File_scanoss_api_scanning_v2_scanoss_scanning_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HFHRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HFHResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HFHRequest_Children); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HFHResponse_Component); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HFHResponse_Result); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/scanningv2/scanoss-scanning.pb.gw.go b/api/scanningv2/scanoss-scanning.pb.gw.go index d9d9b53..27477a7 100644 --- a/api/scanningv2/scanoss-scanning.pb.gw.go +++ b/api/scanningv2/scanoss-scanning.pb.gw.go @@ -10,6 +10,7 @@ package scanningv2 import ( "context" + "errors" "io" "net/http" @@ -25,131 +26,109 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = errors.New + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join +) func request_Scanning_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client ScanningClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Scanning_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server ScanningServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err - } func request_Scanning_FolderHashScan_0(ctx context.Context, marshaler runtime.Marshaler, client ScanningClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq HFHRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq HFHRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.FolderHashScan(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Scanning_FolderHashScan_0(ctx context.Context, marshaler runtime.Marshaler, server ScanningServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq HFHRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq HFHRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.FolderHashScan(ctx, &protoReq) return msg, metadata, err - } // RegisterScanningHandlerServer registers the http handlers for service Scanning to "mux". // UnaryRPC :call ScanningServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterScanningHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterScanningHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ScanningServer) error { - - mux.Handle("POST", pattern_Scanning_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Scanning_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/Echo", runtime.WithHTTPPathPattern("/api/v2/scanning/echo")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/Echo", runtime.WithHTTPPathPattern("/api/v2/scanning/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Scanning_Echo_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Scanning_Echo_0(annotatedContext, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - - forward_Scanning_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - + forward_Scanning_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - - mux.Handle("POST", pattern_Scanning_FolderHashScan_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Scanning_FolderHashScan_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/FolderHashScan", runtime.WithHTTPPathPattern("/api/v2/scanning/hfh/scan")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/FolderHashScan", runtime.WithHTTPPathPattern("/api/v2/scanning/hfh/scan")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Scanning_FolderHashScan_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Scanning_FolderHashScan_0(annotatedContext, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - - forward_Scanning_FolderHashScan_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - + forward_Scanning_FolderHashScan_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) return nil @@ -158,25 +137,24 @@ func RegisterScanningHandlerServer(ctx context.Context, mux *runtime.ServeMux, s // RegisterScanningHandlerFromEndpoint is same as RegisterScanningHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterScanningHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterScanningHandler(ctx, mux, conn) } @@ -190,60 +168,51 @@ func RegisterScanningHandler(ctx context.Context, mux *runtime.ServeMux, conn *g // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ScanningClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ScanningClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "ScanningClient" to call the correct interceptors. +// "ScanningClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterScanningHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ScanningClient) error { - - mux.Handle("POST", pattern_Scanning_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Scanning_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/Echo", runtime.WithHTTPPathPattern("/api/v2/scanning/echo")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/Echo", runtime.WithHTTPPathPattern("/api/v2/scanning/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Scanning_Echo_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) + resp, md, err := request_Scanning_Echo_0(annotatedContext, inboundMarshaler, client, req, pathParams) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - - forward_Scanning_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - + forward_Scanning_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - - mux.Handle("POST", pattern_Scanning_FolderHashScan_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Scanning_FolderHashScan_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/FolderHashScan", runtime.WithHTTPPathPattern("/api/v2/scanning/hfh/scan")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/FolderHashScan", runtime.WithHTTPPathPattern("/api/v2/scanning/hfh/scan")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Scanning_FolderHashScan_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) + resp, md, err := request_Scanning_FolderHashScan_0(annotatedContext, inboundMarshaler, client, req, pathParams) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - - forward_Scanning_FolderHashScan_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - + forward_Scanning_FolderHashScan_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - return nil } var ( - pattern_Scanning_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "scanning", "echo"}, "")) - + pattern_Scanning_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "scanning", "echo"}, "")) pattern_Scanning_FolderHashScan_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"api", "v2", "scanning", "hfh", "scan"}, "")) ) var ( - forward_Scanning_Echo_0 = runtime.ForwardResponseMessage - + forward_Scanning_Echo_0 = runtime.ForwardResponseMessage forward_Scanning_FolderHashScan_0 = runtime.ForwardResponseMessage ) diff --git a/api/scanningv2/scanoss-scanning_grpc.pb.go b/api/scanningv2/scanoss-scanning_grpc.pb.go index 5df6077..b74db44 100644 --- a/api/scanningv2/scanoss-scanning_grpc.pb.go +++ b/api/scanningv2/scanoss-scanning_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.29.3 // source: scanoss/api/scanning/v2/scanoss-scanning.proto package scanningv2 @@ -43,8 +43,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( Scanning_Echo_FullMethodName = "/scanoss.api.scanning.v2.Scanning/Echo" @@ -54,6 +54,9 @@ const ( // ScanningClient is the client API for Scanning service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +// +// * +// Expose all of the SCANOSS Scanning RPCs here type ScanningClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -70,8 +73,9 @@ func NewScanningClient(cc grpc.ClientConnInterface) ScanningClient { } func (c *scanningClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Scanning_Echo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Scanning_Echo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -79,8 +83,9 @@ func (c *scanningClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opt } func (c *scanningClient) FolderHashScan(ctx context.Context, in *HFHRequest, opts ...grpc.CallOption) (*HFHResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(HFHResponse) - err := c.cc.Invoke(ctx, Scanning_FolderHashScan_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Scanning_FolderHashScan_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -89,7 +94,10 @@ func (c *scanningClient) FolderHashScan(ctx context.Context, in *HFHRequest, opt // ScanningServer is the server API for Scanning service. // All implementations must embed UnimplementedScanningServer -// for forward compatibility +// for forward compatibility. +// +// * +// Expose all of the SCANOSS Scanning RPCs here type ScanningServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -98,9 +106,12 @@ type ScanningServer interface { mustEmbedUnimplementedScanningServer() } -// UnimplementedScanningServer must be embedded to have forward compatible implementations. -type UnimplementedScanningServer struct { -} +// UnimplementedScanningServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedScanningServer struct{} func (UnimplementedScanningServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -109,6 +120,7 @@ func (UnimplementedScanningServer) FolderHashScan(context.Context, *HFHRequest) return nil, status.Errorf(codes.Unimplemented, "method FolderHashScan not implemented") } func (UnimplementedScanningServer) mustEmbedUnimplementedScanningServer() {} +func (UnimplementedScanningServer) testEmbeddedByValue() {} // UnsafeScanningServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to ScanningServer will @@ -118,6 +130,13 @@ type UnsafeScanningServer interface { } func RegisterScanningServer(s grpc.ServiceRegistrar, srv ScanningServer) { + // If the following call pancis, it indicates UnimplementedScanningServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Scanning_ServiceDesc, srv) } diff --git a/api/semgrepv2/scanoss-semgrep.pb.go b/api/semgrepv2/scanoss-semgrep.pb.go index 5a10328..f1bb002 100644 --- a/api/semgrepv2/scanoss-semgrep.pb.go +++ b/api/semgrepv2/scanoss-semgrep.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.36.1 +// protoc v5.29.3 // source: scanoss/api/semgrep/v2/scanoss-semgrep.proto package semgrepv2 @@ -50,26 +50,22 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Semgrep issue response data (JSON payload) type SemgrepResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Cryptography details Purls []*SemgrepResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *SemgrepResponse) Reset() { *x = SemgrepResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SemgrepResponse) String() string { @@ -80,7 +76,7 @@ func (*SemgrepResponse) ProtoMessage() {} func (x *SemgrepResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -110,23 +106,20 @@ func (x *SemgrepResponse) GetStatus() *commonv2.StatusResponse { } type SemgrepResponse_Issue struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + RuleID string `protobuf:"bytes,1,opt,name=ruleID,proto3" json:"ruleID,omitempty"` + From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` + To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` + Severity string `protobuf:"bytes,4,opt,name=severity,proto3" json:"severity,omitempty"` unknownFields protoimpl.UnknownFields - - RuleID string `protobuf:"bytes,1,opt,name=ruleID,proto3" json:"ruleID,omitempty"` - From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` - To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` - Severity string `protobuf:"bytes,4,opt,name=severity,proto3" json:"severity,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SemgrepResponse_Issue) Reset() { *x = SemgrepResponse_Issue{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SemgrepResponse_Issue) String() string { @@ -137,7 +130,7 @@ func (*SemgrepResponse_Issue) ProtoMessage() {} func (x *SemgrepResponse_Issue) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -181,22 +174,19 @@ func (x *SemgrepResponse_Issue) GetSeverity() string { } type SemgrepResponse_File struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + FileMD5 string `protobuf:"bytes,1,opt,name=fileMD5,proto3" json:"fileMD5,omitempty"` + Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` + Issues []*SemgrepResponse_Issue `protobuf:"bytes,3,rep,name=issues,proto3" json:"issues,omitempty"` unknownFields protoimpl.UnknownFields - - FileMD5 string `protobuf:"bytes,1,opt,name=fileMD5,proto3" json:"fileMD5,omitempty"` - Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` - Issues []*SemgrepResponse_Issue `protobuf:"bytes,3,rep,name=issues,proto3" json:"issues,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SemgrepResponse_File) Reset() { *x = SemgrepResponse_File{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SemgrepResponse_File) String() string { @@ -207,7 +197,7 @@ func (*SemgrepResponse_File) ProtoMessage() {} func (x *SemgrepResponse_File) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -244,22 +234,19 @@ func (x *SemgrepResponse_File) GetIssues() []*SemgrepResponse_Issue { } type SemgrepResponse_Purls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` + Files []*SemgrepResponse_File `protobuf:"bytes,3,rep,name=files,proto3" json:"files,omitempty"` unknownFields protoimpl.UnknownFields - - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` - Files []*SemgrepResponse_File `protobuf:"bytes,3,rep,name=files,proto3" json:"files,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SemgrepResponse_Purls) Reset() { *x = SemgrepResponse_Purls{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SemgrepResponse_Purls) String() string { @@ -270,7 +257,7 @@ func (*SemgrepResponse_Purls) ProtoMessage() {} func (x *SemgrepResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -400,7 +387,7 @@ func file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_rawDescGZIP() []byte { } var file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_goTypes = []interface{}{ +var file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_goTypes = []any{ (*SemgrepResponse)(nil), // 0: scanoss.api.semgrep.v2.SemgrepResponse (*SemgrepResponse_Issue)(nil), // 1: scanoss.api.semgrep.v2.SemgrepResponse.Issue (*SemgrepResponse_File)(nil), // 2: scanoss.api.semgrep.v2.SemgrepResponse.File @@ -431,56 +418,6 @@ func file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_init() { if File_scanoss_api_semgrep_v2_scanoss_semgrep_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SemgrepResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SemgrepResponse_Issue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SemgrepResponse_File); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SemgrepResponse_Purls); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/semgrepv2/scanoss-semgrep.pb.gw.go b/api/semgrepv2/scanoss-semgrep.pb.gw.go index 34361da..65c7621 100644 --- a/api/semgrepv2/scanoss-semgrep.pb.gw.go +++ b/api/semgrepv2/scanoss-semgrep.pb.gw.go @@ -10,6 +10,7 @@ package semgrepv2 import ( "context" + "errors" "io" "net/http" @@ -25,96 +26,77 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = errors.New + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join +) func request_Semgrep_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client SemgrepClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Semgrep_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server SemgrepServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err - } func request_Semgrep_GetIssues_0(ctx context.Context, marshaler runtime.Marshaler, client SemgrepClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetIssues(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Semgrep_GetIssues_0(ctx context.Context, marshaler runtime.Marshaler, server SemgrepServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.PurlRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.PurlRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetIssues(ctx, &protoReq) return msg, metadata, err - } // RegisterSemgrepHandlerServer registers the http handlers for service Semgrep to "mux". // UnaryRPC :call SemgrepServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterSemgrepHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, server SemgrepServer) error { - - mux.Handle("POST", pattern_Semgrep_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Semgrep_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -126,20 +108,15 @@ func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, se runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Semgrep_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Semgrep_GetIssues_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Semgrep_GetIssues_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -151,9 +128,7 @@ func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, se runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Semgrep_GetIssues_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -162,25 +137,24 @@ func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, se // RegisterSemgrepHandlerFromEndpoint is same as RegisterSemgrepHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterSemgrepHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterSemgrepHandler(ctx, mux, conn) } @@ -194,16 +168,13 @@ func RegisterSemgrepHandler(ctx context.Context, mux *runtime.ServeMux, conn *gr // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "SemgrepClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "SemgrepClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "SemgrepClient" to call the correct interceptors. +// "SemgrepClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterSemgrepHandlerClient(ctx context.Context, mux *runtime.ServeMux, client SemgrepClient) error { - - mux.Handle("POST", pattern_Semgrep_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Semgrep_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -214,18 +185,13 @@ func RegisterSemgrepHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Semgrep_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Semgrep_GetIssues_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Semgrep_GetIssues_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -236,22 +202,17 @@ func RegisterSemgrepHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Semgrep_GetIssues_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - return nil } var ( - pattern_Semgrep_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "semgrep", "echo"}, "")) - + pattern_Semgrep_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "semgrep", "echo"}, "")) pattern_Semgrep_GetIssues_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "semgrep", "issues"}, "")) ) var ( - forward_Semgrep_Echo_0 = runtime.ForwardResponseMessage - + forward_Semgrep_Echo_0 = runtime.ForwardResponseMessage forward_Semgrep_GetIssues_0 = runtime.ForwardResponseMessage ) diff --git a/api/semgrepv2/scanoss-semgrep_grpc.pb.go b/api/semgrepv2/scanoss-semgrep_grpc.pb.go index 49f1f3b..ef8a8ea 100644 --- a/api/semgrepv2/scanoss-semgrep_grpc.pb.go +++ b/api/semgrepv2/scanoss-semgrep_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.29.3 // source: scanoss/api/semgrep/v2/scanoss-semgrep.proto package semgrepv2 @@ -43,8 +43,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( Semgrep_Echo_FullMethodName = "/scanoss.api.semgrep.v2.Semgrep/Echo" @@ -54,6 +54,8 @@ const ( // SemgrepClient is the client API for Semgrep service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +// +// Expose all of the SCANOSS Cryptography RPCs here type SemgrepClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -70,8 +72,9 @@ func NewSemgrepClient(cc grpc.ClientConnInterface) SemgrepClient { } func (c *semgrepClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Semgrep_Echo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Semgrep_Echo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -79,8 +82,9 @@ func (c *semgrepClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts } func (c *semgrepClient) GetIssues(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*SemgrepResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SemgrepResponse) - err := c.cc.Invoke(ctx, Semgrep_GetIssues_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Semgrep_GetIssues_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -89,7 +93,9 @@ func (c *semgrepClient) GetIssues(ctx context.Context, in *commonv2.PurlRequest, // SemgrepServer is the server API for Semgrep service. // All implementations must embed UnimplementedSemgrepServer -// for forward compatibility +// for forward compatibility. +// +// Expose all of the SCANOSS Cryptography RPCs here type SemgrepServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -98,9 +104,12 @@ type SemgrepServer interface { mustEmbedUnimplementedSemgrepServer() } -// UnimplementedSemgrepServer must be embedded to have forward compatible implementations. -type UnimplementedSemgrepServer struct { -} +// UnimplementedSemgrepServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedSemgrepServer struct{} func (UnimplementedSemgrepServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -109,6 +118,7 @@ func (UnimplementedSemgrepServer) GetIssues(context.Context, *commonv2.PurlReque return nil, status.Errorf(codes.Unimplemented, "method GetIssues not implemented") } func (UnimplementedSemgrepServer) mustEmbedUnimplementedSemgrepServer() {} +func (UnimplementedSemgrepServer) testEmbeddedByValue() {} // UnsafeSemgrepServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to SemgrepServer will @@ -118,6 +128,13 @@ type UnsafeSemgrepServer interface { } func RegisterSemgrepServer(s grpc.ServiceRegistrar, srv SemgrepServer) { + // If the following call pancis, it indicates UnimplementedSemgrepServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Semgrep_ServiceDesc, srv) } diff --git a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go index 0fcb0f2..ba6ba83 100644 --- a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go +++ b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.36.1 +// protoc v5.29.3 // source: scanoss/api/vulnerabilities/v2/scanoss-vulnerabilities.proto package vulnerabilitiesv2 @@ -50,24 +50,20 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Vulnerability request data (JSON payload) type VulnerabilityRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // JSON vulnerability request purls - Purls []*VulnerabilityRequest_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` + Purls []*VulnerabilityRequest_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *VulnerabilityRequest) Reset() { *x = VulnerabilityRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VulnerabilityRequest) String() string { @@ -78,7 +74,7 @@ func (*VulnerabilityRequest) ProtoMessage() {} func (x *VulnerabilityRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -100,26 +96,22 @@ func (x *VulnerabilityRequest) GetPurls() []*VulnerabilityRequest_Purls { return nil } -// // Vulnerability CPE response data (JSON payload) type CpeResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Purl/CPE details Purls []*CpeResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CpeResponse) Reset() { *x = CpeResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CpeResponse) String() string { @@ -130,7 +122,7 @@ func (*CpeResponse) ProtoMessage() {} func (x *CpeResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -159,26 +151,22 @@ func (x *CpeResponse) GetStatus() *commonv2.StatusResponse { return nil } -// // Vulnerability response data (JSON payload) type VulnerabilityResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Vulnerability response details Purls []*VulnerabilityResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *VulnerabilityResponse) Reset() { *x = VulnerabilityResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VulnerabilityResponse) String() string { @@ -189,7 +177,7 @@ func (*VulnerabilityResponse) ProtoMessage() {} func (x *VulnerabilityResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -219,21 +207,18 @@ func (x *VulnerabilityResponse) GetStatus() *commonv2.StatusResponse { } type VulnerabilityRequest_Purls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` unknownFields protoimpl.UnknownFields - - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` + sizeCache protoimpl.SizeCache } func (x *VulnerabilityRequest_Purls) Reset() { *x = VulnerabilityRequest_Purls{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VulnerabilityRequest_Purls) String() string { @@ -244,7 +229,7 @@ func (*VulnerabilityRequest_Purls) ProtoMessage() {} func (x *VulnerabilityRequest_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -274,21 +259,18 @@ func (x *VulnerabilityRequest_Purls) GetRequirement() string { } type CpeResponse_Purls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Cpes []string `protobuf:"bytes,2,rep,name=cpes,proto3" json:"cpes,omitempty"` unknownFields protoimpl.UnknownFields - - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Cpes []string `protobuf:"bytes,2,rep,name=cpes,proto3" json:"cpes,omitempty"` + sizeCache protoimpl.SizeCache } func (x *CpeResponse_Purls) Reset() { *x = CpeResponse_Purls{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CpeResponse_Purls) String() string { @@ -299,7 +281,7 @@ func (*CpeResponse_Purls) ProtoMessage() {} func (x *CpeResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -329,27 +311,24 @@ func (x *CpeResponse_Purls) GetCpes() []string { } type VulnerabilityResponse_Vulnerabilities struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Cve string `protobuf:"bytes,2,opt,name=cve,proto3" json:"cve,omitempty"` + Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` + Summary string `protobuf:"bytes,4,opt,name=summary,proto3" json:"summary,omitempty"` + Severity string `protobuf:"bytes,5,opt,name=severity,proto3" json:"severity,omitempty"` + Published string `protobuf:"bytes,6,opt,name=published,proto3" json:"published,omitempty"` + Modified string `protobuf:"bytes,7,opt,name=modified,proto3" json:"modified,omitempty"` + Source string `protobuf:"bytes,8,opt,name=source,proto3" json:"source,omitempty"` unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Cve string `protobuf:"bytes,2,opt,name=cve,proto3" json:"cve,omitempty"` - Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` - Summary string `protobuf:"bytes,4,opt,name=summary,proto3" json:"summary,omitempty"` - Severity string `protobuf:"bytes,5,opt,name=severity,proto3" json:"severity,omitempty"` - Published string `protobuf:"bytes,6,opt,name=published,proto3" json:"published,omitempty"` - Modified string `protobuf:"bytes,7,opt,name=modified,proto3" json:"modified,omitempty"` - Source string `protobuf:"bytes,8,opt,name=source,proto3" json:"source,omitempty"` + sizeCache protoimpl.SizeCache } func (x *VulnerabilityResponse_Vulnerabilities) Reset() { *x = VulnerabilityResponse_Vulnerabilities{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VulnerabilityResponse_Vulnerabilities) String() string { @@ -360,7 +339,7 @@ func (*VulnerabilityResponse_Vulnerabilities) ProtoMessage() {} func (x *VulnerabilityResponse_Vulnerabilities) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -432,21 +411,18 @@ func (x *VulnerabilityResponse_Vulnerabilities) GetSource() string { } type VulnerabilityResponse_Purls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` Vulnerabilities []*VulnerabilityResponse_Vulnerabilities `protobuf:"bytes,2,rep,name=vulnerabilities,proto3" json:"vulnerabilities,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *VulnerabilityResponse_Purls) Reset() { *x = VulnerabilityResponse_Purls{} - if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VulnerabilityResponse_Purls) String() string { @@ -457,7 +433,7 @@ func (*VulnerabilityResponse_Purls) ProtoMessage() {} func (x *VulnerabilityResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -623,7 +599,7 @@ func file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_rawDescGZ } var file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_goTypes = []interface{}{ +var file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_goTypes = []any{ (*VulnerabilityRequest)(nil), // 0: scanoss.api.vulnerabilities.v2.VulnerabilityRequest (*CpeResponse)(nil), // 1: scanoss.api.vulnerabilities.v2.CpeResponse (*VulnerabilityResponse)(nil), // 2: scanoss.api.vulnerabilities.v2.VulnerabilityResponse @@ -660,92 +636,6 @@ func file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_init() { if File_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VulnerabilityRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CpeResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VulnerabilityResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VulnerabilityRequest_Purls); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CpeResponse_Purls); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VulnerabilityResponse_Vulnerabilities); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VulnerabilityResponse_Purls); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go index a875d4d..e863757 100644 --- a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go +++ b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go @@ -10,6 +10,7 @@ package vulnerabilitiesv2 import ( "context" + "errors" "io" "net/http" @@ -25,130 +26,101 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = errors.New + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join +) func request_Vulnerabilities_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client VulnerabilitiesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Vulnerabilities_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server VulnerabilitiesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq commonv2.EchoRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq commonv2.EchoRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err - } func request_Vulnerabilities_GetCpes_0(ctx context.Context, marshaler runtime.Marshaler, client VulnerabilitiesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq VulnerabilityRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq VulnerabilityRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetCpes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Vulnerabilities_GetCpes_0(ctx context.Context, marshaler runtime.Marshaler, server VulnerabilitiesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq VulnerabilityRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq VulnerabilityRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetCpes(ctx, &protoReq) return msg, metadata, err - } func request_Vulnerabilities_GetVulnerabilities_0(ctx context.Context, marshaler runtime.Marshaler, client VulnerabilitiesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq VulnerabilityRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq VulnerabilityRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.GetVulnerabilities(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Vulnerabilities_GetVulnerabilities_0(ctx context.Context, marshaler runtime.Marshaler, server VulnerabilitiesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq VulnerabilityRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq VulnerabilityRequest + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetVulnerabilities(ctx, &protoReq) return msg, metadata, err - } // RegisterVulnerabilitiesHandlerServer registers the http handlers for service Vulnerabilities to "mux". // UnaryRPC :call VulnerabilitiesServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterVulnerabilitiesHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.ServeMux, server VulnerabilitiesServer) error { - - mux.Handle("POST", pattern_Vulnerabilities_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Vulnerabilities_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -160,20 +132,15 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Vulnerabilities_GetCpes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Vulnerabilities_GetCpes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -185,20 +152,15 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_GetCpes_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Vulnerabilities_GetVulnerabilities_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Vulnerabilities_GetVulnerabilities_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -210,9 +172,7 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_GetVulnerabilities_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -221,25 +181,24 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv // RegisterVulnerabilitiesHandlerFromEndpoint is same as RegisterVulnerabilitiesHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterVulnerabilitiesHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterVulnerabilitiesHandler(ctx, mux, conn) } @@ -253,16 +212,13 @@ func RegisterVulnerabilitiesHandler(ctx context.Context, mux *runtime.ServeMux, // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "VulnerabilitiesClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "VulnerabilitiesClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "VulnerabilitiesClient" to call the correct interceptors. +// "VulnerabilitiesClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.ServeMux, client VulnerabilitiesClient) error { - - mux.Handle("POST", pattern_Vulnerabilities_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Vulnerabilities_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -273,18 +229,13 @@ func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Vulnerabilities_GetCpes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Vulnerabilities_GetCpes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -295,18 +246,13 @@ func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_GetCpes_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Vulnerabilities_GetVulnerabilities_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Vulnerabilities_GetVulnerabilities_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -317,26 +263,19 @@ func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_GetVulnerabilities_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - return nil } var ( - pattern_Vulnerabilities_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "vulnerabilities", "echo"}, "")) - - pattern_Vulnerabilities_GetCpes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "vulnerabilities", "cpes"}, "")) - + pattern_Vulnerabilities_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "vulnerabilities", "echo"}, "")) + pattern_Vulnerabilities_GetCpes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "vulnerabilities", "cpes"}, "")) pattern_Vulnerabilities_GetVulnerabilities_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2}, []string{"api", "v2", "vulnerabilities"}, "")) ) var ( - forward_Vulnerabilities_Echo_0 = runtime.ForwardResponseMessage - - forward_Vulnerabilities_GetCpes_0 = runtime.ForwardResponseMessage - + forward_Vulnerabilities_Echo_0 = runtime.ForwardResponseMessage + forward_Vulnerabilities_GetCpes_0 = runtime.ForwardResponseMessage forward_Vulnerabilities_GetVulnerabilities_0 = runtime.ForwardResponseMessage ) diff --git a/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go b/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go index 2c18a0c..c8084c1 100644 --- a/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go +++ b/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.29.3 // source: scanoss/api/vulnerabilities/v2/scanoss-vulnerabilities.proto package vulnerabilitiesv2 @@ -43,8 +43,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( Vulnerabilities_Echo_FullMethodName = "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo" @@ -55,6 +55,8 @@ const ( // VulnerabilitiesClient is the client API for Vulnerabilities service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +// +// Expose all of the SCANOSS Vulnerability RPCs here type VulnerabilitiesClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -73,8 +75,9 @@ func NewVulnerabilitiesClient(cc grpc.ClientConnInterface) VulnerabilitiesClient } func (c *vulnerabilitiesClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Vulnerabilities_Echo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Vulnerabilities_Echo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -82,8 +85,9 @@ func (c *vulnerabilitiesClient) Echo(ctx context.Context, in *commonv2.EchoReque } func (c *vulnerabilitiesClient) GetCpes(ctx context.Context, in *VulnerabilityRequest, opts ...grpc.CallOption) (*CpeResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CpeResponse) - err := c.cc.Invoke(ctx, Vulnerabilities_GetCpes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Vulnerabilities_GetCpes_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -91,8 +95,9 @@ func (c *vulnerabilitiesClient) GetCpes(ctx context.Context, in *VulnerabilityRe } func (c *vulnerabilitiesClient) GetVulnerabilities(ctx context.Context, in *VulnerabilityRequest, opts ...grpc.CallOption) (*VulnerabilityResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(VulnerabilityResponse) - err := c.cc.Invoke(ctx, Vulnerabilities_GetVulnerabilities_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Vulnerabilities_GetVulnerabilities_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -101,7 +106,9 @@ func (c *vulnerabilitiesClient) GetVulnerabilities(ctx context.Context, in *Vuln // VulnerabilitiesServer is the server API for Vulnerabilities service. // All implementations must embed UnimplementedVulnerabilitiesServer -// for forward compatibility +// for forward compatibility. +// +// Expose all of the SCANOSS Vulnerability RPCs here type VulnerabilitiesServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -112,9 +119,12 @@ type VulnerabilitiesServer interface { mustEmbedUnimplementedVulnerabilitiesServer() } -// UnimplementedVulnerabilitiesServer must be embedded to have forward compatible implementations. -type UnimplementedVulnerabilitiesServer struct { -} +// UnimplementedVulnerabilitiesServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedVulnerabilitiesServer struct{} func (UnimplementedVulnerabilitiesServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -126,6 +136,7 @@ func (UnimplementedVulnerabilitiesServer) GetVulnerabilities(context.Context, *V return nil, status.Errorf(codes.Unimplemented, "method GetVulnerabilities not implemented") } func (UnimplementedVulnerabilitiesServer) mustEmbedUnimplementedVulnerabilitiesServer() {} +func (UnimplementedVulnerabilitiesServer) testEmbeddedByValue() {} // UnsafeVulnerabilitiesServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to VulnerabilitiesServer will @@ -135,6 +146,13 @@ type UnsafeVulnerabilitiesServer interface { } func RegisterVulnerabilitiesServer(s grpc.ServiceRegistrar, srv VulnerabilitiesServer) { + // If the following call pancis, it indicates UnimplementedVulnerabilitiesServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Vulnerabilities_ServiceDesc, srv) } diff --git a/protobuf/scanoss/api/common/v2/scanoss-common.proto b/protobuf/scanoss/api/common/v2/scanoss-common.proto index cd1c066..1621478 100644 --- a/protobuf/scanoss/api/common/v2/scanoss-common.proto +++ b/protobuf/scanoss/api/common/v2/scanoss-common.proto @@ -69,6 +69,7 @@ message EchoResponse { * Purl request data (JSON payload) */ message PurlRequest { + // TODO: Replace by Purl message message Purls { // @description: purl to be requested string purl = 1; @@ -78,3 +79,10 @@ message PurlRequest { repeated Purls purls = 1; } +/* +* Purl to be requested +*/ +message Purl { + string purl = 1; + string requirement = 2; +} diff --git a/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json b/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json index 6e6e45b..9b8bd58 100644 --- a/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json +++ b/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json @@ -471,7 +471,8 @@ "requirement": { "type": "string" } - } + }, + "title": "TODO: Replace by Purl message" }, "v2StatusCode": { "type": "string", diff --git a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto index c9e1192..9848722 100644 --- a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto +++ b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto @@ -79,7 +79,7 @@ service Dependencies { }; }; - rpc GetTransitiveDependencies(TransitiveDependencyRequest) returns(DependencyResponse) { + rpc GetTransitiveDependencies(TransitiveDependencyRequest) returns(TransitiveDependencyResponse) { option (google.api.http) = { post: "/api/v2/dependencies/transitive" body: "*" @@ -150,10 +150,12 @@ message DependencyResponse { message TransitiveDependencyRequest { string ecosystem = 1; - // List of Purls from the same ecosystem - scanoss.api.common.v2.PurlRequest purls = 2; // Depth to go when searching dependencies - int32 depth = 3; + int32 depth = 2; + // Limit used on response + int32 limit = 3; + // List of Purls from the same ecosystem + repeated scanoss.api.common.v2.Purl purls = 4; } /* @@ -166,6 +168,8 @@ message TransitiveDependencyResponse { } // Dependency response details repeated Dependencies dependencies = 1; - // Response status (required?) + // Response status scanoss.api.common.v2.StatusResponse status = 2; -} \ No newline at end of file +} + + diff --git a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json index 3608bd0..20e60e9 100644 --- a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json +++ b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json @@ -106,7 +106,7 @@ "200": { "description": "A successful response.", "schema": { - "$ref": "#/definitions/v2DependencyResponse" + "$ref": "#/definitions/v2TransitiveDependencyResponse" } }, "404": { @@ -323,30 +323,17 @@ }, "title": "Echo Message Response" }, - "v2PurlRequest": { - "type": "object", - "properties": { - "purls": { - "type": "array", - "items": { - "$ref": "#/definitions/v2PurlRequestPurls" - }, - "title": "JSON request purls" - } - }, - "title": "Purl request data (JSON payload)" - }, - "v2PurlRequestPurls": { + "v2Purl": { "type": "object", "properties": { "purl": { - "type": "string", - "title": "@description: purl to be requested" + "type": "string" }, "requirement": { "type": "string" } - } + }, + "title": "Purl to be requested" }, "v2StatusCode": { "type": "string", @@ -380,14 +367,50 @@ "ecosystem": { "type": "string" }, - "purls": { - "$ref": "#/definitions/v2PurlRequest", - "title": "List of Purls from the same ecosystem" - }, "depth": { "type": "integer", "format": "int32", "title": "Depth to go when searching dependencies" + }, + "limit": { + "type": "integer", + "format": "int32", + "title": "Limit used on response" + }, + "purls": { + "type": "array", + "items": { + "$ref": "#/definitions/v2Purl" + }, + "title": "List of Purls from the same ecosystem" + } + } + }, + "v2TransitiveDependencyResponse": { + "type": "object", + "properties": { + "dependencies": { + "type": "array", + "items": { + "$ref": "#/definitions/v2TransitiveDependencyResponseDependencies" + }, + "title": "Dependency response details" + }, + "status": { + "$ref": "#/definitions/v2StatusResponse", + "title": "Response status" + } + }, + "title": "Transitive dependency response data (JSON payload)" + }, + "v2TransitiveDependencyResponseDependencies": { + "type": "object", + "properties": { + "purl": { + "type": "string" + }, + "version": { + "type": "string" } } } diff --git a/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json b/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json index 7516558..6dad99b 100644 --- a/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json +++ b/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json @@ -252,7 +252,8 @@ "requirement": { "type": "string" } - } + }, + "title": "TODO: Replace by Purl message" }, "v2StatusCode": { "type": "string", diff --git a/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json b/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json index caac2fb..86f016b 100644 --- a/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json +++ b/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json @@ -170,7 +170,7 @@ "properties": { "type_url": { "type": "string", - "description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n URL, or have them precompiled into a binary to avoid any\n lookup. Therefore, binary compatibility needs to be preserved\n on changes to types. (Use versioned type names to manage\n breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics." + "description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n URL, or have them precompiled into a binary to avoid any\n lookup. Therefore, binary compatibility needs to be preserved\n on changes to types. (Use versioned type names to manage\n breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com. As of May 2023, there are no widely used type server\nimplementations and no plans to implement one.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics." }, "value": { "type": "string", @@ -178,7 +178,7 @@ "description": "Must be a valid serialized protocol buffer of the above specified type." } }, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n\nExample 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\nExample 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" }, "runtimeError": { "type": "object", diff --git a/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json b/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json index 1858b0f..ae1e430 100644 --- a/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json +++ b/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json @@ -212,7 +212,8 @@ "requirement": { "type": "string" } - } + }, + "title": "TODO: Replace by Purl message" }, "v2SemgrepResponse": { "type": "object", From bfaa5834926267a051e8af4c17c0fe944d55edab Mon Sep 17 00:00:00 2001 From: Agustin Isasmendi Date: Fri, 28 Mar 2025 10:49:33 +0100 Subject: [PATCH 5/9] chore(scanoss-common): reword TODO making it more explicit --- protobuf/scanoss/api/common/v2/scanoss-common.proto | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/protobuf/scanoss/api/common/v2/scanoss-common.proto b/protobuf/scanoss/api/common/v2/scanoss-common.proto index 1621478..aec3a3a 100644 --- a/protobuf/scanoss/api/common/v2/scanoss-common.proto +++ b/protobuf/scanoss/api/common/v2/scanoss-common.proto @@ -69,7 +69,13 @@ message EchoResponse { * Purl request data (JSON payload) */ message PurlRequest { - // TODO: Replace by Purl message + + /* + TODO: Refactor this API + - Remove nested Purls message and replace with top-level Purl message type. + - Update field definition below to: repeated Purl purls = 1; + */ + message Purls { // @description: purl to be requested string purl = 1; @@ -80,8 +86,8 @@ message PurlRequest { } /* -* Purl to be requested -*/ + * Purl to be requested + */ message Purl { string purl = 1; string requirement = 2; From 3ea4348136a38f67de80326523106d13823c21ee Mon Sep 17 00:00:00 2001 From: Agustin Isasmendi Date: Fri, 28 Mar 2025 13:09:25 +0100 Subject: [PATCH 6/9] feat(scanoss-dependencies): add TODO for scope fields in transitive dependency API --- .../api/dependencies/v2/scanoss-dependencies.proto | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto index 9848722..1b8def0 100644 --- a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto +++ b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto @@ -154,8 +154,15 @@ message TransitiveDependencyRequest { int32 depth = 2; // Limit used on response int32 limit = 3; + + /* TODO: Add scope filters: + repeated string scopes = 4; + Using a list of strings allows filtering by multiple scopes simultaneously + (e.g., include both "dev" and "test" dependencies in a single request) + */ + // List of Purls from the same ecosystem - repeated scanoss.api.common.v2.Purl purls = 4; + repeated scanoss.api.common.v2.Purl purls = 5; } /* @@ -165,6 +172,9 @@ message TransitiveDependencyResponse { message Dependencies { string purl = 2; string version = 3; + + // TODO: Add scope field + // optional string scope = 4; } // Dependency response details repeated Dependencies dependencies = 1; From 5a6503a6b0d742bafeba776ff35f6cd8616fd322 Mon Sep 17 00:00:00 2001 From: Agustin Isasmendi Date: Fri, 28 Mar 2025 13:48:39 +0100 Subject: [PATCH 7/9] chore(api): restore previous api stubs --- api/commonv2/scanoss-common.pb.go | 255 ++++---- api/componentsv2/scanoss-components.pb.go | 397 +++++++++--- api/componentsv2/scanoss-components.pb.gw.go | 237 ++++--- .../scanoss-components_grpc.pb.go | 43 +- api/cryptographyv2/scanoss-cryptography.pb.go | 390 ++++++++--- .../scanoss-cryptography.pb.gw.go | 345 ++++++---- .../scanoss-cryptography_grpc.pb.go | 49 +- api/dependenciesv2/scanoss-dependencies.pb.go | 609 +++++++----------- .../scanoss-dependencies.pb.gw.go | 194 +++--- .../scanoss-dependencies_grpc.pb.go | 79 +-- api/provenancev2/scanoss-provenance.pb.go | 132 +++- api/provenancev2/scanoss-provenance.pb.gw.go | 129 ++-- .../scanoss-provenance_grpc.pb.go | 39 +- api/scanningv2/scanoss-scanning.pb.go | 211 ++++-- api/scanningv2/scanoss-scanning.pb.gw.go | 153 +++-- api/scanningv2/scanoss-scanning_grpc.pb.go | 39 +- api/semgrepv2/scanoss-semgrep.pb.go | 141 ++-- api/semgrepv2/scanoss-semgrep.pb.gw.go | 129 ++-- api/semgrepv2/scanoss-semgrep_grpc.pb.go | 37 +- .../scanoss-vulnerabilities.pb.go | 238 +++++-- .../scanoss-vulnerabilities.pb.gw.go | 183 ++++-- .../scanoss-vulnerabilities_grpc.pb.go | 40 +- .../v2/scanoss-components.swagger.json | 3 +- .../v2/scanoss-dependencies.swagger.json | 158 +---- .../v2/scanoss-provenance.swagger.json | 3 +- .../scanning/v2/scanoss-scanning.swagger.json | 4 +- .../semgrep/v2/scanoss-semgrep.swagger.json | 3 +- 27 files changed, 2457 insertions(+), 1783 deletions(-) diff --git a/api/commonv2/scanoss-common.pb.go b/api/commonv2/scanoss-common.pb.go index 3c4df67..ad5d147 100644 --- a/api/commonv2/scanoss-common.pb.go +++ b/api/commonv2/scanoss-common.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.3 +// protoc-gen-go v1.30.0 +// protoc v5.27.3 // source: scanoss/api/common/v2/scanoss-common.proto package commonv2 @@ -47,6 +47,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// // Status code Enum type StatusCode int32 @@ -103,22 +104,26 @@ func (StatusCode) EnumDescriptor() ([]byte, []int) { return file_scanoss_api_common_v2_scanoss_common_proto_rawDescGZIP(), []int{0} } +// // Detailed response details type StatusResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // response status Status StatusCode `protobuf:"varint,1,opt,name=status,proto3,enum=scanoss.api.common.v2.StatusCode" json:"status,omitempty"` // Status message - Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` } func (x *StatusResponse) Reset() { *x = StatusResponse{} - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *StatusResponse) String() string { @@ -129,7 +134,7 @@ func (*StatusResponse) ProtoMessage() {} func (x *StatusResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[0] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -158,19 +163,23 @@ func (x *StatusResponse) GetMessage() string { return "" } +// // Echo Message Request type EchoRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` } func (x *EchoRequest) Reset() { *x = EchoRequest{} - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *EchoRequest) String() string { @@ -181,7 +190,7 @@ func (*EchoRequest) ProtoMessage() {} func (x *EchoRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[1] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -203,19 +212,23 @@ func (x *EchoRequest) GetMessage() string { return "" } +// // Echo Message Response type EchoResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` - Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` } func (x *EchoResponse) Reset() { *x = EchoResponse{} - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *EchoResponse) String() string { @@ -226,7 +239,7 @@ func (*EchoResponse) ProtoMessage() {} func (x *EchoResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[2] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -248,20 +261,24 @@ func (x *EchoResponse) GetMessage() string { return "" } +// // Purl request data (JSON payload) type PurlRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - // JSON request purls - Purls []*PurlRequest_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // JSON request purls + Purls []*PurlRequest_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` } func (x *PurlRequest) Reset() { *x = PurlRequest{} - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *PurlRequest) String() string { @@ -272,7 +289,7 @@ func (*PurlRequest) ProtoMessage() {} func (x *PurlRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[3] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -294,74 +311,23 @@ func (x *PurlRequest) GetPurls() []*PurlRequest_Purls { return nil } -// Purl to be requested -type Purl struct { - state protoimpl.MessageState `protogen:"open.v1"` - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` - unknownFields protoimpl.UnknownFields +type PurlRequest_Purls struct { + state protoimpl.MessageState sizeCache protoimpl.SizeCache -} - -func (x *Purl) Reset() { - *x = Purl{} - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *Purl) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Purl) ProtoMessage() {} - -func (x *Purl) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use Purl.ProtoReflect.Descriptor instead. -func (*Purl) Descriptor() ([]byte, []int) { - return file_scanoss_api_common_v2_scanoss_common_proto_rawDescGZIP(), []int{4} -} - -func (x *Purl) GetPurl() string { - if x != nil { - return x.Purl - } - return "" -} - -func (x *Purl) GetRequirement() string { - if x != nil { - return x.Requirement - } - return "" -} + unknownFields protoimpl.UnknownFields -// TODO: Replace by Purl message -type PurlRequest_Purls struct { - state protoimpl.MessageState `protogen:"open.v1"` // @description: purl to be requested - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` } func (x *PurlRequest_Purls) Reset() { *x = PurlRequest_Purls{} - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *PurlRequest_Purls) String() string { @@ -371,8 +337,8 @@ func (x *PurlRequest_Purls) String() string { func (*PurlRequest_Purls) ProtoMessage() {} func (x *PurlRequest_Purls) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[5] - if x != nil { + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -428,21 +394,17 @@ var file_scanoss_api_common_v2_scanoss_common_proto_rawDesc = []byte{ 0x05, 0x50, 0x75, 0x72, 0x6c, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0b, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3c, 0x0a, 0x04, - 0x50, 0x75, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x71, 0x75, - 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, - 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2a, 0x60, 0x0a, 0x0a, 0x53, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, - 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, - 0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x55, 0x43, 0x43, 0x45, 0x45, - 0x44, 0x45, 0x44, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, - 0x53, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x03, - 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x04, 0x42, 0x2f, 0x5a, 0x2d, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, - 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, - 0x6f, 0x6e, 0x76, 0x32, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x32, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0b, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2a, 0x60, 0x0a, 0x0a, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, + 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, + 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x55, 0x43, 0x43, + 0x45, 0x45, 0x44, 0x45, 0x44, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x49, + 0x4e, 0x47, 0x53, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, + 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x04, 0x42, 0x2f, + 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, + 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, + 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x32, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x32, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -458,19 +420,18 @@ func file_scanoss_api_common_v2_scanoss_common_proto_rawDescGZIP() []byte { } var file_scanoss_api_common_v2_scanoss_common_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_scanoss_api_common_v2_scanoss_common_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_scanoss_api_common_v2_scanoss_common_proto_goTypes = []any{ +var file_scanoss_api_common_v2_scanoss_common_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_scanoss_api_common_v2_scanoss_common_proto_goTypes = []interface{}{ (StatusCode)(0), // 0: scanoss.api.common.v2.StatusCode (*StatusResponse)(nil), // 1: scanoss.api.common.v2.StatusResponse (*EchoRequest)(nil), // 2: scanoss.api.common.v2.EchoRequest (*EchoResponse)(nil), // 3: scanoss.api.common.v2.EchoResponse (*PurlRequest)(nil), // 4: scanoss.api.common.v2.PurlRequest - (*Purl)(nil), // 5: scanoss.api.common.v2.Purl - (*PurlRequest_Purls)(nil), // 6: scanoss.api.common.v2.PurlRequest.Purls + (*PurlRequest_Purls)(nil), // 5: scanoss.api.common.v2.PurlRequest.Purls } var file_scanoss_api_common_v2_scanoss_common_proto_depIdxs = []int32{ 0, // 0: scanoss.api.common.v2.StatusResponse.status:type_name -> scanoss.api.common.v2.StatusCode - 6, // 1: scanoss.api.common.v2.PurlRequest.purls:type_name -> scanoss.api.common.v2.PurlRequest.Purls + 5, // 1: scanoss.api.common.v2.PurlRequest.purls:type_name -> scanoss.api.common.v2.PurlRequest.Purls 2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name @@ -483,13 +444,75 @@ func file_scanoss_api_common_v2_scanoss_common_proto_init() { if File_scanoss_api_common_v2_scanoss_common_proto != nil { return } + if !protoimpl.UnsafeEnabled { + file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StatusResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EchoRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EchoResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PurlRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PurlRequest_Purls); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_scanoss_api_common_v2_scanoss_common_proto_rawDesc, NumEnums: 1, - NumMessages: 6, + NumMessages: 5, NumExtensions: 0, NumServices: 0, }, diff --git a/api/componentsv2/scanoss-components.pb.go b/api/componentsv2/scanoss-components.pb.go index f54ef68..d03174c 100644 --- a/api/componentsv2/scanoss-components.pb.go +++ b/api/componentsv2/scanoss-components.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.3 +// protoc-gen-go v1.30.0 +// protoc v5.27.3 // source: scanoss/api/components/v2/scanoss-components.proto package componentsv2 @@ -50,9 +50,13 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// // Component Search request data (JSON payload) type CompSearchRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Component to search for (vendor/component/purl). Search is exclusive (will override vendor/component) Search string `protobuf:"bytes,1,opt,name=search,proto3" json:"search,omitempty"` // Vendor to search for. Vendor can be combined with Component @@ -64,16 +68,16 @@ type CompSearchRequest struct { // Number of matches to return - default 50 Limit int32 `protobuf:"varint,6,opt,name=limit,proto3" json:"limit,omitempty"` // Offset to submit to return the next (limit) of component matches - Offset int32 `protobuf:"varint,7,opt,name=offset,proto3" json:"offset,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Offset int32 `protobuf:"varint,7,opt,name=offset,proto3" json:"offset,omitempty"` } func (x *CompSearchRequest) Reset() { *x = CompSearchRequest{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompSearchRequest) String() string { @@ -84,7 +88,7 @@ func (*CompSearchRequest) ProtoMessage() {} func (x *CompSearchRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[0] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -142,20 +146,23 @@ func (x *CompSearchRequest) GetOffset() int32 { } type CompStatistic struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + TotalSourceFiles int32 `protobuf:"varint,1,opt,name=total_source_files,json=totalSourceFiles,proto3" json:"total_source_files,omitempty"` TotalLines int32 `protobuf:"varint,2,opt,name=total_lines,json=totalLines,proto3" json:"total_lines,omitempty"` TotalBlankLines int32 `protobuf:"varint,3,opt,name=total_blank_lines,json=totalBlankLines,proto3" json:"total_blank_lines,omitempty"` Languages []*CompStatistic_Language `protobuf:"bytes,4,rep,name=languages,proto3" json:"languages,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache } func (x *CompStatistic) Reset() { *x = CompStatistic{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompStatistic) String() string { @@ -166,7 +173,7 @@ func (*CompStatistic) ProtoMessage() {} func (x *CompStatistic) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[1] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -209,22 +216,26 @@ func (x *CompStatistic) GetLanguages() []*CompStatistic_Language { return nil } +// // Component Statistics response data (JSON payload) type CompStatisticResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Component statistic details Purls []*CompStatisticResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *CompStatisticResponse) Reset() { *x = CompStatisticResponse{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompStatisticResponse) String() string { @@ -235,7 +246,7 @@ func (*CompStatisticResponse) ProtoMessage() {} func (x *CompStatisticResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[2] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -264,22 +275,26 @@ func (x *CompStatisticResponse) GetStatus() *commonv2.StatusResponse { return nil } +// // Component Search response data (JSON payload) type CompSearchResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Component response details Components []*CompSearchResponse_Component `protobuf:"bytes,1,rep,name=components,proto3" json:"components,omitempty"` // Response status (required?) - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *CompSearchResponse) Reset() { *x = CompSearchResponse{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompSearchResponse) String() string { @@ -290,7 +305,7 @@ func (*CompSearchResponse) ProtoMessage() {} func (x *CompSearchResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[3] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -319,22 +334,26 @@ func (x *CompSearchResponse) GetStatus() *commonv2.StatusResponse { return nil } +// // Component Version request data (JSON payload) type CompVersionRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Component to search for (purl) Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // Number of versions to return - default 20 - Limit int32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Limit int32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` } func (x *CompVersionRequest) Reset() { *x = CompVersionRequest{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompVersionRequest) String() string { @@ -345,7 +364,7 @@ func (*CompVersionRequest) ProtoMessage() {} func (x *CompVersionRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[4] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -374,22 +393,26 @@ func (x *CompVersionRequest) GetLimit() int32 { return 0 } +// // Component Search response data (JSON payload) type CompVersionResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Component response details Component *CompVersionResponse_Component `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *CompVersionResponse) Reset() { *x = CompVersionResponse{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompVersionResponse) String() string { @@ -400,7 +423,7 @@ func (*CompVersionResponse) ProtoMessage() {} func (x *CompVersionResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[5] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -430,18 +453,21 @@ func (x *CompVersionResponse) GetStatus() *commonv2.StatusResponse { } type CompStatistic_Language struct { - state protoimpl.MessageState `protogen:"open.v1"` - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Files int32 `protobuf:"varint,2,opt,name=files,proto3" json:"files,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Files int32 `protobuf:"varint,2,opt,name=files,proto3" json:"files,omitempty"` } func (x *CompStatistic_Language) Reset() { *x = CompStatistic_Language{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompStatistic_Language) String() string { @@ -452,7 +478,7 @@ func (*CompStatistic_Language) ProtoMessage() {} func (x *CompStatistic_Language) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[6] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -482,19 +508,22 @@ func (x *CompStatistic_Language) GetFiles() int32 { } type CompStatisticResponse_Purls struct { - state protoimpl.MessageState `protogen:"open.v1"` - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` - Statistics *CompStatistic `protobuf:"bytes,3,opt,name=statistics,proto3" json:"statistics,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` + Statistics *CompStatistic `protobuf:"bytes,3,opt,name=statistics,proto3" json:"statistics,omitempty"` } func (x *CompStatisticResponse_Purls) Reset() { *x = CompStatisticResponse_Purls{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompStatisticResponse_Purls) String() string { @@ -505,7 +534,7 @@ func (*CompStatisticResponse_Purls) ProtoMessage() {} func (x *CompStatisticResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[7] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -543,19 +572,22 @@ func (x *CompStatisticResponse_Purls) GetStatistics() *CompStatistic { // Component details type CompSearchResponse_Component struct { - state protoimpl.MessageState `protogen:"open.v1"` - Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` - Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` - Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` + Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` + Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` } func (x *CompSearchResponse_Component) Reset() { *x = CompSearchResponse_Component{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompSearchResponse_Component) String() string { @@ -566,7 +598,7 @@ func (*CompSearchResponse_Component) ProtoMessage() {} func (x *CompSearchResponse_Component) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[8] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -604,20 +636,23 @@ func (x *CompSearchResponse_Component) GetUrl() string { // License details type CompVersionResponse_License struct { - state protoimpl.MessageState `protogen:"open.v1"` - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SpdxId string `protobuf:"bytes,2,opt,name=spdx_id,json=spdxId,proto3" json:"spdx_id,omitempty"` - IsSpdxApproved bool `protobuf:"varint,3,opt,name=is_spdx_approved,json=isSpdxApproved,proto3" json:"is_spdx_approved,omitempty"` - Url string `protobuf:"bytes,4,opt,name=url,proto3" json:"url,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + SpdxId string `protobuf:"bytes,2,opt,name=spdx_id,json=spdxId,proto3" json:"spdx_id,omitempty"` + IsSpdxApproved bool `protobuf:"varint,3,opt,name=is_spdx_approved,json=isSpdxApproved,proto3" json:"is_spdx_approved,omitempty"` + Url string `protobuf:"bytes,4,opt,name=url,proto3" json:"url,omitempty"` } func (x *CompVersionResponse_License) Reset() { *x = CompVersionResponse_License{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompVersionResponse_License) String() string { @@ -628,7 +663,7 @@ func (*CompVersionResponse_License) ProtoMessage() {} func (x *CompVersionResponse_License) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[9] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -673,18 +708,21 @@ func (x *CompVersionResponse_License) GetUrl() string { // Version details (including license) type CompVersionResponse_Version struct { - state protoimpl.MessageState `protogen:"open.v1"` - Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` - Licenses []*CompVersionResponse_License `protobuf:"bytes,4,rep,name=licenses,proto3" json:"licenses,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` + Licenses []*CompVersionResponse_License `protobuf:"bytes,4,rep,name=licenses,proto3" json:"licenses,omitempty"` } func (x *CompVersionResponse_Version) Reset() { *x = CompVersionResponse_Version{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompVersionResponse_Version) String() string { @@ -695,7 +733,7 @@ func (*CompVersionResponse_Version) ProtoMessage() {} func (x *CompVersionResponse_Version) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[10] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -726,20 +764,23 @@ func (x *CompVersionResponse_Version) GetLicenses() []*CompVersionResponse_Licen // Component details (including versions) type CompVersionResponse_Component struct { - state protoimpl.MessageState `protogen:"open.v1"` - Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` - Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` - Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` - Versions []*CompVersionResponse_Version `protobuf:"bytes,4,rep,name=versions,proto3" json:"versions,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` + Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` + Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` + Versions []*CompVersionResponse_Version `protobuf:"bytes,4,rep,name=versions,proto3" json:"versions,omitempty"` } func (x *CompVersionResponse_Component) Reset() { *x = CompVersionResponse_Component{} - mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CompVersionResponse_Component) String() string { @@ -750,7 +791,7 @@ func (*CompVersionResponse_Component) ProtoMessage() {} func (x *CompVersionResponse_Component) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[11] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -982,7 +1023,7 @@ func file_scanoss_api_components_v2_scanoss_components_proto_rawDescGZIP() []byt } var file_scanoss_api_components_v2_scanoss_components_proto_msgTypes = make([]protoimpl.MessageInfo, 12) -var file_scanoss_api_components_v2_scanoss_components_proto_goTypes = []any{ +var file_scanoss_api_components_v2_scanoss_components_proto_goTypes = []interface{}{ (*CompSearchRequest)(nil), // 0: scanoss.api.components.v2.CompSearchRequest (*CompStatistic)(nil), // 1: scanoss.api.components.v2.CompStatistic (*CompStatisticResponse)(nil), // 2: scanoss.api.components.v2.CompStatisticResponse @@ -1031,6 +1072,152 @@ func file_scanoss_api_components_v2_scanoss_components_proto_init() { if File_scanoss_api_components_v2_scanoss_components_proto != nil { return } + if !protoimpl.UnsafeEnabled { + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompSearchRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompStatistic); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompStatisticResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompSearchResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompVersionRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompVersionResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompStatistic_Language); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompStatisticResponse_Purls); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompSearchResponse_Component); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompVersionResponse_License); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompVersionResponse_Version); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_components_v2_scanoss_components_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompVersionResponse_Component); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/componentsv2/scanoss-components.pb.gw.go b/api/componentsv2/scanoss-components.pb.gw.go index f6268b8..b5cdbf6 100644 --- a/api/componentsv2/scanoss-components.pb.gw.go +++ b/api/componentsv2/scanoss-components.pb.gw.go @@ -10,7 +10,6 @@ package componentsv2 import ( "context" - "errors" "io" "net/http" @@ -26,125 +25,164 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = errors.New - _ = runtime.String - _ = utilities.NewDoubleArray - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = metadata.Join func request_Components_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client ComponentsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Components_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server ComponentsServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err + } func request_Components_SearchComponents_0(ctx context.Context, marshaler runtime.Marshaler, client ComponentsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq CompSearchRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq CompSearchRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.SearchComponents(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Components_SearchComponents_0(ctx context.Context, marshaler runtime.Marshaler, server ComponentsServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq CompSearchRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq CompSearchRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.SearchComponents(ctx, &protoReq) return msg, metadata, err + } func request_Components_GetComponentVersions_0(ctx context.Context, marshaler runtime.Marshaler, client ComponentsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq CompVersionRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq CompVersionRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetComponentVersions(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Components_GetComponentVersions_0(ctx context.Context, marshaler runtime.Marshaler, server ComponentsServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq CompVersionRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq CompVersionRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetComponentVersions(ctx, &protoReq) return msg, metadata, err + } func request_Components_GetComponentStatistics_0(ctx context.Context, marshaler runtime.Marshaler, client ComponentsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetComponentStatistics(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Components_GetComponentStatistics_0(ctx context.Context, marshaler runtime.Marshaler, server ComponentsServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetComponentStatistics(ctx, &protoReq) return msg, metadata, err + } // RegisterComponentsHandlerServer registers the http handlers for service Components to "mux". // UnaryRPC :call ComponentsServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterComponentsHandlerFromEndpoint instead. -// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ComponentsServer) error { - mux.Handle(http.MethodPost, pattern_Components_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Components_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -156,15 +194,20 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Components_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Components_SearchComponents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Components_SearchComponents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -176,15 +219,20 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Components_SearchComponents_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Components_GetComponentVersions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Components_GetComponentVersions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -196,15 +244,20 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Components_GetComponentVersions_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Components_GetComponentStatistics_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Components_GetComponentStatistics_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -216,7 +269,9 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Components_GetComponentStatistics_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -225,24 +280,25 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, // RegisterComponentsHandlerFromEndpoint is same as RegisterComponentsHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterComponentsHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.NewClient(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } }() }() + return RegisterComponentsHandler(ctx, mux, conn) } @@ -256,13 +312,16 @@ func RegisterComponentsHandler(ctx context.Context, mux *runtime.ServeMux, conn // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ComponentsClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ComponentsClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "ComponentsClient" to call the correct interceptors. This client ignores the HTTP middlewares. +// "ComponentsClient" to call the correct interceptors. func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ComponentsClient) error { - mux.Handle(http.MethodPost, pattern_Components_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Components_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -273,13 +332,18 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Components_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Components_SearchComponents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Components_SearchComponents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -290,13 +354,18 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Components_SearchComponents_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Components_GetComponentVersions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Components_GetComponentVersions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -307,13 +376,18 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Components_GetComponentVersions_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Components_GetComponentStatistics_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Components_GetComponentStatistics_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -324,21 +398,30 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Components_GetComponentStatistics_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + return nil } var ( - pattern_Components_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "echo"}, "")) - pattern_Components_SearchComponents_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "search"}, "")) - pattern_Components_GetComponentVersions_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "versions"}, "")) + pattern_Components_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "echo"}, "")) + + pattern_Components_SearchComponents_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "search"}, "")) + + pattern_Components_GetComponentVersions_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "versions"}, "")) + pattern_Components_GetComponentStatistics_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "components", "statistics"}, "")) ) var ( - forward_Components_Echo_0 = runtime.ForwardResponseMessage - forward_Components_SearchComponents_0 = runtime.ForwardResponseMessage - forward_Components_GetComponentVersions_0 = runtime.ForwardResponseMessage + forward_Components_Echo_0 = runtime.ForwardResponseMessage + + forward_Components_SearchComponents_0 = runtime.ForwardResponseMessage + + forward_Components_GetComponentVersions_0 = runtime.ForwardResponseMessage + forward_Components_GetComponentStatistics_0 = runtime.ForwardResponseMessage ) diff --git a/api/componentsv2/scanoss-components_grpc.pb.go b/api/componentsv2/scanoss-components_grpc.pb.go index aeae933..f030596 100644 --- a/api/componentsv2/scanoss-components_grpc.pb.go +++ b/api/componentsv2/scanoss-components_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.5.1 -// - protoc v5.29.3 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v5.27.3 // source: scanoss/api/components/v2/scanoss-components.proto package componentsv2 @@ -43,8 +43,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.64.0 or later. -const _ = grpc.SupportPackageIsVersion9 +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 const ( Components_Echo_FullMethodName = "/scanoss.api.components.v2.Components/Echo" @@ -56,8 +56,6 @@ const ( // ComponentsClient is the client API for Components service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -// -// Expose all of the SCANOSS Component RPCs here type ComponentsClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -78,9 +76,8 @@ func NewComponentsClient(cc grpc.ClientConnInterface) ComponentsClient { } func (c *componentsClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Components_Echo_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Components_Echo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -88,9 +85,8 @@ func (c *componentsClient) Echo(ctx context.Context, in *commonv2.EchoRequest, o } func (c *componentsClient) SearchComponents(ctx context.Context, in *CompSearchRequest, opts ...grpc.CallOption) (*CompSearchResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CompSearchResponse) - err := c.cc.Invoke(ctx, Components_SearchComponents_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Components_SearchComponents_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -98,9 +94,8 @@ func (c *componentsClient) SearchComponents(ctx context.Context, in *CompSearchR } func (c *componentsClient) GetComponentVersions(ctx context.Context, in *CompVersionRequest, opts ...grpc.CallOption) (*CompVersionResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CompVersionResponse) - err := c.cc.Invoke(ctx, Components_GetComponentVersions_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Components_GetComponentVersions_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -108,9 +103,8 @@ func (c *componentsClient) GetComponentVersions(ctx context.Context, in *CompVer } func (c *componentsClient) GetComponentStatistics(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*CompStatisticResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CompStatisticResponse) - err := c.cc.Invoke(ctx, Components_GetComponentStatistics_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Components_GetComponentStatistics_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -119,9 +113,7 @@ func (c *componentsClient) GetComponentStatistics(ctx context.Context, in *commo // ComponentsServer is the server API for Components service. // All implementations must embed UnimplementedComponentsServer -// for forward compatibility. -// -// Expose all of the SCANOSS Component RPCs here +// for forward compatibility type ComponentsServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -134,12 +126,9 @@ type ComponentsServer interface { mustEmbedUnimplementedComponentsServer() } -// UnimplementedComponentsServer must be embedded to have -// forward compatible implementations. -// -// NOTE: this should be embedded by value instead of pointer to avoid a nil -// pointer dereference when methods are called. -type UnimplementedComponentsServer struct{} +// UnimplementedComponentsServer must be embedded to have forward compatible implementations. +type UnimplementedComponentsServer struct { +} func (UnimplementedComponentsServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -154,7 +143,6 @@ func (UnimplementedComponentsServer) GetComponentStatistics(context.Context, *co return nil, status.Errorf(codes.Unimplemented, "method GetComponentStatistics not implemented") } func (UnimplementedComponentsServer) mustEmbedUnimplementedComponentsServer() {} -func (UnimplementedComponentsServer) testEmbeddedByValue() {} // UnsafeComponentsServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to ComponentsServer will @@ -164,13 +152,6 @@ type UnsafeComponentsServer interface { } func RegisterComponentsServer(s grpc.ServiceRegistrar, srv ComponentsServer) { - // If the following call pancis, it indicates UnimplementedComponentsServer was - // embedded by pointer and is nil. This will cause panics if an - // unimplemented method is ever invoked, so we test this at initialization - // time to prevent it from happening at runtime later due to I/O. - if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { - t.testEmbeddedByValue() - } s.RegisterService(&Components_ServiceDesc, srv) } diff --git a/api/cryptographyv2/scanoss-cryptography.pb.go b/api/cryptographyv2/scanoss-cryptography.pb.go index 9019fb6..c4cfc71 100644 --- a/api/cryptographyv2/scanoss-cryptography.pb.go +++ b/api/cryptographyv2/scanoss-cryptography.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.3 +// protoc-gen-go v1.30.0 +// protoc v5.27.3 // source: scanoss/api/cryptography/v2/scanoss-cryptography.proto package cryptographyv2 @@ -50,22 +50,26 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// // Cryptographic algorithm details type Algorithm struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Name of the detected algorithm Algorithm string `protobuf:"bytes,1,opt,name=algorithm,proto3" json:"algorithm,omitempty"` // Algorithm strength - Strength string `protobuf:"bytes,2,opt,name=strength,proto3" json:"strength,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Strength string `protobuf:"bytes,2,opt,name=strength,proto3" json:"strength,omitempty"` } func (x *Algorithm) Reset() { *x = Algorithm{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *Algorithm) String() string { @@ -76,7 +80,7 @@ func (*Algorithm) ProtoMessage() {} func (x *Algorithm) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[0] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -105,22 +109,26 @@ func (x *Algorithm) GetStrength() string { return "" } +// // Cryptographic Algorithm response data type AlgorithmResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Cryptography details Purls []*AlgorithmResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *AlgorithmResponse) Reset() { *x = AlgorithmResponse{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *AlgorithmResponse) String() string { @@ -131,7 +139,7 @@ func (*AlgorithmResponse) ProtoMessage() {} func (x *AlgorithmResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[1] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -160,22 +168,26 @@ func (x *AlgorithmResponse) GetStatus() *commonv2.StatusResponse { return nil } +// // Cryptographic Algorithm response data for a given range or criteria type AlgorithmsInRangeResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Cryptography details Purls []*AlgorithmsInRangeResponse_Purl `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *AlgorithmsInRangeResponse) Reset() { *x = AlgorithmsInRangeResponse{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *AlgorithmsInRangeResponse) String() string { @@ -186,7 +198,7 @@ func (*AlgorithmsInRangeResponse) ProtoMessage() {} func (x *AlgorithmsInRangeResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[2] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -215,22 +227,26 @@ func (x *AlgorithmsInRangeResponse) GetStatus() *commonv2.StatusResponse { return nil } -// Versions with/without cryptographic algorithms detected for the given range or criteria +// +// Versions with/without cryptographic algorithms detected for the given range or criteria type VersionsInRangeResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Cryptography details Purls []*VersionsInRangeResponse_Purl `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *VersionsInRangeResponse) Reset() { *x = VersionsInRangeResponse{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *VersionsInRangeResponse) String() string { @@ -241,7 +257,7 @@ func (*VersionsInRangeResponse) ProtoMessage() {} func (x *VersionsInRangeResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[3] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -270,9 +286,13 @@ func (x *VersionsInRangeResponse) GetStatus() *commonv2.StatusResponse { return nil } +// // Structure to record hints of Encryption protocols, libraries, SDKs and frameworks type Hint struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // unique id Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // Name of protocol/library/sdk/framework @@ -284,16 +304,16 @@ type Hint struct { // Link to project main page, repository or documentation Url *string `protobuf:"bytes,5,opt,name=url,proto3,oneof" json:"url,omitempty"` // The purl of the original library/sdk/framework - Purl *string `protobuf:"bytes,6,opt,name=purl,proto3,oneof" json:"purl,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Purl *string `protobuf:"bytes,6,opt,name=purl,proto3,oneof" json:"purl,omitempty"` } func (x *Hint) Reset() { *x = Hint{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *Hint) String() string { @@ -304,7 +324,7 @@ func (*Hint) ProtoMessage() {} func (x *Hint) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -361,22 +381,26 @@ func (x *Hint) GetPurl() string { return "" } +// // Encryption Hints response data type HintsResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Purl encryption Hint Purls []*HintsResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *HintsResponse) Reset() { *x = HintsResponse{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *HintsResponse) String() string { @@ -387,7 +411,7 @@ func (*HintsResponse) ProtoMessage() {} func (x *HintsResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[5] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -416,23 +440,26 @@ func (x *HintsResponse) GetStatus() *commonv2.StatusResponse { return nil } -// * +//* // Hints of Encryption protocols, libraries, SDKs and frameworks for a purls in range type HintsInRangeResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Purl encryption hints Purls []*HintsInRangeResponse_Purl `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *HintsInRangeResponse) Reset() { *x = HintsInRangeResponse{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *HintsInRangeResponse) String() string { @@ -443,7 +470,7 @@ func (*HintsInRangeResponse) ProtoMessage() {} func (x *HintsInRangeResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[6] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -474,22 +501,25 @@ func (x *HintsInRangeResponse) GetStatus() *commonv2.StatusResponse { // Information for a given purl type AlgorithmResponse_Purls struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // The requested purl. Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // PURL version Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` // Algorithms list detected for that version - Algorithms []*Algorithm `protobuf:"bytes,3,rep,name=algorithms,proto3" json:"algorithms,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Algorithms []*Algorithm `protobuf:"bytes,3,rep,name=algorithms,proto3" json:"algorithms,omitempty"` } func (x *AlgorithmResponse_Purls) Reset() { *x = AlgorithmResponse_Purls{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *AlgorithmResponse_Purls) String() string { @@ -500,7 +530,7 @@ func (*AlgorithmResponse_Purls) ProtoMessage() {} func (x *AlgorithmResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[7] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -538,22 +568,25 @@ func (x *AlgorithmResponse_Purls) GetAlgorithms() []*Algorithm { // Information for a given PURL type AlgorithmsInRangeResponse_Purl struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // The requested purl Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // List of versions in that range that contains cryptography Versions []string `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"` // Algorithms list detected in that range - Algorithms []*Algorithm `protobuf:"bytes,3,rep,name=algorithms,proto3" json:"algorithms,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Algorithms []*Algorithm `protobuf:"bytes,3,rep,name=algorithms,proto3" json:"algorithms,omitempty"` } func (x *AlgorithmsInRangeResponse_Purl) Reset() { *x = AlgorithmsInRangeResponse_Purl{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *AlgorithmsInRangeResponse_Purl) String() string { @@ -564,7 +597,7 @@ func (*AlgorithmsInRangeResponse_Purl) ProtoMessage() {} func (x *AlgorithmsInRangeResponse_Purl) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[8] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -602,22 +635,25 @@ func (x *AlgorithmsInRangeResponse_Purl) GetAlgorithms() []*Algorithm { // Information for a given PURL type VersionsInRangeResponse_Purl struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // The requested purl Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // List of versions that contains cryptography VersionsWith []string `protobuf:"bytes,2,rep,name=versions_with,json=versionsWith,proto3" json:"versions_with,omitempty"` // List of versions that do not contain cryptography VersionsWithout []string `protobuf:"bytes,3,rep,name=versions_without,json=versionsWithout,proto3" json:"versions_without,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache } func (x *VersionsInRangeResponse_Purl) Reset() { *x = VersionsInRangeResponse_Purl{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *VersionsInRangeResponse_Purl) String() string { @@ -628,7 +664,7 @@ func (*VersionsInRangeResponse_Purl) ProtoMessage() {} func (x *VersionsInRangeResponse_Purl) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[9] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -666,22 +702,25 @@ func (x *VersionsInRangeResponse_Purl) GetVersionsWithout() []string { // Information for a given purl type HintsResponse_Purls struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // The requested purl. Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // PURL version Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` // Algorithms list detected for that version - Hints []*Hint `protobuf:"bytes,3,rep,name=hints,proto3" json:"hints,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Hints []*Hint `protobuf:"bytes,3,rep,name=hints,proto3" json:"hints,omitempty"` } func (x *HintsResponse_Purls) Reset() { *x = HintsResponse_Purls{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *HintsResponse_Purls) String() string { @@ -692,7 +731,7 @@ func (*HintsResponse_Purls) ProtoMessage() {} func (x *HintsResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[10] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -730,22 +769,25 @@ func (x *HintsResponse_Purls) GetHints() []*Hint { // Information about the requested purl type HintsInRangeResponse_Purl struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // The requested purl Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // List of versions in range Versions []string `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"` // Encryption hints - Hints []*Hint `protobuf:"bytes,3,rep,name=hints,proto3" json:"hints,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Hints []*Hint `protobuf:"bytes,3,rep,name=hints,proto3" json:"hints,omitempty"` } func (x *HintsInRangeResponse_Purl) Reset() { *x = HintsInRangeResponse_Purl{} - mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *HintsInRangeResponse_Purl) String() string { @@ -756,7 +798,7 @@ func (*HintsInRangeResponse_Purl) ProtoMessage() {} func (x *HintsInRangeResponse_Purl) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[11] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1002,7 +1044,7 @@ func file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_rawDescGZIP() [ } var file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes = make([]protoimpl.MessageInfo, 12) -var file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_goTypes = []any{ +var file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_goTypes = []interface{}{ (*Algorithm)(nil), // 0: scanoss.api.cryptography.v2.Algorithm (*AlgorithmResponse)(nil), // 1: scanoss.api.cryptography.v2.AlgorithmResponse (*AlgorithmsInRangeResponse)(nil), // 2: scanoss.api.cryptography.v2.AlgorithmsInRangeResponse @@ -1059,7 +1101,153 @@ func file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_init() { if File_scanoss_api_cryptography_v2_scanoss_cryptography_proto != nil { return } - file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4].OneofWrappers = []any{} + if !protoimpl.UnsafeEnabled { + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Algorithm); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AlgorithmResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AlgorithmsInRangeResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VersionsInRangeResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Hint); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HintsResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HintsInRangeResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AlgorithmResponse_Purls); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AlgorithmsInRangeResponse_Purl); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VersionsInRangeResponse_Purl); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HintsResponse_Purls); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HintsInRangeResponse_Purl); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_msgTypes[4].OneofWrappers = []interface{}{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/cryptographyv2/scanoss-cryptography.pb.gw.go b/api/cryptographyv2/scanoss-cryptography.pb.gw.go index 76d2093..65d1623 100644 --- a/api/cryptographyv2/scanoss-cryptography.pb.gw.go +++ b/api/cryptographyv2/scanoss-cryptography.pb.gw.go @@ -10,7 +10,6 @@ package cryptographyv2 import ( "context" - "errors" "io" "net/http" @@ -26,173 +25,232 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = errors.New - _ = runtime.String - _ = utilities.NewDoubleArray - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = metadata.Join func request_Cryptography_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Cryptography_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err + } func request_Cryptography_GetAlgorithms_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetAlgorithms(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Cryptography_GetAlgorithms_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetAlgorithms(ctx, &protoReq) return msg, metadata, err + } func request_Cryptography_GetAlgorithmsInRange_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetAlgorithmsInRange(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Cryptography_GetAlgorithmsInRange_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetAlgorithmsInRange(ctx, &protoReq) return msg, metadata, err + } func request_Cryptography_GetVersionsInRange_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetVersionsInRange(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Cryptography_GetVersionsInRange_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetVersionsInRange(ctx, &protoReq) return msg, metadata, err + } func request_Cryptography_GetHintsInRange_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetHintsInRange(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Cryptography_GetHintsInRange_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetHintsInRange(ctx, &protoReq) return msg, metadata, err + } func request_Cryptography_GetEncryptionHints_0(ctx context.Context, marshaler runtime.Marshaler, client CryptographyClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetEncryptionHints(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Cryptography_GetEncryptionHints_0(ctx context.Context, marshaler runtime.Marshaler, server CryptographyServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetEncryptionHints(ctx, &protoReq) return msg, metadata, err + } // RegisterCryptographyHandlerServer registers the http handlers for service Cryptography to "mux". // UnaryRPC :call CryptographyServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterCryptographyHandlerFromEndpoint instead. -// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMux, server CryptographyServer) error { - mux.Handle(http.MethodPost, pattern_Cryptography_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -204,15 +262,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Cryptography_GetAlgorithms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_GetAlgorithms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -224,15 +287,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_GetAlgorithms_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Cryptography_GetAlgorithmsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_GetAlgorithmsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -244,15 +312,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_GetAlgorithmsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Cryptography_GetVersionsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_GetVersionsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -264,15 +337,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_GetVersionsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Cryptography_GetHintsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_GetHintsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -284,15 +362,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_GetHintsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Cryptography_GetEncryptionHints_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_GetEncryptionHints_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -304,7 +387,9 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_GetEncryptionHints_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -313,24 +398,25 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu // RegisterCryptographyHandlerFromEndpoint is same as RegisterCryptographyHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterCryptographyHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.NewClient(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } }() }() + return RegisterCryptographyHandler(ctx, mux, conn) } @@ -344,13 +430,16 @@ func RegisterCryptographyHandler(ctx context.Context, mux *runtime.ServeMux, con // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "CryptographyClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "CryptographyClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "CryptographyClient" to call the correct interceptors. This client ignores the HTTP middlewares. +// "CryptographyClient" to call the correct interceptors. func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMux, client CryptographyClient) error { - mux.Handle(http.MethodPost, pattern_Cryptography_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -361,13 +450,18 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Cryptography_GetAlgorithms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_GetAlgorithms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -378,13 +472,18 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_GetAlgorithms_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Cryptography_GetAlgorithmsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_GetAlgorithmsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -395,13 +494,18 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_GetAlgorithmsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Cryptography_GetVersionsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_GetVersionsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -412,13 +516,18 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_GetVersionsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Cryptography_GetHintsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_GetHintsInRange_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -429,13 +538,18 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_GetHintsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Cryptography_GetEncryptionHints_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Cryptography_GetEncryptionHints_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -446,25 +560,38 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Cryptography_GetEncryptionHints_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + return nil } var ( - pattern_Cryptography_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "echo"}, "")) - pattern_Cryptography_GetAlgorithms_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "algorithms"}, "")) + pattern_Cryptography_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "echo"}, "")) + + pattern_Cryptography_GetAlgorithms_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "algorithms"}, "")) + pattern_Cryptography_GetAlgorithmsInRange_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "algorithmsInRange"}, "")) - pattern_Cryptography_GetVersionsInRange_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "versionsInRange"}, "")) - pattern_Cryptography_GetHintsInRange_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "hintsInRange"}, "")) - pattern_Cryptography_GetEncryptionHints_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "hints"}, "")) + + pattern_Cryptography_GetVersionsInRange_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "versionsInRange"}, "")) + + pattern_Cryptography_GetHintsInRange_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "hintsInRange"}, "")) + + pattern_Cryptography_GetEncryptionHints_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "cryptography", "hints"}, "")) ) var ( - forward_Cryptography_Echo_0 = runtime.ForwardResponseMessage - forward_Cryptography_GetAlgorithms_0 = runtime.ForwardResponseMessage + forward_Cryptography_Echo_0 = runtime.ForwardResponseMessage + + forward_Cryptography_GetAlgorithms_0 = runtime.ForwardResponseMessage + forward_Cryptography_GetAlgorithmsInRange_0 = runtime.ForwardResponseMessage - forward_Cryptography_GetVersionsInRange_0 = runtime.ForwardResponseMessage - forward_Cryptography_GetHintsInRange_0 = runtime.ForwardResponseMessage - forward_Cryptography_GetEncryptionHints_0 = runtime.ForwardResponseMessage + + forward_Cryptography_GetVersionsInRange_0 = runtime.ForwardResponseMessage + + forward_Cryptography_GetHintsInRange_0 = runtime.ForwardResponseMessage + + forward_Cryptography_GetEncryptionHints_0 = runtime.ForwardResponseMessage ) diff --git a/api/cryptographyv2/scanoss-cryptography_grpc.pb.go b/api/cryptographyv2/scanoss-cryptography_grpc.pb.go index c69f5c9..b886ce8 100644 --- a/api/cryptographyv2/scanoss-cryptography_grpc.pb.go +++ b/api/cryptographyv2/scanoss-cryptography_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.5.1 -// - protoc v5.29.3 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v5.27.3 // source: scanoss/api/cryptography/v2/scanoss-cryptography.proto package cryptographyv2 @@ -43,8 +43,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.64.0 or later. -const _ = grpc.SupportPackageIsVersion9 +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 const ( Cryptography_Echo_FullMethodName = "/scanoss.api.cryptography.v2.Cryptography/Echo" @@ -58,8 +58,6 @@ const ( // CryptographyClient is the client API for Cryptography service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -// -// Expose all of the SCANOSS Cryptography RPCs here type CryptographyClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -84,9 +82,8 @@ func NewCryptographyClient(cc grpc.ClientConnInterface) CryptographyClient { } func (c *cryptographyClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Cryptography_Echo_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Cryptography_Echo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -94,9 +91,8 @@ func (c *cryptographyClient) Echo(ctx context.Context, in *commonv2.EchoRequest, } func (c *cryptographyClient) GetAlgorithms(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*AlgorithmResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(AlgorithmResponse) - err := c.cc.Invoke(ctx, Cryptography_GetAlgorithms_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Cryptography_GetAlgorithms_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -104,9 +100,8 @@ func (c *cryptographyClient) GetAlgorithms(ctx context.Context, in *commonv2.Pur } func (c *cryptographyClient) GetAlgorithmsInRange(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*AlgorithmsInRangeResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(AlgorithmsInRangeResponse) - err := c.cc.Invoke(ctx, Cryptography_GetAlgorithmsInRange_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Cryptography_GetAlgorithmsInRange_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -114,9 +109,8 @@ func (c *cryptographyClient) GetAlgorithmsInRange(ctx context.Context, in *commo } func (c *cryptographyClient) GetVersionsInRange(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*VersionsInRangeResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(VersionsInRangeResponse) - err := c.cc.Invoke(ctx, Cryptography_GetVersionsInRange_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Cryptography_GetVersionsInRange_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -124,9 +118,8 @@ func (c *cryptographyClient) GetVersionsInRange(ctx context.Context, in *commonv } func (c *cryptographyClient) GetHintsInRange(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*HintsInRangeResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(HintsInRangeResponse) - err := c.cc.Invoke(ctx, Cryptography_GetHintsInRange_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Cryptography_GetHintsInRange_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -134,9 +127,8 @@ func (c *cryptographyClient) GetHintsInRange(ctx context.Context, in *commonv2.P } func (c *cryptographyClient) GetEncryptionHints(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*HintsResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(HintsResponse) - err := c.cc.Invoke(ctx, Cryptography_GetEncryptionHints_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Cryptography_GetEncryptionHints_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -145,9 +137,7 @@ func (c *cryptographyClient) GetEncryptionHints(ctx context.Context, in *commonv // CryptographyServer is the server API for Cryptography service. // All implementations must embed UnimplementedCryptographyServer -// for forward compatibility. -// -// Expose all of the SCANOSS Cryptography RPCs here +// for forward compatibility type CryptographyServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -164,12 +154,9 @@ type CryptographyServer interface { mustEmbedUnimplementedCryptographyServer() } -// UnimplementedCryptographyServer must be embedded to have -// forward compatible implementations. -// -// NOTE: this should be embedded by value instead of pointer to avoid a nil -// pointer dereference when methods are called. -type UnimplementedCryptographyServer struct{} +// UnimplementedCryptographyServer must be embedded to have forward compatible implementations. +type UnimplementedCryptographyServer struct { +} func (UnimplementedCryptographyServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -190,7 +177,6 @@ func (UnimplementedCryptographyServer) GetEncryptionHints(context.Context, *comm return nil, status.Errorf(codes.Unimplemented, "method GetEncryptionHints not implemented") } func (UnimplementedCryptographyServer) mustEmbedUnimplementedCryptographyServer() {} -func (UnimplementedCryptographyServer) testEmbeddedByValue() {} // UnsafeCryptographyServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to CryptographyServer will @@ -200,13 +186,6 @@ type UnsafeCryptographyServer interface { } func RegisterCryptographyServer(s grpc.ServiceRegistrar, srv CryptographyServer) { - // If the following call pancis, it indicates UnimplementedCryptographyServer was - // embedded by pointer and is nil. This will cause panics if an - // unimplemented method is ever invoked, so we test this at initialization - // time to prevent it from happening at runtime later due to I/O. - if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { - t.testEmbeddedByValue() - } s.RegisterService(&Cryptography_ServiceDesc, srv) } diff --git a/api/dependenciesv2/scanoss-dependencies.pb.go b/api/dependenciesv2/scanoss-dependencies.pb.go index 6b37dbe..c5bfd75 100644 --- a/api/dependenciesv2/scanoss-dependencies.pb.go +++ b/api/dependenciesv2/scanoss-dependencies.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.3 +// protoc-gen-go v1.30.0 +// protoc v5.27.3 // source: scanoss/api/dependencies/v2/scanoss-dependencies.proto package dependenciesv2 @@ -50,22 +50,26 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// // Dependency request data (JSON payload) type DependencyRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // List of dependency files Files []*DependencyRequest_Files `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"` // Depth to go when searching dependencies - Depth int32 `protobuf:"varint,2,opt,name=depth,proto3" json:"depth,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Depth int32 `protobuf:"varint,2,opt,name=depth,proto3" json:"depth,omitempty"` } func (x *DependencyRequest) Reset() { *x = DependencyRequest{} - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *DependencyRequest) String() string { @@ -76,7 +80,7 @@ func (*DependencyRequest) ProtoMessage() {} func (x *DependencyRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[0] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -105,22 +109,26 @@ func (x *DependencyRequest) GetDepth() int32 { return 0 } +// // Dependency response data (JSON payload) type DependencyResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Dependency response details Files []*DependencyResponse_Files `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"` // Response status (required?) - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *DependencyResponse) Reset() { *x = DependencyResponse{} - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *DependencyResponse) String() string { @@ -131,7 +139,7 @@ func (*DependencyResponse) ProtoMessage() {} func (x *DependencyResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[1] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -160,148 +168,25 @@ func (x *DependencyResponse) GetStatus() *commonv2.StatusResponse { return nil } -type TransitiveDependencyRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - Ecosystem string `protobuf:"bytes,1,opt,name=ecosystem,proto3" json:"ecosystem,omitempty"` - // Depth to go when searching dependencies - Depth int32 `protobuf:"varint,2,opt,name=depth,proto3" json:"depth,omitempty"` - // Limit used on response - Limit int32 `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"` - // List of Purls from the same ecosystem - Purls []*commonv2.Purl `protobuf:"bytes,4,rep,name=purls,proto3" json:"purls,omitempty"` - unknownFields protoimpl.UnknownFields +// List of Purls/requirements +type DependencyRequest_Purls struct { + state protoimpl.MessageState sizeCache protoimpl.SizeCache -} - -func (x *TransitiveDependencyRequest) Reset() { - *x = TransitiveDependencyRequest{} - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *TransitiveDependencyRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TransitiveDependencyRequest) ProtoMessage() {} - -func (x *TransitiveDependencyRequest) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TransitiveDependencyRequest.ProtoReflect.Descriptor instead. -func (*TransitiveDependencyRequest) Descriptor() ([]byte, []int) { - return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP(), []int{2} -} - -func (x *TransitiveDependencyRequest) GetEcosystem() string { - if x != nil { - return x.Ecosystem - } - return "" -} - -func (x *TransitiveDependencyRequest) GetDepth() int32 { - if x != nil { - return x.Depth - } - return 0 -} - -func (x *TransitiveDependencyRequest) GetLimit() int32 { - if x != nil { - return x.Limit - } - return 0 -} - -func (x *TransitiveDependencyRequest) GetPurls() []*commonv2.Purl { - if x != nil { - return x.Purls - } - return nil -} - -// Transitive dependency response data (JSON payload) -type TransitiveDependencyResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` - // Dependency response details - Dependencies []*TransitiveDependencyResponse_Dependencies `protobuf:"bytes,1,rep,name=dependencies,proto3" json:"dependencies,omitempty"` - // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *TransitiveDependencyResponse) Reset() { - *x = TransitiveDependencyResponse{} - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *TransitiveDependencyResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TransitiveDependencyResponse) ProtoMessage() {} - -func (x *TransitiveDependencyResponse) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TransitiveDependencyResponse.ProtoReflect.Descriptor instead. -func (*TransitiveDependencyResponse) Descriptor() ([]byte, []int) { - return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP(), []int{3} -} - -func (x *TransitiveDependencyResponse) GetDependencies() []*TransitiveDependencyResponse_Dependencies { - if x != nil { - return x.Dependencies - } - return nil -} - -func (x *TransitiveDependencyResponse) GetStatus() *commonv2.StatusResponse { - if x != nil { - return x.Status - } - return nil -} -// List of Purls/requirements -type DependencyRequest_Purls struct { - state protoimpl.MessageState `protogen:"open.v1"` // Purl name Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // requirement - optional - Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` // string scope = 3; // TODO what did we want scope for? - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` // string scope = 3; // TODO what did we want scope for? } func (x *DependencyRequest_Purls) Reset() { *x = DependencyRequest_Purls{} - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *DependencyRequest_Purls) String() string { @@ -311,8 +196,8 @@ func (x *DependencyRequest_Purls) String() string { func (*DependencyRequest_Purls) ProtoMessage() {} func (x *DependencyRequest_Purls) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] - if x != nil { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -343,20 +228,23 @@ func (x *DependencyRequest_Purls) GetRequirement() string { // List of dependency files type DependencyRequest_Files struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // dependency filename File string `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"` // List of purls - Purls []*DependencyRequest_Purls `protobuf:"bytes,2,rep,name=purls,proto3" json:"purls,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Purls []*DependencyRequest_Purls `protobuf:"bytes,2,rep,name=purls,proto3" json:"purls,omitempty"` } func (x *DependencyRequest_Files) Reset() { *x = DependencyRequest_Files{} - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *DependencyRequest_Files) String() string { @@ -366,8 +254,8 @@ func (x *DependencyRequest_Files) String() string { func (*DependencyRequest_Files) ProtoMessage() {} func (x *DependencyRequest_Files) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] - if x != nil { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -397,20 +285,23 @@ func (x *DependencyRequest_Files) GetPurls() []*DependencyRequest_Purls { } type DependencyResponse_Licenses struct { - state protoimpl.MessageState `protogen:"open.v1"` - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - SpdxId string `protobuf:"bytes,2,opt,name=spdx_id,json=spdxId,proto3" json:"spdx_id,omitempty"` - IsSpdxApproved bool `protobuf:"varint,3,opt,name=is_spdx_approved,json=isSpdxApproved,proto3" json:"is_spdx_approved,omitempty"` - Url string `protobuf:"bytes,4,opt,name=url,proto3" json:"url,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + SpdxId string `protobuf:"bytes,2,opt,name=spdx_id,json=spdxId,proto3" json:"spdx_id,omitempty"` + IsSpdxApproved bool `protobuf:"varint,3,opt,name=is_spdx_approved,json=isSpdxApproved,proto3" json:"is_spdx_approved,omitempty"` + Url string `protobuf:"bytes,4,opt,name=url,proto3" json:"url,omitempty"` } func (x *DependencyResponse_Licenses) Reset() { *x = DependencyResponse_Licenses{} - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *DependencyResponse_Licenses) String() string { @@ -420,8 +311,8 @@ func (x *DependencyResponse_Licenses) String() string { func (*DependencyResponse_Licenses) ProtoMessage() {} func (x *DependencyResponse_Licenses) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] - if x != nil { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -465,22 +356,25 @@ func (x *DependencyResponse_Licenses) GetUrl() string { } type DependencyResponse_Dependencies struct { - state protoimpl.MessageState `protogen:"open.v1"` - Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` - Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` - Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` - Licenses []*DependencyResponse_Licenses `protobuf:"bytes,4,rep,name=licenses,proto3" json:"licenses,omitempty"` - Url string `protobuf:"bytes,5,opt,name=url,proto3" json:"url,omitempty"` - Comment string `protobuf:"bytes,6,opt,name=comment,proto3" json:"comment,omitempty"` // string scope = 7; - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Component string `protobuf:"bytes,1,opt,name=component,proto3" json:"component,omitempty"` + Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` + Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` + Licenses []*DependencyResponse_Licenses `protobuf:"bytes,4,rep,name=licenses,proto3" json:"licenses,omitempty"` + Url string `protobuf:"bytes,5,opt,name=url,proto3" json:"url,omitempty"` + Comment string `protobuf:"bytes,6,opt,name=comment,proto3" json:"comment,omitempty"` // string scope = 7; } func (x *DependencyResponse_Dependencies) Reset() { *x = DependencyResponse_Dependencies{} - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *DependencyResponse_Dependencies) String() string { @@ -490,8 +384,8 @@ func (x *DependencyResponse_Dependencies) String() string { func (*DependencyResponse_Dependencies) ProtoMessage() {} func (x *DependencyResponse_Dependencies) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[7] - if x != nil { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -549,20 +443,23 @@ func (x *DependencyResponse_Dependencies) GetComment() string { } type DependencyResponse_Files struct { - state protoimpl.MessageState `protogen:"open.v1"` - File string `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"` - Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` - Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"` - Dependencies []*DependencyResponse_Dependencies `protobuf:"bytes,4,rep,name=dependencies,proto3" json:"dependencies,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + File string `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"` + Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` + Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"` + Dependencies []*DependencyResponse_Dependencies `protobuf:"bytes,4,rep,name=dependencies,proto3" json:"dependencies,omitempty"` } func (x *DependencyResponse_Files) Reset() { *x = DependencyResponse_Files{} - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *DependencyResponse_Files) String() string { @@ -572,8 +469,8 @@ func (x *DependencyResponse_Files) String() string { func (*DependencyResponse_Files) ProtoMessage() {} func (x *DependencyResponse_Files) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[8] - if x != nil { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -616,58 +513,6 @@ func (x *DependencyResponse_Files) GetDependencies() []*DependencyResponse_Depen return nil } -type TransitiveDependencyResponse_Dependencies struct { - state protoimpl.MessageState `protogen:"open.v1"` - Purl string `protobuf:"bytes,2,opt,name=purl,proto3" json:"purl,omitempty"` - Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *TransitiveDependencyResponse_Dependencies) Reset() { - *x = TransitiveDependencyResponse_Dependencies{} - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *TransitiveDependencyResponse_Dependencies) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TransitiveDependencyResponse_Dependencies) ProtoMessage() {} - -func (x *TransitiveDependencyResponse_Dependencies) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[9] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use TransitiveDependencyResponse_Dependencies.ProtoReflect.Descriptor instead. -func (*TransitiveDependencyResponse_Dependencies) Descriptor() ([]byte, []int) { - return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP(), []int{3, 0} -} - -func (x *TransitiveDependencyResponse_Dependencies) GetPurl() string { - if x != nil { - return x.Purl - } - return "" -} - -func (x *TransitiveDependencyResponse_Dependencies) GetVersion() string { - if x != nil { - return x.Version - } - return "" -} - var File_scanoss_api_dependencies_v2_scanoss_dependencies_proto protoreflect.FileDescriptor var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDesc = []byte{ @@ -743,83 +588,44 @@ var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDesc = []byte 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x52, 0x0c, - 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x22, 0x9a, 0x01, 0x0a, - 0x1b, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, - 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, - 0x65, 0x63, 0x6f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x09, 0x65, 0x63, 0x6f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, - 0x70, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x70, 0x74, 0x68, - 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x31, 0x0a, 0x05, 0x70, 0x75, 0x72, 0x6c, 0x73, 0x18, - 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, - 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x75, - 0x72, 0x6c, 0x52, 0x05, 0x70, 0x75, 0x72, 0x6c, 0x73, 0x22, 0x87, 0x02, 0x0a, 0x1c, 0x54, 0x72, - 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, - 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6a, 0x0a, 0x0c, 0x64, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x46, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, - 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x54, - 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x65, 0x70, 0x65, - 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x52, 0x0c, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, - 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x3d, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, - 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x53, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x06, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a, 0x3c, 0x0a, 0x0c, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x32, 0xe7, 0x03, 0x0a, 0x0c, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, - 0x63, 0x69, 0x65, 0x73, 0x12, 0x75, 0x0a, 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x22, 0x2e, 0x73, - 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, - 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x01, 0x2a, - 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, - 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x12, 0xa0, 0x01, 0x0a, 0x0f, - 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, - 0x2e, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x2f, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x3a, 0x01, 0x2a, 0x22, 0x21, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, - 0x73, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0xbc, - 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, - 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x38, 0x2e, 0x73, - 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, - 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, - 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x39, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, - 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, - 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, - 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x3a, 0x01, 0x2a, 0x22, 0x1f, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, - 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x42, 0x9c, 0x02, - 0x92, 0x41, 0xdd, 0x01, 0x12, 0x77, 0x0a, 0x1a, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, - 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x22, 0x54, 0x0a, 0x14, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x64, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x27, 0x68, 0x74, 0x74, 0x70, - 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, - 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x69, 0x65, 0x73, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, - 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, - 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, - 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, - 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, - 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, - 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, - 0x07, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, - 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, - 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x3b, 0x64, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x32, 0xa8, 0x02, 0x0a, + 0x0c, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x75, 0x0a, + 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, + 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, + 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, + 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x24, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x01, 0x2a, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x76, 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2f, + 0x65, 0x63, 0x68, 0x6f, 0x12, 0xa0, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, + 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x2e, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, + 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, + 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x26, 0x3a, 0x01, 0x2a, 0x22, 0x21, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x42, 0x9c, 0x02, 0x92, 0x41, 0xdd, 0x01, 0x12, 0x77, + 0x0a, 0x1a, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, + 0x65, 0x6e, 0x63, 0x79, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x54, 0x0a, 0x14, + 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, + 0x63, 0x69, 0x65, 0x73, 0x12, 0x27, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, + 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x1a, 0x13, 0x73, + 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, + 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, + 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, + 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, + 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, + 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x5a, 0x39, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, + 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x3b, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, + 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -834,44 +640,35 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP() [ return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescData } -var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes = make([]protoimpl.MessageInfo, 10) -var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_goTypes = []any{ - (*DependencyRequest)(nil), // 0: scanoss.api.dependencies.v2.DependencyRequest - (*DependencyResponse)(nil), // 1: scanoss.api.dependencies.v2.DependencyResponse - (*TransitiveDependencyRequest)(nil), // 2: scanoss.api.dependencies.v2.TransitiveDependencyRequest - (*TransitiveDependencyResponse)(nil), // 3: scanoss.api.dependencies.v2.TransitiveDependencyResponse - (*DependencyRequest_Purls)(nil), // 4: scanoss.api.dependencies.v2.DependencyRequest.Purls - (*DependencyRequest_Files)(nil), // 5: scanoss.api.dependencies.v2.DependencyRequest.Files - (*DependencyResponse_Licenses)(nil), // 6: scanoss.api.dependencies.v2.DependencyResponse.Licenses - (*DependencyResponse_Dependencies)(nil), // 7: scanoss.api.dependencies.v2.DependencyResponse.Dependencies - (*DependencyResponse_Files)(nil), // 8: scanoss.api.dependencies.v2.DependencyResponse.Files - (*TransitiveDependencyResponse_Dependencies)(nil), // 9: scanoss.api.dependencies.v2.TransitiveDependencyResponse.Dependencies - (*commonv2.StatusResponse)(nil), // 10: scanoss.api.common.v2.StatusResponse - (*commonv2.Purl)(nil), // 11: scanoss.api.common.v2.Purl - (*commonv2.EchoRequest)(nil), // 12: scanoss.api.common.v2.EchoRequest - (*commonv2.EchoResponse)(nil), // 13: scanoss.api.common.v2.EchoResponse +var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_goTypes = []interface{}{ + (*DependencyRequest)(nil), // 0: scanoss.api.dependencies.v2.DependencyRequest + (*DependencyResponse)(nil), // 1: scanoss.api.dependencies.v2.DependencyResponse + (*DependencyRequest_Purls)(nil), // 2: scanoss.api.dependencies.v2.DependencyRequest.Purls + (*DependencyRequest_Files)(nil), // 3: scanoss.api.dependencies.v2.DependencyRequest.Files + (*DependencyResponse_Licenses)(nil), // 4: scanoss.api.dependencies.v2.DependencyResponse.Licenses + (*DependencyResponse_Dependencies)(nil), // 5: scanoss.api.dependencies.v2.DependencyResponse.Dependencies + (*DependencyResponse_Files)(nil), // 6: scanoss.api.dependencies.v2.DependencyResponse.Files + (*commonv2.StatusResponse)(nil), // 7: scanoss.api.common.v2.StatusResponse + (*commonv2.EchoRequest)(nil), // 8: scanoss.api.common.v2.EchoRequest + (*commonv2.EchoResponse)(nil), // 9: scanoss.api.common.v2.EchoResponse } var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_depIdxs = []int32{ - 5, // 0: scanoss.api.dependencies.v2.DependencyRequest.files:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Files - 8, // 1: scanoss.api.dependencies.v2.DependencyResponse.files:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Files - 10, // 2: scanoss.api.dependencies.v2.DependencyResponse.status:type_name -> scanoss.api.common.v2.StatusResponse - 11, // 3: scanoss.api.dependencies.v2.TransitiveDependencyRequest.purls:type_name -> scanoss.api.common.v2.Purl - 9, // 4: scanoss.api.dependencies.v2.TransitiveDependencyResponse.dependencies:type_name -> scanoss.api.dependencies.v2.TransitiveDependencyResponse.Dependencies - 10, // 5: scanoss.api.dependencies.v2.TransitiveDependencyResponse.status:type_name -> scanoss.api.common.v2.StatusResponse - 4, // 6: scanoss.api.dependencies.v2.DependencyRequest.Files.purls:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Purls - 6, // 7: scanoss.api.dependencies.v2.DependencyResponse.Dependencies.licenses:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Licenses - 7, // 8: scanoss.api.dependencies.v2.DependencyResponse.Files.dependencies:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Dependencies - 12, // 9: scanoss.api.dependencies.v2.Dependencies.Echo:input_type -> scanoss.api.common.v2.EchoRequest - 0, // 10: scanoss.api.dependencies.v2.Dependencies.GetDependencies:input_type -> scanoss.api.dependencies.v2.DependencyRequest - 2, // 11: scanoss.api.dependencies.v2.Dependencies.GetTransitiveDependencies:input_type -> scanoss.api.dependencies.v2.TransitiveDependencyRequest - 13, // 12: scanoss.api.dependencies.v2.Dependencies.Echo:output_type -> scanoss.api.common.v2.EchoResponse - 1, // 13: scanoss.api.dependencies.v2.Dependencies.GetDependencies:output_type -> scanoss.api.dependencies.v2.DependencyResponse - 3, // 14: scanoss.api.dependencies.v2.Dependencies.GetTransitiveDependencies:output_type -> scanoss.api.dependencies.v2.TransitiveDependencyResponse - 12, // [12:15] is the sub-list for method output_type - 9, // [9:12] is the sub-list for method input_type - 9, // [9:9] is the sub-list for extension type_name - 9, // [9:9] is the sub-list for extension extendee - 0, // [0:9] is the sub-list for field type_name + 3, // 0: scanoss.api.dependencies.v2.DependencyRequest.files:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Files + 6, // 1: scanoss.api.dependencies.v2.DependencyResponse.files:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Files + 7, // 2: scanoss.api.dependencies.v2.DependencyResponse.status:type_name -> scanoss.api.common.v2.StatusResponse + 2, // 3: scanoss.api.dependencies.v2.DependencyRequest.Files.purls:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Purls + 4, // 4: scanoss.api.dependencies.v2.DependencyResponse.Dependencies.licenses:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Licenses + 5, // 5: scanoss.api.dependencies.v2.DependencyResponse.Files.dependencies:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Dependencies + 8, // 6: scanoss.api.dependencies.v2.Dependencies.Echo:input_type -> scanoss.api.common.v2.EchoRequest + 0, // 7: scanoss.api.dependencies.v2.Dependencies.GetDependencies:input_type -> scanoss.api.dependencies.v2.DependencyRequest + 9, // 8: scanoss.api.dependencies.v2.Dependencies.Echo:output_type -> scanoss.api.common.v2.EchoResponse + 1, // 9: scanoss.api.dependencies.v2.Dependencies.GetDependencies:output_type -> scanoss.api.dependencies.v2.DependencyResponse + 8, // [8:10] is the sub-list for method output_type + 6, // [6:8] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 6, // [6:6] is the sub-list for extension extendee + 0, // [0:6] is the sub-list for field type_name } func init() { file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() } @@ -879,13 +676,99 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() { if File_scanoss_api_dependencies_v2_scanoss_dependencies_proto != nil { return } + if !protoimpl.UnsafeEnabled { + file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DependencyRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DependencyResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DependencyRequest_Purls); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DependencyRequest_Files); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DependencyResponse_Licenses); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DependencyResponse_Dependencies); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DependencyResponse_Files); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 7, NumExtensions: 0, NumServices: 1, }, diff --git a/api/dependenciesv2/scanoss-dependencies.pb.gw.go b/api/dependenciesv2/scanoss-dependencies.pb.gw.go index 49ea0b8..e8635ba 100644 --- a/api/dependenciesv2/scanoss-dependencies.pb.gw.go +++ b/api/dependenciesv2/scanoss-dependencies.pb.gw.go @@ -10,7 +10,6 @@ package dependenciesv2 import ( "context" - "errors" "io" "net/http" @@ -26,101 +25,96 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = errors.New - _ = runtime.String - _ = utilities.NewDoubleArray - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = metadata.Join func request_Dependencies_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client DependenciesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Dependencies_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server DependenciesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err + } func request_Dependencies_GetDependencies_0(ctx context.Context, marshaler runtime.Marshaler, client DependenciesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq DependencyRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq DependencyRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetDependencies(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Dependencies_GetDependencies_0(ctx context.Context, marshaler runtime.Marshaler, server DependenciesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq DependencyRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - msg, err := server.GetDependencies(ctx, &protoReq) - return msg, metadata, err -} + var protoReq DependencyRequest + var metadata runtime.ServerMetadata -func request_Dependencies_GetTransitiveDependencies_0(ctx context.Context, marshaler runtime.Marshaler, client DependenciesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq TransitiveDependencyRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) } - msg, err := client.GetTransitiveDependencies(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err -} - -func local_request_Dependencies_GetTransitiveDependencies_0(ctx context.Context, marshaler runtime.Marshaler, server DependenciesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq TransitiveDependencyRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.GetTransitiveDependencies(ctx, &protoReq) + + msg, err := server.GetDependencies(ctx, &protoReq) return msg, metadata, err + } // RegisterDependenciesHandlerServer registers the http handlers for service Dependencies to "mux". // UnaryRPC :call DependenciesServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterDependenciesHandlerFromEndpoint instead. -// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMux, server DependenciesServer) error { - mux.Handle(http.MethodPost, pattern_Dependencies_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Dependencies_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -132,15 +126,20 @@ func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Dependencies_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Dependencies_GetDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Dependencies_GetDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -152,27 +151,9 @@ func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Dependencies_GetDependencies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - mux.Handle(http.MethodPost, pattern_Dependencies_GetTransitiveDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetTransitiveDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/transitive")) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Dependencies_GetTransitiveDependencies_0(annotatedContext, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) - if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) - return - } - forward_Dependencies_GetTransitiveDependencies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -181,24 +162,25 @@ func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMu // RegisterDependenciesHandlerFromEndpoint is same as RegisterDependenciesHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterDependenciesHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.NewClient(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } }() }() + return RegisterDependenciesHandler(ctx, mux, conn) } @@ -212,13 +194,16 @@ func RegisterDependenciesHandler(ctx context.Context, mux *runtime.ServeMux, con // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "DependenciesClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "DependenciesClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "DependenciesClient" to call the correct interceptors. This client ignores the HTTP middlewares. +// "DependenciesClient" to call the correct interceptors. func RegisterDependenciesHandlerClient(ctx context.Context, mux *runtime.ServeMux, client DependenciesClient) error { - mux.Handle(http.MethodPost, pattern_Dependencies_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Dependencies_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -229,13 +214,18 @@ func RegisterDependenciesHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Dependencies_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Dependencies_GetDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Dependencies_GetDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -246,36 +236,22 @@ func RegisterDependenciesHandlerClient(ctx context.Context, mux *runtime.ServeMu runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Dependencies_GetDependencies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Dependencies_GetTransitiveDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetTransitiveDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/transitive")) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Dependencies_GetTransitiveDependencies_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) - if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) - return - } - forward_Dependencies_GetTransitiveDependencies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) + return nil } var ( - pattern_Dependencies_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "dependencies", "echo"}, "")) - pattern_Dependencies_GetDependencies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2}, []string{"api", "v2", "dependencies"}, "")) - pattern_Dependencies_GetTransitiveDependencies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "dependencies", "transitive"}, "")) + pattern_Dependencies_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "dependencies", "echo"}, "")) + + pattern_Dependencies_GetDependencies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2}, []string{"api", "v2", "dependencies"}, "")) ) var ( - forward_Dependencies_Echo_0 = runtime.ForwardResponseMessage - forward_Dependencies_GetDependencies_0 = runtime.ForwardResponseMessage - forward_Dependencies_GetTransitiveDependencies_0 = runtime.ForwardResponseMessage + forward_Dependencies_Echo_0 = runtime.ForwardResponseMessage + + forward_Dependencies_GetDependencies_0 = runtime.ForwardResponseMessage ) diff --git a/api/dependenciesv2/scanoss-dependencies_grpc.pb.go b/api/dependenciesv2/scanoss-dependencies_grpc.pb.go index 105c3da..e5c5039 100644 --- a/api/dependenciesv2/scanoss-dependencies_grpc.pb.go +++ b/api/dependenciesv2/scanoss-dependencies_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.5.1 -// - protoc v5.29.3 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v5.27.3 // source: scanoss/api/dependencies/v2/scanoss-dependencies.proto package dependenciesv2 @@ -43,26 +43,22 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.64.0 or later. -const _ = grpc.SupportPackageIsVersion9 +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 const ( - Dependencies_Echo_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/Echo" - Dependencies_GetDependencies_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/GetDependencies" - Dependencies_GetTransitiveDependencies_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/GetTransitiveDependencies" + Dependencies_Echo_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/Echo" + Dependencies_GetDependencies_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/GetDependencies" ) // DependenciesClient is the client API for Dependencies service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -// -// Expose all of the SCANOSS Dependency RPCs here type DependenciesClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) // Get dependency details GetDependencies(ctx context.Context, in *DependencyRequest, opts ...grpc.CallOption) (*DependencyResponse, error) - GetTransitiveDependencies(ctx context.Context, in *TransitiveDependencyRequest, opts ...grpc.CallOption) (*TransitiveDependencyResponse, error) } type dependenciesClient struct { @@ -74,9 +70,8 @@ func NewDependenciesClient(cc grpc.ClientConnInterface) DependenciesClient { } func (c *dependenciesClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Dependencies_Echo_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Dependencies_Echo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -84,19 +79,8 @@ func (c *dependenciesClient) Echo(ctx context.Context, in *commonv2.EchoRequest, } func (c *dependenciesClient) GetDependencies(ctx context.Context, in *DependencyRequest, opts ...grpc.CallOption) (*DependencyResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DependencyResponse) - err := c.cc.Invoke(ctx, Dependencies_GetDependencies_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *dependenciesClient) GetTransitiveDependencies(ctx context.Context, in *TransitiveDependencyRequest, opts ...grpc.CallOption) (*TransitiveDependencyResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(TransitiveDependencyResponse) - err := c.cc.Invoke(ctx, Dependencies_GetTransitiveDependencies_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Dependencies_GetDependencies_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -105,24 +89,18 @@ func (c *dependenciesClient) GetTransitiveDependencies(ctx context.Context, in * // DependenciesServer is the server API for Dependencies service. // All implementations must embed UnimplementedDependenciesServer -// for forward compatibility. -// -// Expose all of the SCANOSS Dependency RPCs here +// for forward compatibility type DependenciesServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) // Get dependency details GetDependencies(context.Context, *DependencyRequest) (*DependencyResponse, error) - GetTransitiveDependencies(context.Context, *TransitiveDependencyRequest) (*TransitiveDependencyResponse, error) mustEmbedUnimplementedDependenciesServer() } -// UnimplementedDependenciesServer must be embedded to have -// forward compatible implementations. -// -// NOTE: this should be embedded by value instead of pointer to avoid a nil -// pointer dereference when methods are called. -type UnimplementedDependenciesServer struct{} +// UnimplementedDependenciesServer must be embedded to have forward compatible implementations. +type UnimplementedDependenciesServer struct { +} func (UnimplementedDependenciesServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -130,11 +108,7 @@ func (UnimplementedDependenciesServer) Echo(context.Context, *commonv2.EchoReque func (UnimplementedDependenciesServer) GetDependencies(context.Context, *DependencyRequest) (*DependencyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetDependencies not implemented") } -func (UnimplementedDependenciesServer) GetTransitiveDependencies(context.Context, *TransitiveDependencyRequest) (*TransitiveDependencyResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetTransitiveDependencies not implemented") -} func (UnimplementedDependenciesServer) mustEmbedUnimplementedDependenciesServer() {} -func (UnimplementedDependenciesServer) testEmbeddedByValue() {} // UnsafeDependenciesServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to DependenciesServer will @@ -144,13 +118,6 @@ type UnsafeDependenciesServer interface { } func RegisterDependenciesServer(s grpc.ServiceRegistrar, srv DependenciesServer) { - // If the following call pancis, it indicates UnimplementedDependenciesServer was - // embedded by pointer and is nil. This will cause panics if an - // unimplemented method is ever invoked, so we test this at initialization - // time to prevent it from happening at runtime later due to I/O. - if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { - t.testEmbeddedByValue() - } s.RegisterService(&Dependencies_ServiceDesc, srv) } @@ -190,24 +157,6 @@ func _Dependencies_GetDependencies_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } -func _Dependencies_GetTransitiveDependencies_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(TransitiveDependencyRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(DependenciesServer).GetTransitiveDependencies(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Dependencies_GetTransitiveDependencies_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(DependenciesServer).GetTransitiveDependencies(ctx, req.(*TransitiveDependencyRequest)) - } - return interceptor(ctx, in, info, handler) -} - // Dependencies_ServiceDesc is the grpc.ServiceDesc for Dependencies service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -223,10 +172,6 @@ var Dependencies_ServiceDesc = grpc.ServiceDesc{ MethodName: "GetDependencies", Handler: _Dependencies_GetDependencies_Handler, }, - { - MethodName: "GetTransitiveDependencies", - Handler: _Dependencies_GetTransitiveDependencies_Handler, - }, }, Streams: []grpc.StreamDesc{}, Metadata: "scanoss/api/dependencies/v2/scanoss-dependencies.proto", diff --git a/api/provenancev2/scanoss-provenance.pb.go b/api/provenancev2/scanoss-provenance.pb.go index 99af586..b6a0b36 100644 --- a/api/provenancev2/scanoss-provenance.pb.go +++ b/api/provenancev2/scanoss-provenance.pb.go @@ -26,8 +26,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.3 +// protoc-gen-go v1.30.0 +// protoc v5.27.3 // source: scanoss/api/provenance/v2/scanoss-provenance.proto package provenancev2 @@ -49,23 +49,26 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// * +//* // Component level Provenance Response data (JSON payload) type ProvenanceResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Provenance details Purls []*ProvenanceResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *ProvenanceResponse) Reset() { *x = ProvenanceResponse{} - mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *ProvenanceResponse) String() string { @@ -76,7 +79,7 @@ func (*ProvenanceResponse) ProtoMessage() {} func (x *ProvenanceResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[0] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -107,20 +110,23 @@ func (x *ProvenanceResponse) GetStatus() *commonv2.StatusResponse { // Declared location for the project type ProvenanceResponse_DeclaredLocation struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Declared location could be either from the owner or a contributor Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` // Country/State/City/Province/Place declared on the repo - Location string `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Location string `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"` } func (x *ProvenanceResponse_DeclaredLocation) Reset() { *x = ProvenanceResponse_DeclaredLocation{} - mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *ProvenanceResponse_DeclaredLocation) String() string { @@ -131,7 +137,7 @@ func (*ProvenanceResponse_DeclaredLocation) ProtoMessage() {} func (x *ProvenanceResponse_DeclaredLocation) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[1] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -162,20 +168,23 @@ func (x *ProvenanceResponse_DeclaredLocation) GetLocation() string { // Curated provenance information about the project type ProvenanceResponse_CuratedLocation struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Country for the owner or contributor Country string `protobuf:"bytes,1,opt,name=country,proto3" json:"country,omitempty"` // Ocurrences for users or contributors on this specific country - Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` } func (x *ProvenanceResponse_CuratedLocation) Reset() { *x = ProvenanceResponse_CuratedLocation{} - mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *ProvenanceResponse_CuratedLocation) String() string { @@ -186,7 +195,7 @@ func (*ProvenanceResponse_CuratedLocation) ProtoMessage() {} func (x *ProvenanceResponse_CuratedLocation) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[2] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -217,7 +226,10 @@ func (x *ProvenanceResponse_CuratedLocation) GetCount() int32 { // Information about a given purl type ProvenanceResponse_Purls struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // The purl string Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // The purl version @@ -226,15 +238,15 @@ type ProvenanceResponse_Purls struct { DeclaredLocations []*ProvenanceResponse_DeclaredLocation `protobuf:"bytes,3,rep,name=declared_locations,json=declaredLocations,proto3" json:"declared_locations,omitempty"` // List of craft curated location CuratedLocations []*ProvenanceResponse_CuratedLocation `protobuf:"bytes,4,rep,name=curated_locations,json=curatedLocations,proto3" json:"curated_locations,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache } func (x *ProvenanceResponse_Purls) Reset() { *x = ProvenanceResponse_Purls{} - mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *ProvenanceResponse_Purls) String() string { @@ -245,7 +257,7 @@ func (*ProvenanceResponse_Purls) ProtoMessage() {} func (x *ProvenanceResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[3] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -390,7 +402,7 @@ func file_scanoss_api_provenance_v2_scanoss_provenance_proto_rawDescGZIP() []byt } var file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_scanoss_api_provenance_v2_scanoss_provenance_proto_goTypes = []any{ +var file_scanoss_api_provenance_v2_scanoss_provenance_proto_goTypes = []interface{}{ (*ProvenanceResponse)(nil), // 0: scanoss.api.provenance.v2.ProvenanceResponse (*ProvenanceResponse_DeclaredLocation)(nil), // 1: scanoss.api.provenance.v2.ProvenanceResponse.DeclaredLocation (*ProvenanceResponse_CuratedLocation)(nil), // 2: scanoss.api.provenance.v2.ProvenanceResponse.CuratedLocation @@ -421,6 +433,56 @@ func file_scanoss_api_provenance_v2_scanoss_provenance_proto_init() { if File_scanoss_api_provenance_v2_scanoss_provenance_proto != nil { return } + if !protoimpl.UnsafeEnabled { + file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProvenanceResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProvenanceResponse_DeclaredLocation); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProvenanceResponse_CuratedLocation); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_provenance_v2_scanoss_provenance_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ProvenanceResponse_Purls); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/provenancev2/scanoss-provenance.pb.gw.go b/api/provenancev2/scanoss-provenance.pb.gw.go index 92191f8..1c659f8 100644 --- a/api/provenancev2/scanoss-provenance.pb.gw.go +++ b/api/provenancev2/scanoss-provenance.pb.gw.go @@ -10,7 +10,6 @@ package provenancev2 import ( "context" - "errors" "io" "net/http" @@ -26,77 +25,96 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = errors.New - _ = runtime.String - _ = utilities.NewDoubleArray - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = metadata.Join func request_Provenance_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client ProvenanceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Provenance_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server ProvenanceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err + } func request_Provenance_GetComponentProvenance_0(ctx context.Context, marshaler runtime.Marshaler, client ProvenanceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetComponentProvenance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Provenance_GetComponentProvenance_0(ctx context.Context, marshaler runtime.Marshaler, server ProvenanceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetComponentProvenance(ctx, &protoReq) return msg, metadata, err + } // RegisterProvenanceHandlerServer registers the http handlers for service Provenance to "mux". // UnaryRPC :call ProvenanceServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterProvenanceHandlerFromEndpoint instead. -// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ProvenanceServer) error { - mux.Handle(http.MethodPost, pattern_Provenance_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Provenance_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -108,15 +126,20 @@ func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Provenance_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Provenance_GetComponentProvenance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Provenance_GetComponentProvenance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -128,7 +151,9 @@ func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Provenance_GetComponentProvenance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -137,24 +162,25 @@ func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, // RegisterProvenanceHandlerFromEndpoint is same as RegisterProvenanceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterProvenanceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.NewClient(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } }() }() + return RegisterProvenanceHandler(ctx, mux, conn) } @@ -168,13 +194,16 @@ func RegisterProvenanceHandler(ctx context.Context, mux *runtime.ServeMux, conn // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ProvenanceClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ProvenanceClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "ProvenanceClient" to call the correct interceptors. This client ignores the HTTP middlewares. +// "ProvenanceClient" to call the correct interceptors. func RegisterProvenanceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ProvenanceClient) error { - mux.Handle(http.MethodPost, pattern_Provenance_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Provenance_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -185,13 +214,18 @@ func RegisterProvenanceHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Provenance_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Provenance_GetComponentProvenance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Provenance_GetComponentProvenance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -202,17 +236,22 @@ func RegisterProvenanceHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Provenance_GetComponentProvenance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + return nil } var ( - pattern_Provenance_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "provenance", "echo"}, "")) + pattern_Provenance_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "provenance", "echo"}, "")) + pattern_Provenance_GetComponentProvenance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "provenance", "countries"}, "")) ) var ( - forward_Provenance_Echo_0 = runtime.ForwardResponseMessage + forward_Provenance_Echo_0 = runtime.ForwardResponseMessage + forward_Provenance_GetComponentProvenance_0 = runtime.ForwardResponseMessage ) diff --git a/api/provenancev2/scanoss-provenance_grpc.pb.go b/api/provenancev2/scanoss-provenance_grpc.pb.go index 6a46c6c..bfad79f 100644 --- a/api/provenancev2/scanoss-provenance_grpc.pb.go +++ b/api/provenancev2/scanoss-provenance_grpc.pb.go @@ -26,8 +26,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.5.1 -// - protoc v5.29.3 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v5.27.3 // source: scanoss/api/provenance/v2/scanoss-provenance.proto package provenancev2 @@ -42,8 +42,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.64.0 or later. -const _ = grpc.SupportPackageIsVersion9 +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 const ( Provenance_Echo_FullMethodName = "/scanoss.api.provenance.v2.Provenance/Echo" @@ -53,9 +53,6 @@ const ( // ProvenanceClient is the client API for Provenance service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -// -// * -// Expose all of the SCANOSS Provenance RPCs here type ProvenanceClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -72,9 +69,8 @@ func NewProvenanceClient(cc grpc.ClientConnInterface) ProvenanceClient { } func (c *provenanceClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Provenance_Echo_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Provenance_Echo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -82,9 +78,8 @@ func (c *provenanceClient) Echo(ctx context.Context, in *commonv2.EchoRequest, o } func (c *provenanceClient) GetComponentProvenance(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*ProvenanceResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ProvenanceResponse) - err := c.cc.Invoke(ctx, Provenance_GetComponentProvenance_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Provenance_GetComponentProvenance_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -93,10 +88,7 @@ func (c *provenanceClient) GetComponentProvenance(ctx context.Context, in *commo // ProvenanceServer is the server API for Provenance service. // All implementations must embed UnimplementedProvenanceServer -// for forward compatibility. -// -// * -// Expose all of the SCANOSS Provenance RPCs here +// for forward compatibility type ProvenanceServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -105,12 +97,9 @@ type ProvenanceServer interface { mustEmbedUnimplementedProvenanceServer() } -// UnimplementedProvenanceServer must be embedded to have -// forward compatible implementations. -// -// NOTE: this should be embedded by value instead of pointer to avoid a nil -// pointer dereference when methods are called. -type UnimplementedProvenanceServer struct{} +// UnimplementedProvenanceServer must be embedded to have forward compatible implementations. +type UnimplementedProvenanceServer struct { +} func (UnimplementedProvenanceServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -119,7 +108,6 @@ func (UnimplementedProvenanceServer) GetComponentProvenance(context.Context, *co return nil, status.Errorf(codes.Unimplemented, "method GetComponentProvenance not implemented") } func (UnimplementedProvenanceServer) mustEmbedUnimplementedProvenanceServer() {} -func (UnimplementedProvenanceServer) testEmbeddedByValue() {} // UnsafeProvenanceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to ProvenanceServer will @@ -129,13 +117,6 @@ type UnsafeProvenanceServer interface { } func RegisterProvenanceServer(s grpc.ServiceRegistrar, srv ProvenanceServer) { - // If the following call pancis, it indicates UnimplementedProvenanceServer was - // embedded by pointer and is nil. This will cause panics if an - // unimplemented method is ever invoked, so we test this at initialization - // time to prevent it from happening at runtime later due to I/O. - if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { - t.testEmbeddedByValue() - } s.RegisterService(&Provenance_ServiceDesc, srv) } diff --git a/api/scanningv2/scanoss-scanning.pb.go b/api/scanningv2/scanoss-scanning.pb.go index 0a8309c..515a29c 100644 --- a/api/scanningv2/scanoss-scanning.pb.go +++ b/api/scanningv2/scanoss-scanning.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.3 +// protoc-gen-go v1.28.1 +// protoc v3.21.12 // source: scanoss/api/scanning/v2/scanoss-scanning.proto package scanningv2 @@ -52,22 +52,25 @@ const ( // High precision Folder Hashing scan request type HFHRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Report best match (most hits) or not. Default: false BestMatch bool `protobuf:"varint,1,opt,name=best_match,json=bestMatch,proto3" json:"best_match,omitempty"` // Detection threshold (distance) for component selection. Default: 60 Threshold int32 `protobuf:"varint,2,opt,name=threshold,proto3" json:"threshold,omitempty"` // Folder root node to be scanned - Root *HFHRequest_Children `protobuf:"bytes,3,opt,name=root,proto3" json:"root,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Root *HFHRequest_Children `protobuf:"bytes,3,opt,name=root,proto3" json:"root,omitempty"` } func (x *HFHRequest) Reset() { *x = HFHRequest{} - mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *HFHRequest) String() string { @@ -78,7 +81,7 @@ func (*HFHRequest) ProtoMessage() {} func (x *HFHRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[0] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -116,19 +119,22 @@ func (x *HFHRequest) GetRoot() *HFHRequest_Children { // High precision Folder Hashing scan response type HFHResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` - // List of folders containing unique components - Results []*HFHResponse_Result `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"` - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // List of folders containing unique components + Results []*HFHResponse_Result `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"` + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *HFHResponse) Reset() { *x = HFHResponse{} - mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *HFHResponse) String() string { @@ -139,7 +145,7 @@ func (*HFHResponse) ProtoMessage() {} func (x *HFHResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[1] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -170,7 +176,10 @@ func (x *HFHResponse) GetStatus() *commonv2.StatusResponse { // Child node from the folder structure type HFHRequest_Children struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Folder path (can be actual or obfuscated) PathId string `protobuf:"bytes,1,opt,name=path_id,json=pathId,proto3" json:"path_id,omitempty"` // Proximity hash calculated from this nodes filenames (and their children). @@ -178,16 +187,16 @@ type HFHRequest_Children struct { // Proximity hash calculated from this nodes file contents (and their children). SimHashContent string `protobuf:"bytes,3,opt,name=sim_hash_content,json=simHashContent,proto3" json:"sim_hash_content,omitempty"` // Sub-folders inside this child - Children []*HFHRequest_Children `protobuf:"bytes,4,rep,name=children,proto3" json:"children,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Children []*HFHRequest_Children `protobuf:"bytes,4,rep,name=children,proto3" json:"children,omitempty"` } func (x *HFHRequest_Children) Reset() { *x = HFHRequest_Children{} - mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *HFHRequest_Children) String() string { @@ -198,7 +207,7 @@ func (*HFHRequest_Children) ProtoMessage() {} func (x *HFHRequest_Children) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[2] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -243,22 +252,25 @@ func (x *HFHRequest_Children) GetChildren() []*HFHRequest_Children { // Matched component details type HFHResponse_Component struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Component PURL Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` // Component match version (could be multiple) Versions []string `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"` // Result confidence percentage - Confidence float32 `protobuf:"fixed32,3,opt,name=confidence,proto3" json:"confidence,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Confidence float32 `protobuf:"fixed32,3,opt,name=confidence,proto3" json:"confidence,omitempty"` } func (x *HFHResponse_Component) Reset() { *x = HFHResponse_Component{} - mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *HFHResponse_Component) String() string { @@ -269,7 +281,7 @@ func (*HFHResponse_Component) ProtoMessage() {} func (x *HFHResponse_Component) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[3] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -307,20 +319,23 @@ func (x *HFHResponse_Component) GetConfidence() float32 { // Result item, link a path with a list of components type HFHResponse_Result struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Folder path (can be actual or obfuscated) PathId string `protobuf:"bytes,1,opt,name=path_id,json=pathId,proto3" json:"path_id,omitempty"` // List of matching components - Components []*HFHResponse_Component `protobuf:"bytes,2,rep,name=components,proto3" json:"components,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Components []*HFHResponse_Component `protobuf:"bytes,2,rep,name=components,proto3" json:"components,omitempty"` } func (x *HFHResponse_Result) Reset() { *x = HFHResponse_Result{} - mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *HFHResponse_Result) String() string { @@ -331,7 +346,7 @@ func (*HFHResponse_Result) ProtoMessage() {} func (x *HFHResponse_Result) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[4] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -424,34 +439,34 @@ var file_scanoss_api_scanning_v2_scanoss_scanning_proto_rawDesc = []byte{ 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x3a, 0x01, 0x2a, 0x22, 0x15, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, - 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x12, 0x81, 0x01, 0x0a, 0x0e, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, + 0x6e, 0x73, 0x65, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x2f, 0x65, 0x63, + 0x68, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x81, 0x01, 0x0a, 0x0e, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x53, 0x63, 0x61, 0x6e, 0x12, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x46, 0x48, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x46, 0x48, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x01, 0x2a, 0x22, 0x19, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, - 0x2f, 0x68, 0x66, 0x68, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x42, 0x8a, 0x02, 0x92, 0x41, 0xd3, 0x01, - 0x12, 0x6d, 0x0a, 0x18, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x53, 0x63, 0x61, 0x6e, - 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x4c, 0x0a, 0x10, - 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, - 0x12, 0x23, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x73, 0x63, 0x61, - 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, - 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, - 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, - 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, - 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, - 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, - 0x02, 0x01, 0x07, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, - 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x76, 0x32, 0x3b, 0x73, 0x63, 0x61, 0x6e, - 0x6e, 0x69, 0x6e, 0x67, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x73, 0x65, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x2f, 0x68, 0x66, + 0x68, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x3a, 0x01, 0x2a, 0x42, 0x8a, 0x02, 0x5a, 0x31, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, + 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, + 0x6e, 0x67, 0x76, 0x32, 0x3b, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x76, 0x32, 0x92, + 0x41, 0xd3, 0x01, 0x12, 0x6d, 0x0a, 0x18, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x53, + 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, + 0x4c, 0x0a, 0x10, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x73, 0x63, 0x61, 0x6e, 0x6e, + 0x69, 0x6e, 0x67, 0x12, 0x23, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, + 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, + 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, + 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, + 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, + 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, + 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, + 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -467,7 +482,7 @@ func file_scanoss_api_scanning_v2_scanoss_scanning_proto_rawDescGZIP() []byte { } var file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_scanoss_api_scanning_v2_scanoss_scanning_proto_goTypes = []any{ +var file_scanoss_api_scanning_v2_scanoss_scanning_proto_goTypes = []interface{}{ (*HFHRequest)(nil), // 0: scanoss.api.scanning.v2.HFHRequest (*HFHResponse)(nil), // 1: scanoss.api.scanning.v2.HFHResponse (*HFHRequest_Children)(nil), // 2: scanoss.api.scanning.v2.HFHRequest.Children @@ -499,6 +514,68 @@ func file_scanoss_api_scanning_v2_scanoss_scanning_proto_init() { if File_scanoss_api_scanning_v2_scanoss_scanning_proto != nil { return } + if !protoimpl.UnsafeEnabled { + file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HFHRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HFHResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HFHRequest_Children); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HFHResponse_Component); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_scanning_v2_scanoss_scanning_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HFHResponse_Result); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/scanningv2/scanoss-scanning.pb.gw.go b/api/scanningv2/scanoss-scanning.pb.gw.go index 27477a7..d9d9b53 100644 --- a/api/scanningv2/scanoss-scanning.pb.gw.go +++ b/api/scanningv2/scanoss-scanning.pb.gw.go @@ -10,7 +10,6 @@ package scanningv2 import ( "context" - "errors" "io" "net/http" @@ -26,109 +25,131 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = errors.New - _ = runtime.String - _ = utilities.NewDoubleArray - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = metadata.Join func request_Scanning_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client ScanningClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Scanning_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server ScanningServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err + } func request_Scanning_FolderHashScan_0(ctx context.Context, marshaler runtime.Marshaler, client ScanningClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq HFHRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq HFHRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.FolderHashScan(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Scanning_FolderHashScan_0(ctx context.Context, marshaler runtime.Marshaler, server ScanningServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq HFHRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq HFHRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.FolderHashScan(ctx, &protoReq) return msg, metadata, err + } // RegisterScanningHandlerServer registers the http handlers for service Scanning to "mux". // UnaryRPC :call ScanningServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterScanningHandlerFromEndpoint instead. -// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterScanningHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ScanningServer) error { - mux.Handle(http.MethodPost, pattern_Scanning_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Scanning_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/Echo", runtime.WithHTTPPathPattern("/api/v2/scanning/echo")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/Echo", runtime.WithHTTPPathPattern("/api/v2/scanning/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Scanning_Echo_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Scanning_Echo_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Scanning_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + forward_Scanning_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Scanning_FolderHashScan_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Scanning_FolderHashScan_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/FolderHashScan", runtime.WithHTTPPathPattern("/api/v2/scanning/hfh/scan")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/FolderHashScan", runtime.WithHTTPPathPattern("/api/v2/scanning/hfh/scan")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Scanning_FolderHashScan_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Scanning_FolderHashScan_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Scanning_FolderHashScan_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + forward_Scanning_FolderHashScan_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -137,24 +158,25 @@ func RegisterScanningHandlerServer(ctx context.Context, mux *runtime.ServeMux, s // RegisterScanningHandlerFromEndpoint is same as RegisterScanningHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterScanningHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.NewClient(endpoint, opts...) + conn, err := grpc.Dial(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } }() }() + return RegisterScanningHandler(ctx, mux, conn) } @@ -168,51 +190,60 @@ func RegisterScanningHandler(ctx context.Context, mux *runtime.ServeMux, conn *g // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ScanningClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ScanningClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "ScanningClient" to call the correct interceptors. This client ignores the HTTP middlewares. +// "ScanningClient" to call the correct interceptors. func RegisterScanningHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ScanningClient) error { - mux.Handle(http.MethodPost, pattern_Scanning_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Scanning_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/Echo", runtime.WithHTTPPathPattern("/api/v2/scanning/echo")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/Echo", runtime.WithHTTPPathPattern("/api/v2/scanning/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Scanning_Echo_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Scanning_Echo_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Scanning_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + forward_Scanning_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Scanning_FolderHashScan_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Scanning_FolderHashScan_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/FolderHashScan", runtime.WithHTTPPathPattern("/api/v2/scanning/hfh/scan")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.scanning.v2.Scanning/FolderHashScan", runtime.WithHTTPPathPattern("/api/v2/scanning/hfh/scan")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Scanning_FolderHashScan_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Scanning_FolderHashScan_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Scanning_FolderHashScan_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + forward_Scanning_FolderHashScan_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + return nil } var ( - pattern_Scanning_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "scanning", "echo"}, "")) + pattern_Scanning_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "scanning", "echo"}, "")) + pattern_Scanning_FolderHashScan_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"api", "v2", "scanning", "hfh", "scan"}, "")) ) var ( - forward_Scanning_Echo_0 = runtime.ForwardResponseMessage + forward_Scanning_Echo_0 = runtime.ForwardResponseMessage + forward_Scanning_FolderHashScan_0 = runtime.ForwardResponseMessage ) diff --git a/api/scanningv2/scanoss-scanning_grpc.pb.go b/api/scanningv2/scanoss-scanning_grpc.pb.go index b74db44..5df6077 100644 --- a/api/scanningv2/scanoss-scanning_grpc.pb.go +++ b/api/scanningv2/scanoss-scanning_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.5.1 -// - protoc v5.29.3 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.21.12 // source: scanoss/api/scanning/v2/scanoss-scanning.proto package scanningv2 @@ -43,8 +43,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.64.0 or later. -const _ = grpc.SupportPackageIsVersion9 +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 const ( Scanning_Echo_FullMethodName = "/scanoss.api.scanning.v2.Scanning/Echo" @@ -54,9 +54,6 @@ const ( // ScanningClient is the client API for Scanning service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -// -// * -// Expose all of the SCANOSS Scanning RPCs here type ScanningClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -73,9 +70,8 @@ func NewScanningClient(cc grpc.ClientConnInterface) ScanningClient { } func (c *scanningClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Scanning_Echo_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Scanning_Echo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -83,9 +79,8 @@ func (c *scanningClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opt } func (c *scanningClient) FolderHashScan(ctx context.Context, in *HFHRequest, opts ...grpc.CallOption) (*HFHResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(HFHResponse) - err := c.cc.Invoke(ctx, Scanning_FolderHashScan_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Scanning_FolderHashScan_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -94,10 +89,7 @@ func (c *scanningClient) FolderHashScan(ctx context.Context, in *HFHRequest, opt // ScanningServer is the server API for Scanning service. // All implementations must embed UnimplementedScanningServer -// for forward compatibility. -// -// * -// Expose all of the SCANOSS Scanning RPCs here +// for forward compatibility type ScanningServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -106,12 +98,9 @@ type ScanningServer interface { mustEmbedUnimplementedScanningServer() } -// UnimplementedScanningServer must be embedded to have -// forward compatible implementations. -// -// NOTE: this should be embedded by value instead of pointer to avoid a nil -// pointer dereference when methods are called. -type UnimplementedScanningServer struct{} +// UnimplementedScanningServer must be embedded to have forward compatible implementations. +type UnimplementedScanningServer struct { +} func (UnimplementedScanningServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -120,7 +109,6 @@ func (UnimplementedScanningServer) FolderHashScan(context.Context, *HFHRequest) return nil, status.Errorf(codes.Unimplemented, "method FolderHashScan not implemented") } func (UnimplementedScanningServer) mustEmbedUnimplementedScanningServer() {} -func (UnimplementedScanningServer) testEmbeddedByValue() {} // UnsafeScanningServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to ScanningServer will @@ -130,13 +118,6 @@ type UnsafeScanningServer interface { } func RegisterScanningServer(s grpc.ServiceRegistrar, srv ScanningServer) { - // If the following call pancis, it indicates UnimplementedScanningServer was - // embedded by pointer and is nil. This will cause panics if an - // unimplemented method is ever invoked, so we test this at initialization - // time to prevent it from happening at runtime later due to I/O. - if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { - t.testEmbeddedByValue() - } s.RegisterService(&Scanning_ServiceDesc, srv) } diff --git a/api/semgrepv2/scanoss-semgrep.pb.go b/api/semgrepv2/scanoss-semgrep.pb.go index f1bb002..5a10328 100644 --- a/api/semgrepv2/scanoss-semgrep.pb.go +++ b/api/semgrepv2/scanoss-semgrep.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.3 +// protoc-gen-go v1.30.0 +// protoc v5.27.3 // source: scanoss/api/semgrep/v2/scanoss-semgrep.proto package semgrepv2 @@ -50,22 +50,26 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// // Semgrep issue response data (JSON payload) type SemgrepResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Cryptography details Purls []*SemgrepResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *SemgrepResponse) Reset() { *x = SemgrepResponse{} - mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *SemgrepResponse) String() string { @@ -76,7 +80,7 @@ func (*SemgrepResponse) ProtoMessage() {} func (x *SemgrepResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[0] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -106,20 +110,23 @@ func (x *SemgrepResponse) GetStatus() *commonv2.StatusResponse { } type SemgrepResponse_Issue struct { - state protoimpl.MessageState `protogen:"open.v1"` - RuleID string `protobuf:"bytes,1,opt,name=ruleID,proto3" json:"ruleID,omitempty"` - From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` - To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` - Severity string `protobuf:"bytes,4,opt,name=severity,proto3" json:"severity,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RuleID string `protobuf:"bytes,1,opt,name=ruleID,proto3" json:"ruleID,omitempty"` + From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` + To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` + Severity string `protobuf:"bytes,4,opt,name=severity,proto3" json:"severity,omitempty"` } func (x *SemgrepResponse_Issue) Reset() { *x = SemgrepResponse_Issue{} - mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *SemgrepResponse_Issue) String() string { @@ -130,7 +137,7 @@ func (*SemgrepResponse_Issue) ProtoMessage() {} func (x *SemgrepResponse_Issue) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[1] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -174,19 +181,22 @@ func (x *SemgrepResponse_Issue) GetSeverity() string { } type SemgrepResponse_File struct { - state protoimpl.MessageState `protogen:"open.v1"` - FileMD5 string `protobuf:"bytes,1,opt,name=fileMD5,proto3" json:"fileMD5,omitempty"` - Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` - Issues []*SemgrepResponse_Issue `protobuf:"bytes,3,rep,name=issues,proto3" json:"issues,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + FileMD5 string `protobuf:"bytes,1,opt,name=fileMD5,proto3" json:"fileMD5,omitempty"` + Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` + Issues []*SemgrepResponse_Issue `protobuf:"bytes,3,rep,name=issues,proto3" json:"issues,omitempty"` } func (x *SemgrepResponse_File) Reset() { *x = SemgrepResponse_File{} - mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *SemgrepResponse_File) String() string { @@ -197,7 +207,7 @@ func (*SemgrepResponse_File) ProtoMessage() {} func (x *SemgrepResponse_File) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[2] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -234,19 +244,22 @@ func (x *SemgrepResponse_File) GetIssues() []*SemgrepResponse_Issue { } type SemgrepResponse_Purls struct { - state protoimpl.MessageState `protogen:"open.v1"` - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` - Files []*SemgrepResponse_File `protobuf:"bytes,3,rep,name=files,proto3" json:"files,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` + Files []*SemgrepResponse_File `protobuf:"bytes,3,rep,name=files,proto3" json:"files,omitempty"` } func (x *SemgrepResponse_Purls) Reset() { *x = SemgrepResponse_Purls{} - mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *SemgrepResponse_Purls) String() string { @@ -257,7 +270,7 @@ func (*SemgrepResponse_Purls) ProtoMessage() {} func (x *SemgrepResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[3] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -387,7 +400,7 @@ func file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_rawDescGZIP() []byte { } var file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_goTypes = []any{ +var file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_goTypes = []interface{}{ (*SemgrepResponse)(nil), // 0: scanoss.api.semgrep.v2.SemgrepResponse (*SemgrepResponse_Issue)(nil), // 1: scanoss.api.semgrep.v2.SemgrepResponse.Issue (*SemgrepResponse_File)(nil), // 2: scanoss.api.semgrep.v2.SemgrepResponse.File @@ -418,6 +431,56 @@ func file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_init() { if File_scanoss_api_semgrep_v2_scanoss_semgrep_proto != nil { return } + if !protoimpl.UnsafeEnabled { + file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SemgrepResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SemgrepResponse_Issue); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SemgrepResponse_File); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SemgrepResponse_Purls); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/semgrepv2/scanoss-semgrep.pb.gw.go b/api/semgrepv2/scanoss-semgrep.pb.gw.go index 65c7621..34361da 100644 --- a/api/semgrepv2/scanoss-semgrep.pb.gw.go +++ b/api/semgrepv2/scanoss-semgrep.pb.gw.go @@ -10,7 +10,6 @@ package semgrepv2 import ( "context" - "errors" "io" "net/http" @@ -26,77 +25,96 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = errors.New - _ = runtime.String - _ = utilities.NewDoubleArray - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = metadata.Join func request_Semgrep_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client SemgrepClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Semgrep_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server SemgrepServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err + } func request_Semgrep_GetIssues_0(ctx context.Context, marshaler runtime.Marshaler, client SemgrepClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetIssues(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Semgrep_GetIssues_0(ctx context.Context, marshaler runtime.Marshaler, server SemgrepServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.PurlRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.PurlRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetIssues(ctx, &protoReq) return msg, metadata, err + } // RegisterSemgrepHandlerServer registers the http handlers for service Semgrep to "mux". // UnaryRPC :call SemgrepServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterSemgrepHandlerFromEndpoint instead. -// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, server SemgrepServer) error { - mux.Handle(http.MethodPost, pattern_Semgrep_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Semgrep_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -108,15 +126,20 @@ func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, se runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Semgrep_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Semgrep_GetIssues_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Semgrep_GetIssues_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -128,7 +151,9 @@ func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, se runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Semgrep_GetIssues_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -137,24 +162,25 @@ func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, se // RegisterSemgrepHandlerFromEndpoint is same as RegisterSemgrepHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterSemgrepHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.NewClient(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } }() }() + return RegisterSemgrepHandler(ctx, mux, conn) } @@ -168,13 +194,16 @@ func RegisterSemgrepHandler(ctx context.Context, mux *runtime.ServeMux, conn *gr // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "SemgrepClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "SemgrepClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "SemgrepClient" to call the correct interceptors. This client ignores the HTTP middlewares. +// "SemgrepClient" to call the correct interceptors. func RegisterSemgrepHandlerClient(ctx context.Context, mux *runtime.ServeMux, client SemgrepClient) error { - mux.Handle(http.MethodPost, pattern_Semgrep_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Semgrep_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -185,13 +214,18 @@ func RegisterSemgrepHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Semgrep_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Semgrep_GetIssues_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Semgrep_GetIssues_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -202,17 +236,22 @@ func RegisterSemgrepHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Semgrep_GetIssues_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + return nil } var ( - pattern_Semgrep_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "semgrep", "echo"}, "")) + pattern_Semgrep_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "semgrep", "echo"}, "")) + pattern_Semgrep_GetIssues_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "semgrep", "issues"}, "")) ) var ( - forward_Semgrep_Echo_0 = runtime.ForwardResponseMessage + forward_Semgrep_Echo_0 = runtime.ForwardResponseMessage + forward_Semgrep_GetIssues_0 = runtime.ForwardResponseMessage ) diff --git a/api/semgrepv2/scanoss-semgrep_grpc.pb.go b/api/semgrepv2/scanoss-semgrep_grpc.pb.go index ef8a8ea..49f1f3b 100644 --- a/api/semgrepv2/scanoss-semgrep_grpc.pb.go +++ b/api/semgrepv2/scanoss-semgrep_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.5.1 -// - protoc v5.29.3 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v5.27.3 // source: scanoss/api/semgrep/v2/scanoss-semgrep.proto package semgrepv2 @@ -43,8 +43,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.64.0 or later. -const _ = grpc.SupportPackageIsVersion9 +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 const ( Semgrep_Echo_FullMethodName = "/scanoss.api.semgrep.v2.Semgrep/Echo" @@ -54,8 +54,6 @@ const ( // SemgrepClient is the client API for Semgrep service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -// -// Expose all of the SCANOSS Cryptography RPCs here type SemgrepClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -72,9 +70,8 @@ func NewSemgrepClient(cc grpc.ClientConnInterface) SemgrepClient { } func (c *semgrepClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Semgrep_Echo_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Semgrep_Echo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -82,9 +79,8 @@ func (c *semgrepClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts } func (c *semgrepClient) GetIssues(ctx context.Context, in *commonv2.PurlRequest, opts ...grpc.CallOption) (*SemgrepResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SemgrepResponse) - err := c.cc.Invoke(ctx, Semgrep_GetIssues_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Semgrep_GetIssues_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -93,9 +89,7 @@ func (c *semgrepClient) GetIssues(ctx context.Context, in *commonv2.PurlRequest, // SemgrepServer is the server API for Semgrep service. // All implementations must embed UnimplementedSemgrepServer -// for forward compatibility. -// -// Expose all of the SCANOSS Cryptography RPCs here +// for forward compatibility type SemgrepServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -104,12 +98,9 @@ type SemgrepServer interface { mustEmbedUnimplementedSemgrepServer() } -// UnimplementedSemgrepServer must be embedded to have -// forward compatible implementations. -// -// NOTE: this should be embedded by value instead of pointer to avoid a nil -// pointer dereference when methods are called. -type UnimplementedSemgrepServer struct{} +// UnimplementedSemgrepServer must be embedded to have forward compatible implementations. +type UnimplementedSemgrepServer struct { +} func (UnimplementedSemgrepServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -118,7 +109,6 @@ func (UnimplementedSemgrepServer) GetIssues(context.Context, *commonv2.PurlReque return nil, status.Errorf(codes.Unimplemented, "method GetIssues not implemented") } func (UnimplementedSemgrepServer) mustEmbedUnimplementedSemgrepServer() {} -func (UnimplementedSemgrepServer) testEmbeddedByValue() {} // UnsafeSemgrepServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to SemgrepServer will @@ -128,13 +118,6 @@ type UnsafeSemgrepServer interface { } func RegisterSemgrepServer(s grpc.ServiceRegistrar, srv SemgrepServer) { - // If the following call pancis, it indicates UnimplementedSemgrepServer was - // embedded by pointer and is nil. This will cause panics if an - // unimplemented method is ever invoked, so we test this at initialization - // time to prevent it from happening at runtime later due to I/O. - if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { - t.testEmbeddedByValue() - } s.RegisterService(&Semgrep_ServiceDesc, srv) } diff --git a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go index ba6ba83..0fcb0f2 100644 --- a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go +++ b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.3 +// protoc-gen-go v1.30.0 +// protoc v5.27.3 // source: scanoss/api/vulnerabilities/v2/scanoss-vulnerabilities.proto package vulnerabilitiesv2 @@ -50,20 +50,24 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// // Vulnerability request data (JSON payload) type VulnerabilityRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - // JSON vulnerability request purls - Purls []*VulnerabilityRequest_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // JSON vulnerability request purls + Purls []*VulnerabilityRequest_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` } func (x *VulnerabilityRequest) Reset() { *x = VulnerabilityRequest{} - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *VulnerabilityRequest) String() string { @@ -74,7 +78,7 @@ func (*VulnerabilityRequest) ProtoMessage() {} func (x *VulnerabilityRequest) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[0] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -96,22 +100,26 @@ func (x *VulnerabilityRequest) GetPurls() []*VulnerabilityRequest_Purls { return nil } +// // Vulnerability CPE response data (JSON payload) type CpeResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Purl/CPE details Purls []*CpeResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *CpeResponse) Reset() { *x = CpeResponse{} - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CpeResponse) String() string { @@ -122,7 +130,7 @@ func (*CpeResponse) ProtoMessage() {} func (x *CpeResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[1] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -151,22 +159,26 @@ func (x *CpeResponse) GetStatus() *commonv2.StatusResponse { return nil } +// // Vulnerability response data (JSON payload) type VulnerabilityResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + // Vulnerability response details Purls []*VulnerabilityResponse_Purls `protobuf:"bytes,1,rep,name=purls,proto3" json:"purls,omitempty"` // Response status - Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` } func (x *VulnerabilityResponse) Reset() { *x = VulnerabilityResponse{} - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *VulnerabilityResponse) String() string { @@ -177,7 +189,7 @@ func (*VulnerabilityResponse) ProtoMessage() {} func (x *VulnerabilityResponse) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[2] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -207,18 +219,21 @@ func (x *VulnerabilityResponse) GetStatus() *commonv2.StatusResponse { } type VulnerabilityRequest_Purls struct { - state protoimpl.MessageState `protogen:"open.v1"` - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` } func (x *VulnerabilityRequest_Purls) Reset() { *x = VulnerabilityRequest_Purls{} - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *VulnerabilityRequest_Purls) String() string { @@ -229,7 +244,7 @@ func (*VulnerabilityRequest_Purls) ProtoMessage() {} func (x *VulnerabilityRequest_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[3] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -259,18 +274,21 @@ func (x *VulnerabilityRequest_Purls) GetRequirement() string { } type CpeResponse_Purls struct { - state protoimpl.MessageState `protogen:"open.v1"` - Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` - Cpes []string `protobuf:"bytes,2,rep,name=cpes,proto3" json:"cpes,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Cpes []string `protobuf:"bytes,2,rep,name=cpes,proto3" json:"cpes,omitempty"` } func (x *CpeResponse_Purls) Reset() { *x = CpeResponse_Purls{} - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *CpeResponse_Purls) String() string { @@ -281,7 +299,7 @@ func (*CpeResponse_Purls) ProtoMessage() {} func (x *CpeResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[4] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -311,24 +329,27 @@ func (x *CpeResponse_Purls) GetCpes() []string { } type VulnerabilityResponse_Vulnerabilities struct { - state protoimpl.MessageState `protogen:"open.v1"` - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Cve string `protobuf:"bytes,2,opt,name=cve,proto3" json:"cve,omitempty"` - Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` - Summary string `protobuf:"bytes,4,opt,name=summary,proto3" json:"summary,omitempty"` - Severity string `protobuf:"bytes,5,opt,name=severity,proto3" json:"severity,omitempty"` - Published string `protobuf:"bytes,6,opt,name=published,proto3" json:"published,omitempty"` - Modified string `protobuf:"bytes,7,opt,name=modified,proto3" json:"modified,omitempty"` - Source string `protobuf:"bytes,8,opt,name=source,proto3" json:"source,omitempty"` - unknownFields protoimpl.UnknownFields + state protoimpl.MessageState sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Cve string `protobuf:"bytes,2,opt,name=cve,proto3" json:"cve,omitempty"` + Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` + Summary string `protobuf:"bytes,4,opt,name=summary,proto3" json:"summary,omitempty"` + Severity string `protobuf:"bytes,5,opt,name=severity,proto3" json:"severity,omitempty"` + Published string `protobuf:"bytes,6,opt,name=published,proto3" json:"published,omitempty"` + Modified string `protobuf:"bytes,7,opt,name=modified,proto3" json:"modified,omitempty"` + Source string `protobuf:"bytes,8,opt,name=source,proto3" json:"source,omitempty"` } func (x *VulnerabilityResponse_Vulnerabilities) Reset() { *x = VulnerabilityResponse_Vulnerabilities{} - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *VulnerabilityResponse_Vulnerabilities) String() string { @@ -339,7 +360,7 @@ func (*VulnerabilityResponse_Vulnerabilities) ProtoMessage() {} func (x *VulnerabilityResponse_Vulnerabilities) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[5] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -411,18 +432,21 @@ func (x *VulnerabilityResponse_Vulnerabilities) GetSource() string { } type VulnerabilityResponse_Purls struct { - state protoimpl.MessageState `protogen:"open.v1"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` Vulnerabilities []*VulnerabilityResponse_Vulnerabilities `protobuf:"bytes,2,rep,name=vulnerabilities,proto3" json:"vulnerabilities,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache } func (x *VulnerabilityResponse_Purls) Reset() { *x = VulnerabilityResponse_Purls{} - mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } func (x *VulnerabilityResponse_Purls) String() string { @@ -433,7 +457,7 @@ func (*VulnerabilityResponse_Purls) ProtoMessage() {} func (x *VulnerabilityResponse_Purls) ProtoReflect() protoreflect.Message { mi := &file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[6] - if x != nil { + if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -599,7 +623,7 @@ func file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_rawDescGZ } var file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_goTypes = []any{ +var file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_goTypes = []interface{}{ (*VulnerabilityRequest)(nil), // 0: scanoss.api.vulnerabilities.v2.VulnerabilityRequest (*CpeResponse)(nil), // 1: scanoss.api.vulnerabilities.v2.CpeResponse (*VulnerabilityResponse)(nil), // 2: scanoss.api.vulnerabilities.v2.VulnerabilityResponse @@ -636,6 +660,92 @@ func file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_init() { if File_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto != nil { return } + if !protoimpl.UnsafeEnabled { + file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VulnerabilityRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CpeResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VulnerabilityResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VulnerabilityRequest_Purls); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CpeResponse_Purls); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VulnerabilityResponse_Vulnerabilities); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VulnerabilityResponse_Purls); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go index e863757..a875d4d 100644 --- a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go +++ b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go @@ -10,7 +10,6 @@ package vulnerabilitiesv2 import ( "context" - "errors" "io" "net/http" @@ -26,101 +25,130 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = errors.New - _ = runtime.String - _ = utilities.NewDoubleArray - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = metadata.Join func request_Vulnerabilities_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client VulnerabilitiesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Vulnerabilities_Echo_0(ctx context.Context, marshaler runtime.Marshaler, server VulnerabilitiesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq commonv2.EchoRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq commonv2.EchoRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.Echo(ctx, &protoReq) return msg, metadata, err + } func request_Vulnerabilities_GetCpes_0(ctx context.Context, marshaler runtime.Marshaler, client VulnerabilitiesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq VulnerabilityRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq VulnerabilityRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetCpes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Vulnerabilities_GetCpes_0(ctx context.Context, marshaler runtime.Marshaler, server VulnerabilitiesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq VulnerabilityRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq VulnerabilityRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetCpes(ctx, &protoReq) return msg, metadata, err + } func request_Vulnerabilities_GetVulnerabilities_0(ctx context.Context, marshaler runtime.Marshaler, client VulnerabilitiesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq VulnerabilityRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq VulnerabilityRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := client.GetVulnerabilities(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Vulnerabilities_GetVulnerabilities_0(ctx context.Context, marshaler runtime.Marshaler, server VulnerabilitiesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var ( - protoReq VulnerabilityRequest - metadata runtime.ServerMetadata - ) - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + var protoReq VulnerabilityRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + msg, err := server.GetVulnerabilities(ctx, &protoReq) return msg, metadata, err + } // RegisterVulnerabilitiesHandlerServer registers the http handlers for service Vulnerabilities to "mux". // UnaryRPC :call VulnerabilitiesServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterVulnerabilitiesHandlerFromEndpoint instead. -// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.ServeMux, server VulnerabilitiesServer) error { - mux.Handle(http.MethodPost, pattern_Vulnerabilities_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Vulnerabilities_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -132,15 +160,20 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Vulnerabilities_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Vulnerabilities_GetCpes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Vulnerabilities_GetCpes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -152,15 +185,20 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Vulnerabilities_GetCpes_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Vulnerabilities_GetVulnerabilities_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Vulnerabilities_GetVulnerabilities_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -172,7 +210,9 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Vulnerabilities_GetVulnerabilities_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -181,24 +221,25 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv // RegisterVulnerabilitiesHandlerFromEndpoint is same as RegisterVulnerabilitiesHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterVulnerabilitiesHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.NewClient(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) } }() }() + return RegisterVulnerabilitiesHandler(ctx, mux, conn) } @@ -212,13 +253,16 @@ func RegisterVulnerabilitiesHandler(ctx context.Context, mux *runtime.ServeMux, // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "VulnerabilitiesClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "VulnerabilitiesClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "VulnerabilitiesClient" to call the correct interceptors. This client ignores the HTTP middlewares. +// "VulnerabilitiesClient" to call the correct interceptors. func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.ServeMux, client VulnerabilitiesClient) error { - mux.Handle(http.MethodPost, pattern_Vulnerabilities_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Vulnerabilities_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -229,13 +273,18 @@ func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Vulnerabilities_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Vulnerabilities_GetCpes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Vulnerabilities_GetCpes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -246,13 +295,18 @@ func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Vulnerabilities_GetCpes_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) - mux.Handle(http.MethodPost, pattern_Vulnerabilities_GetVulnerabilities_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + + mux.Handle("POST", pattern_Vulnerabilities_GetVulnerabilities_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) + var err error + var annotatedContext context.Context + annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -263,19 +317,26 @@ func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.Serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } + forward_Vulnerabilities_GetVulnerabilities_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + return nil } var ( - pattern_Vulnerabilities_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "vulnerabilities", "echo"}, "")) - pattern_Vulnerabilities_GetCpes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "vulnerabilities", "cpes"}, "")) + pattern_Vulnerabilities_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "vulnerabilities", "echo"}, "")) + + pattern_Vulnerabilities_GetCpes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "vulnerabilities", "cpes"}, "")) + pattern_Vulnerabilities_GetVulnerabilities_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2}, []string{"api", "v2", "vulnerabilities"}, "")) ) var ( - forward_Vulnerabilities_Echo_0 = runtime.ForwardResponseMessage - forward_Vulnerabilities_GetCpes_0 = runtime.ForwardResponseMessage + forward_Vulnerabilities_Echo_0 = runtime.ForwardResponseMessage + + forward_Vulnerabilities_GetCpes_0 = runtime.ForwardResponseMessage + forward_Vulnerabilities_GetVulnerabilities_0 = runtime.ForwardResponseMessage ) diff --git a/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go b/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go index c8084c1..2c18a0c 100644 --- a/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go +++ b/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.5.1 -// - protoc v5.29.3 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v5.27.3 // source: scanoss/api/vulnerabilities/v2/scanoss-vulnerabilities.proto package vulnerabilitiesv2 @@ -43,8 +43,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.64.0 or later. -const _ = grpc.SupportPackageIsVersion9 +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 const ( Vulnerabilities_Echo_FullMethodName = "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo" @@ -55,8 +55,6 @@ const ( // VulnerabilitiesClient is the client API for Vulnerabilities service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -// -// Expose all of the SCANOSS Vulnerability RPCs here type VulnerabilitiesClient interface { // Standard echo Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) @@ -75,9 +73,8 @@ func NewVulnerabilitiesClient(cc grpc.ClientConnInterface) VulnerabilitiesClient } func (c *vulnerabilitiesClient) Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(commonv2.EchoResponse) - err := c.cc.Invoke(ctx, Vulnerabilities_Echo_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Vulnerabilities_Echo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -85,9 +82,8 @@ func (c *vulnerabilitiesClient) Echo(ctx context.Context, in *commonv2.EchoReque } func (c *vulnerabilitiesClient) GetCpes(ctx context.Context, in *VulnerabilityRequest, opts ...grpc.CallOption) (*CpeResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CpeResponse) - err := c.cc.Invoke(ctx, Vulnerabilities_GetCpes_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Vulnerabilities_GetCpes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -95,9 +91,8 @@ func (c *vulnerabilitiesClient) GetCpes(ctx context.Context, in *VulnerabilityRe } func (c *vulnerabilitiesClient) GetVulnerabilities(ctx context.Context, in *VulnerabilityRequest, opts ...grpc.CallOption) (*VulnerabilityResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(VulnerabilityResponse) - err := c.cc.Invoke(ctx, Vulnerabilities_GetVulnerabilities_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Vulnerabilities_GetVulnerabilities_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -106,9 +101,7 @@ func (c *vulnerabilitiesClient) GetVulnerabilities(ctx context.Context, in *Vuln // VulnerabilitiesServer is the server API for Vulnerabilities service. // All implementations must embed UnimplementedVulnerabilitiesServer -// for forward compatibility. -// -// Expose all of the SCANOSS Vulnerability RPCs here +// for forward compatibility type VulnerabilitiesServer interface { // Standard echo Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) @@ -119,12 +112,9 @@ type VulnerabilitiesServer interface { mustEmbedUnimplementedVulnerabilitiesServer() } -// UnimplementedVulnerabilitiesServer must be embedded to have -// forward compatible implementations. -// -// NOTE: this should be embedded by value instead of pointer to avoid a nil -// pointer dereference when methods are called. -type UnimplementedVulnerabilitiesServer struct{} +// UnimplementedVulnerabilitiesServer must be embedded to have forward compatible implementations. +type UnimplementedVulnerabilitiesServer struct { +} func (UnimplementedVulnerabilitiesServer) Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") @@ -136,7 +126,6 @@ func (UnimplementedVulnerabilitiesServer) GetVulnerabilities(context.Context, *V return nil, status.Errorf(codes.Unimplemented, "method GetVulnerabilities not implemented") } func (UnimplementedVulnerabilitiesServer) mustEmbedUnimplementedVulnerabilitiesServer() {} -func (UnimplementedVulnerabilitiesServer) testEmbeddedByValue() {} // UnsafeVulnerabilitiesServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to VulnerabilitiesServer will @@ -146,13 +135,6 @@ type UnsafeVulnerabilitiesServer interface { } func RegisterVulnerabilitiesServer(s grpc.ServiceRegistrar, srv VulnerabilitiesServer) { - // If the following call pancis, it indicates UnimplementedVulnerabilitiesServer was - // embedded by pointer and is nil. This will cause panics if an - // unimplemented method is ever invoked, so we test this at initialization - // time to prevent it from happening at runtime later due to I/O. - if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { - t.testEmbeddedByValue() - } s.RegisterService(&Vulnerabilities_ServiceDesc, srv) } diff --git a/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json b/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json index 9b8bd58..6e6e45b 100644 --- a/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json +++ b/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json @@ -471,8 +471,7 @@ "requirement": { "type": "string" } - }, - "title": "TODO: Replace by Purl message" + } }, "v2StatusCode": { "type": "string", diff --git a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json index 20e60e9..85b24c0 100644 --- a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json +++ b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json @@ -98,48 +98,35 @@ "Dependencies" ] } - }, - "/api/v2/dependencies/transitive": { - "post": { - "operationId": "Dependencies_GetTransitiveDependencies", - "responses": { - "200": { - "description": "A successful response.", - "schema": { - "$ref": "#/definitions/v2TransitiveDependencyResponse" - } - }, - "404": { - "description": "Returned when the resource does not exist.", - "schema": { - "type": "string", - "format": "string" - } - }, - "default": { - "description": "An unexpected error response.", - "schema": { - "$ref": "#/definitions/runtimeError" - } - } - }, - "parameters": [ - { - "name": "body", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/v2TransitiveDependencyRequest" - } - } - ], - "tags": [ - "Dependencies" - ] - } } }, "definitions": { + "DependencyResponseDependencies": { + "type": "object", + "properties": { + "component": { + "type": "string" + }, + "purl": { + "type": "string" + }, + "version": { + "type": "string" + }, + "licenses": { + "type": "array", + "items": { + "$ref": "#/definitions/DependencyResponseLicenses" + } + }, + "url": { + "type": "string" + }, + "comment": { + "type": "string" + } + } + }, "DependencyResponseLicenses": { "type": "object", "properties": { @@ -259,32 +246,6 @@ }, "title": "Dependency response data (JSON payload)" }, - "v2DependencyResponseDependencies": { - "type": "object", - "properties": { - "component": { - "type": "string" - }, - "purl": { - "type": "string" - }, - "version": { - "type": "string" - }, - "licenses": { - "type": "array", - "items": { - "$ref": "#/definitions/DependencyResponseLicenses" - } - }, - "url": { - "type": "string" - }, - "comment": { - "type": "string" - } - } - }, "v2DependencyResponseFiles": { "type": "object", "properties": { @@ -300,7 +261,7 @@ "dependencies": { "type": "array", "items": { - "$ref": "#/definitions/v2DependencyResponseDependencies" + "$ref": "#/definitions/DependencyResponseDependencies" } } } @@ -323,18 +284,6 @@ }, "title": "Echo Message Response" }, - "v2Purl": { - "type": "object", - "properties": { - "purl": { - "type": "string" - }, - "requirement": { - "type": "string" - } - }, - "title": "Purl to be requested" - }, "v2StatusCode": { "type": "string", "enum": [ @@ -360,59 +309,6 @@ } }, "title": "Detailed response details" - }, - "v2TransitiveDependencyRequest": { - "type": "object", - "properties": { - "ecosystem": { - "type": "string" - }, - "depth": { - "type": "integer", - "format": "int32", - "title": "Depth to go when searching dependencies" - }, - "limit": { - "type": "integer", - "format": "int32", - "title": "Limit used on response" - }, - "purls": { - "type": "array", - "items": { - "$ref": "#/definitions/v2Purl" - }, - "title": "List of Purls from the same ecosystem" - } - } - }, - "v2TransitiveDependencyResponse": { - "type": "object", - "properties": { - "dependencies": { - "type": "array", - "items": { - "$ref": "#/definitions/v2TransitiveDependencyResponseDependencies" - }, - "title": "Dependency response details" - }, - "status": { - "$ref": "#/definitions/v2StatusResponse", - "title": "Response status" - } - }, - "title": "Transitive dependency response data (JSON payload)" - }, - "v2TransitiveDependencyResponseDependencies": { - "type": "object", - "properties": { - "purl": { - "type": "string" - }, - "version": { - "type": "string" - } - } } } } diff --git a/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json b/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json index 6dad99b..7516558 100644 --- a/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json +++ b/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json @@ -252,8 +252,7 @@ "requirement": { "type": "string" } - }, - "title": "TODO: Replace by Purl message" + } }, "v2StatusCode": { "type": "string", diff --git a/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json b/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json index 86f016b..caac2fb 100644 --- a/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json +++ b/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json @@ -170,7 +170,7 @@ "properties": { "type_url": { "type": "string", - "description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n URL, or have them precompiled into a binary to avoid any\n lookup. Therefore, binary compatibility needs to be preserved\n on changes to types. (Use versioned type names to manage\n breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com. As of May 2023, there are no widely used type server\nimplementations and no plans to implement one.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics." + "description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n URL, or have them precompiled into a binary to avoid any\n lookup. Therefore, binary compatibility needs to be preserved\n on changes to types. (Use versioned type names to manage\n breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics." }, "value": { "type": "string", @@ -178,7 +178,7 @@ "description": "Must be a valid serialized protocol buffer of the above specified type." } }, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n\nExample 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\nExample 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" }, "runtimeError": { "type": "object", diff --git a/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json b/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json index ae1e430..1858b0f 100644 --- a/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json +++ b/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json @@ -212,8 +212,7 @@ "requirement": { "type": "string" } - }, - "title": "TODO: Replace by Purl message" + } }, "v2SemgrepResponse": { "type": "object", From 20ec4a8b25ff4a44ef4d37ebaa447e03fcb477a2 Mon Sep 17 00:00:00 2001 From: Agustin Isasmendi Date: Fri, 28 Mar 2025 16:29:25 +0100 Subject: [PATCH 8/9] chore(scanoss-dependencies): fix field numbers on TransitiveDependencyResponse --- .../scanoss/api/dependencies/v2/scanoss-dependencies.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto index 1b8def0..2f3f217 100644 --- a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto +++ b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto @@ -170,11 +170,11 @@ message TransitiveDependencyRequest { */ message TransitiveDependencyResponse { message Dependencies { - string purl = 2; - string version = 3; + string purl = 1; + string version = 2; // TODO: Add scope field - // optional string scope = 4; + // optional string scope = 3; } // Dependency response details repeated Dependencies dependencies = 1; From 9bdc2d5c89942a9ad85992c8befb8a92b7a1e459 Mon Sep 17 00:00:00 2001 From: eeisegn Date: Fri, 28 Mar 2025 17:56:52 +0000 Subject: [PATCH 9/9] generated swagger and stubs --- api/commonv2/scanoss-common.pb.go | 119 ++++- api/componentsv2/scanoss-components.pb.go | 65 ++- api/componentsv2/scanoss-components.pb.gw.go | 98 ++-- .../scanoss-components_grpc.pb.go | 2 +- api/cryptographyv2/scanoss-cryptography.pb.go | 90 ++-- .../scanoss-cryptography.pb.gw.go | 146 +++--- .../scanoss-cryptography_grpc.pb.go | 2 +- api/dependenciesv2/scanoss-dependencies.pb.go | 435 ++++++++++++++---- .../scanoss-dependencies.pb.gw.go | 131 ++++-- .../scanoss-dependencies_grpc.pb.go | 45 +- api/provenancev2/scanoss-provenance.pb.go | 54 +-- api/provenancev2/scanoss-provenance.pb.gw.go | 50 +- .../scanoss-provenance_grpc.pb.go | 2 +- api/scanningv2/scanoss-scanning.pb.go | 2 +- api/scanningv2/scanoss-scanning_grpc.pb.go | 2 +- api/semgrepv2/scanoss-semgrep.pb.go | 49 +- api/semgrepv2/scanoss-semgrep.pb.gw.go | 50 +- api/semgrepv2/scanoss-semgrep_grpc.pb.go | 2 +- .../scanoss-vulnerabilities.pb.go | 65 ++- .../scanoss-vulnerabilities.pb.gw.go | 74 ++- .../scanoss-vulnerabilities_grpc.pb.go | 2 +- .../api/common/v2/scanoss-common.proto | 2 - .../v2/scanoss-components.swagger.json | 3 +- .../v2/scanoss-dependencies.proto | 14 +- .../v2/scanoss-dependencies.swagger.json | 161 +++++-- .../v2/scanoss-provenance.swagger.json | 3 +- .../scanning/v2/scanoss-scanning.swagger.json | 4 +- .../semgrep/v2/scanoss-semgrep.swagger.json | 3 +- 28 files changed, 1075 insertions(+), 600 deletions(-) diff --git a/api/commonv2/scanoss-common.pb.go b/api/commonv2/scanoss-common.pb.go index ad5d147..5bd758a 100644 --- a/api/commonv2/scanoss-common.pb.go +++ b/api/commonv2/scanoss-common.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.28.1 +// protoc v5.29.3 // source: scanoss/api/common/v2/scanoss-common.proto package commonv2 @@ -47,7 +47,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Status code Enum type StatusCode int32 @@ -104,7 +103,6 @@ func (StatusCode) EnumDescriptor() ([]byte, []int) { return file_scanoss_api_common_v2_scanoss_common_proto_rawDescGZIP(), []int{0} } -// // Detailed response details type StatusResponse struct { state protoimpl.MessageState @@ -163,7 +161,6 @@ func (x *StatusResponse) GetMessage() string { return "" } -// // Echo Message Request type EchoRequest struct { state protoimpl.MessageState @@ -212,7 +209,6 @@ func (x *EchoRequest) GetMessage() string { return "" } -// // Echo Message Response type EchoResponse struct { state protoimpl.MessageState @@ -261,7 +257,6 @@ func (x *EchoResponse) GetMessage() string { return "" } -// // Purl request data (JSON payload) type PurlRequest struct { state protoimpl.MessageState @@ -311,6 +306,65 @@ func (x *PurlRequest) GetPurls() []*PurlRequest_Purls { return nil } +// Purl to be requested +type Purl struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Requirement string `protobuf:"bytes,2,opt,name=requirement,proto3" json:"requirement,omitempty"` +} + +func (x *Purl) Reset() { + *x = Purl{} + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Purl) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Purl) ProtoMessage() {} + +func (x *Purl) ProtoReflect() protoreflect.Message { + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Purl.ProtoReflect.Descriptor instead. +func (*Purl) Descriptor() ([]byte, []int) { + return file_scanoss_api_common_v2_scanoss_common_proto_rawDescGZIP(), []int{4} +} + +func (x *Purl) GetPurl() string { + if x != nil { + return x.Purl + } + return "" +} + +func (x *Purl) GetRequirement() string { + if x != nil { + return x.Requirement + } + return "" +} + +// TODO: Refactor this API +// - Remove nested Purls message and replace with top-level Purl message type. +// - Update field definition below to: repeated Purl purls = 1; type PurlRequest_Purls struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -324,7 +378,7 @@ type PurlRequest_Purls struct { func (x *PurlRequest_Purls) Reset() { *x = PurlRequest_Purls{} if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -337,7 +391,7 @@ func (x *PurlRequest_Purls) String() string { func (*PurlRequest_Purls) ProtoMessage() {} func (x *PurlRequest_Purls) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4] + mi := &file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -394,17 +448,21 @@ var file_scanoss_api_common_v2_scanoss_common_proto_rawDesc = []byte{ 0x05, 0x50, 0x75, 0x72, 0x6c, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0b, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2a, 0x60, 0x0a, 0x0a, - 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, - 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, - 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x55, 0x43, 0x43, - 0x45, 0x45, 0x44, 0x45, 0x44, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x49, - 0x4e, 0x47, 0x53, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, - 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x04, 0x42, 0x2f, - 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, - 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, - 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x32, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x32, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0b, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3c, 0x0a, 0x04, + 0x50, 0x75, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x71, 0x75, + 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, + 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2a, 0x60, 0x0a, 0x0a, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, + 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, + 0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x55, 0x43, 0x43, 0x45, 0x45, + 0x44, 0x45, 0x44, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, + 0x53, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x03, + 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x04, 0x42, 0x2f, 0x5a, 0x2d, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, + 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, + 0x6f, 0x6e, 0x76, 0x32, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x32, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -420,18 +478,19 @@ func file_scanoss_api_common_v2_scanoss_common_proto_rawDescGZIP() []byte { } var file_scanoss_api_common_v2_scanoss_common_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_scanoss_api_common_v2_scanoss_common_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_scanoss_api_common_v2_scanoss_common_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_scanoss_api_common_v2_scanoss_common_proto_goTypes = []interface{}{ (StatusCode)(0), // 0: scanoss.api.common.v2.StatusCode (*StatusResponse)(nil), // 1: scanoss.api.common.v2.StatusResponse (*EchoRequest)(nil), // 2: scanoss.api.common.v2.EchoRequest (*EchoResponse)(nil), // 3: scanoss.api.common.v2.EchoResponse (*PurlRequest)(nil), // 4: scanoss.api.common.v2.PurlRequest - (*PurlRequest_Purls)(nil), // 5: scanoss.api.common.v2.PurlRequest.Purls + (*Purl)(nil), // 5: scanoss.api.common.v2.Purl + (*PurlRequest_Purls)(nil), // 6: scanoss.api.common.v2.PurlRequest.Purls } var file_scanoss_api_common_v2_scanoss_common_proto_depIdxs = []int32{ 0, // 0: scanoss.api.common.v2.StatusResponse.status:type_name -> scanoss.api.common.v2.StatusCode - 5, // 1: scanoss.api.common.v2.PurlRequest.purls:type_name -> scanoss.api.common.v2.PurlRequest.Purls + 6, // 1: scanoss.api.common.v2.PurlRequest.purls:type_name -> scanoss.api.common.v2.PurlRequest.Purls 2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name @@ -494,6 +553,18 @@ func file_scanoss_api_common_v2_scanoss_common_proto_init() { } } file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Purl); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_common_v2_scanoss_common_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PurlRequest_Purls); i { case 0: return &v.state @@ -512,7 +583,7 @@ func file_scanoss_api_common_v2_scanoss_common_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_scanoss_api_common_v2_scanoss_common_proto_rawDesc, NumEnums: 1, - NumMessages: 5, + NumMessages: 6, NumExtensions: 0, NumServices: 0, }, diff --git a/api/componentsv2/scanoss-components.pb.go b/api/componentsv2/scanoss-components.pb.go index d03174c..f5b5901 100644 --- a/api/componentsv2/scanoss-components.pb.go +++ b/api/componentsv2/scanoss-components.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.28.1 +// protoc v5.29.3 // source: scanoss/api/components/v2/scanoss-components.proto package componentsv2 @@ -50,7 +50,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Component Search request data (JSON payload) type CompSearchRequest struct { state protoimpl.MessageState @@ -216,7 +215,6 @@ func (x *CompStatistic) GetLanguages() []*CompStatistic_Language { return nil } -// // Component Statistics response data (JSON payload) type CompStatisticResponse struct { state protoimpl.MessageState @@ -275,7 +273,6 @@ func (x *CompStatisticResponse) GetStatus() *commonv2.StatusResponse { return nil } -// // Component Search response data (JSON payload) type CompSearchResponse struct { state protoimpl.MessageState @@ -334,7 +331,6 @@ func (x *CompSearchResponse) GetStatus() *commonv2.StatusResponse { return nil } -// // Component Version request data (JSON payload) type CompVersionRequest struct { state protoimpl.MessageState @@ -393,7 +389,6 @@ func (x *CompVersionRequest) GetLimit() int32 { return 0 } -// // Component Search response data (JSON payload) type CompVersionResponse struct { state protoimpl.MessageState @@ -958,18 +953,18 @@ var file_scanoss_api_components_v2_scanoss_components_proto_rawDesc = []byte{ 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x3a, 0x01, 0x2a, 0x22, 0x17, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, - 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x12, 0x95, 0x01, 0x0a, 0x10, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x22, 0x17, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x65, 0x63, + 0x68, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x95, 0x01, 0x0a, 0x10, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x2c, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, - 0x01, 0x2a, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x70, - 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x9d, 0x01, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, + 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, + 0x6e, 0x74, 0x73, 0x2f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x3a, 0x01, 0x2a, 0x12, 0x9d, 0x01, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2d, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, @@ -977,9 +972,9 @@ var file_scanoss_api_components_v2_scanoss_components_proto_rawDesc = []byte{ 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a, - 0x22, 0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, - 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x98, 0x01, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x22, 0x1b, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, + 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x01, 0x2a, 0x12, 0x98, 0x01, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, @@ -987,26 +982,26 @@ var file_scanoss_api_components_v2_scanoss_components_proto_rawDesc = []byte{ 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x3a, 0x01, 0x2a, 0x22, 0x1d, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x73, 0x74, - 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x42, 0x94, 0x02, 0x92, 0x41, 0xd9, 0x01, 0x12, - 0x73, 0x0a, 0x1a, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x6f, - 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x50, 0x0a, - 0x12, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, - 0x6e, 0x74, 0x73, 0x12, 0x25, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x22, 0x1d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, + 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x69, + 0x73, 0x74, 0x69, 0x63, 0x73, 0x3a, 0x01, 0x2a, 0x42, 0x94, 0x02, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, - 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, - 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, - 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, - 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, - 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, - 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, - 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, - 0x76, 0x32, 0x3b, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x76, 0x32, 0x62, + 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, + 0x6e, 0x74, 0x73, 0x76, 0x32, 0x3b, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, + 0x76, 0x32, 0x92, 0x41, 0xd9, 0x01, 0x12, 0x73, 0x0a, 0x1a, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, + 0x53, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x12, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, + 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x25, 0x68, 0x74, 0x74, 0x70, + 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, + 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, + 0x73, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, 0x6f, + 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, 0x10, + 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, + 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, + 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, + 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, + 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/api/componentsv2/scanoss-components.pb.gw.go b/api/componentsv2/scanoss-components.pb.gw.go index b5cdbf6..b77e30b 100644 --- a/api/componentsv2/scanoss-components.pb.gw.go +++ b/api/componentsv2/scanoss-components.pb.gw.go @@ -180,22 +180,20 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Components_Echo_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Components_Echo_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Components_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Components_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -205,22 +203,20 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Components_SearchComponents_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Components_SearchComponents_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Components_SearchComponents_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Components_SearchComponents_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -230,22 +226,20 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Components_GetComponentVersions_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Components_GetComponentVersions_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Components_GetComponentVersions_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Components_GetComponentVersions_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -255,22 +249,20 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Components_GetComponentStatistics_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Components_GetComponentStatistics_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Components_GetComponentStatistics_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Components_GetComponentStatistics_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -280,7 +272,7 @@ func RegisterComponentsHandlerServer(ctx context.Context, mux *runtime.ServeMux, // RegisterComponentsHandlerFromEndpoint is same as RegisterComponentsHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterComponentsHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.Dial(endpoint, opts...) if err != nil { return err } @@ -319,21 +311,19 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/Echo", runtime.WithHTTPPathPattern("/api/v2/components/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Components_Echo_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Components_Echo_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Components_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Components_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -341,21 +331,19 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/SearchComponents", runtime.WithHTTPPathPattern("/api/v2/components/search")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Components_SearchComponents_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Components_SearchComponents_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Components_SearchComponents_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Components_SearchComponents_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -363,21 +351,19 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentVersions", runtime.WithHTTPPathPattern("/api/v2/components/versions")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Components_GetComponentVersions_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Components_GetComponentVersions_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Components_GetComponentVersions_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Components_GetComponentVersions_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -385,21 +371,19 @@ func RegisterComponentsHandlerClient(ctx context.Context, mux *runtime.ServeMux, ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.components.v2.Components/GetComponentStatistics", runtime.WithHTTPPathPattern("/api/v2/components/statistics")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Components_GetComponentStatistics_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Components_GetComponentStatistics_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Components_GetComponentStatistics_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Components_GetComponentStatistics_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) diff --git a/api/componentsv2/scanoss-components_grpc.pb.go b/api/componentsv2/scanoss-components_grpc.pb.go index f030596..ba378c9 100644 --- a/api/componentsv2/scanoss-components_grpc.pb.go +++ b/api/componentsv2/scanoss-components_grpc.pb.go @@ -28,7 +28,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc v5.29.3 // source: scanoss/api/components/v2/scanoss-components.proto package componentsv2 diff --git a/api/cryptographyv2/scanoss-cryptography.pb.go b/api/cryptographyv2/scanoss-cryptography.pb.go index c4cfc71..dfb4aca 100644 --- a/api/cryptographyv2/scanoss-cryptography.pb.go +++ b/api/cryptographyv2/scanoss-cryptography.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.28.1 +// protoc v5.29.3 // source: scanoss/api/cryptography/v2/scanoss-cryptography.proto package cryptographyv2 @@ -50,7 +50,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Cryptographic algorithm details type Algorithm struct { state protoimpl.MessageState @@ -109,7 +108,6 @@ func (x *Algorithm) GetStrength() string { return "" } -// // Cryptographic Algorithm response data type AlgorithmResponse struct { state protoimpl.MessageState @@ -168,7 +166,6 @@ func (x *AlgorithmResponse) GetStatus() *commonv2.StatusResponse { return nil } -// // Cryptographic Algorithm response data for a given range or criteria type AlgorithmsInRangeResponse struct { state protoimpl.MessageState @@ -227,8 +224,7 @@ func (x *AlgorithmsInRangeResponse) GetStatus() *commonv2.StatusResponse { return nil } -// -// Versions with/without cryptographic algorithms detected for the given range or criteria +// Versions with/without cryptographic algorithms detected for the given range or criteria type VersionsInRangeResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -286,7 +282,6 @@ func (x *VersionsInRangeResponse) GetStatus() *commonv2.StatusResponse { return nil } -// // Structure to record hints of Encryption protocols, libraries, SDKs and frameworks type Hint struct { state protoimpl.MessageState @@ -381,7 +376,6 @@ func (x *Hint) GetPurl() string { return "" } -// // Encryption Hints response data type HintsResponse struct { state protoimpl.MessageState @@ -440,7 +434,7 @@ func (x *HintsResponse) GetStatus() *commonv2.StatusResponse { return nil } -//* +// * // Hints of Encryption protocols, libraries, SDKs and frameworks for a purls in range type HintsInRangeResponse struct { state protoimpl.MessageState @@ -960,28 +954,28 @@ var file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_rawDesc = []byte 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x1e, 0x3a, 0x01, 0x2a, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, - 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x65, 0x63, 0x68, 0x6f, + 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x72, 0x79, 0x70, + 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x8f, 0x01, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x73, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x75, 0x72, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x3a, 0x01, - 0x2a, 0x22, 0x1f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, - 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, - 0x6d, 0x73, 0x12, 0xa5, 0x01, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x22, 0x1f, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, + 0x61, 0x70, 0x68, 0x79, 0x2f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x73, 0x3a, + 0x01, 0x2a, 0x12, 0xa5, 0x01, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x73, 0x49, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x75, 0x72, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x73, 0x49, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x31, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b, 0x3a, - 0x01, 0x2a, 0x22, 0x26, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x72, 0x79, 0x70, - 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, - 0x68, 0x6d, 0x73, 0x49, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x9f, 0x01, 0x0a, 0x12, 0x47, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x31, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b, 0x22, + 0x26, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, + 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x73, + 0x49, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x9f, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x49, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x75, 0x72, 0x6c, 0x52, 0x65, @@ -989,46 +983,46 @@ var file_scanoss_api_cryptography_v2_scanoss_cryptography_proto_rawDesc = []byte 0x61, 0x70, 0x69, 0x2e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x49, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x29, 0x3a, 0x01, 0x2a, 0x22, 0x24, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, - 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x76, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x49, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x96, 0x01, 0x0a, + 0x93, 0x02, 0x29, 0x22, 0x24, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x72, 0x79, + 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x6e, 0x73, 0x49, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x96, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x48, 0x69, 0x6e, 0x74, 0x73, 0x49, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x75, 0x72, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x69, 0x6e, 0x74, 0x73, 0x49, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x3a, - 0x01, 0x2a, 0x22, 0x21, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x72, 0x79, 0x70, - 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x68, 0x69, 0x6e, 0x74, 0x73, 0x49, 0x6e, - 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x8b, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x22, + 0x21, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, + 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x68, 0x69, 0x6e, 0x74, 0x73, 0x49, 0x6e, 0x52, 0x61, 0x6e, + 0x67, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x8b, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x75, 0x72, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x69, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x25, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x1f, 0x3a, 0x01, 0x2a, 0x22, 0x1a, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, - 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x68, 0x69, - 0x6e, 0x74, 0x73, 0x42, 0x9e, 0x02, 0x92, 0x41, 0xdf, 0x01, 0x12, 0x79, 0x0a, 0x1c, 0x53, 0x43, - 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x43, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, - 0x68, 0x79, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x54, 0x0a, 0x14, 0x73, 0x63, - 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, - 0x68, 0x79, 0x12, 0x27, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x63, - 0x72, 0x70, 0x79, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x1a, 0x13, 0x73, 0x75, 0x70, - 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, - 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, - 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, - 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, - 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, - 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, - 0x70, 0x68, 0x79, 0x76, 0x32, 0x3b, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, - 0x68, 0x79, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0xe4, 0x93, 0x02, 0x1f, 0x22, 0x1a, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x72, + 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x2f, 0x68, 0x69, 0x6e, 0x74, 0x73, + 0x3a, 0x01, 0x2a, 0x42, 0x9e, 0x02, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, + 0x76, 0x32, 0x3b, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x76, + 0x32, 0x92, 0x41, 0xdf, 0x01, 0x12, 0x79, 0x0a, 0x1c, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, + 0x20, 0x43, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x20, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x54, 0x0a, 0x14, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, + 0x2d, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x12, 0x27, 0x68, + 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x63, 0x72, 0x70, 0x79, 0x74, 0x6f, + 0x67, 0x72, 0x61, 0x70, 0x68, 0x79, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, + 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, + 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, + 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, + 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, + 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, + 0x9a, 0x02, 0x01, 0x07, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/cryptographyv2/scanoss-cryptography.pb.gw.go b/api/cryptographyv2/scanoss-cryptography.pb.gw.go index 65d1623..6875bb7 100644 --- a/api/cryptographyv2/scanoss-cryptography.pb.gw.go +++ b/api/cryptographyv2/scanoss-cryptography.pb.gw.go @@ -248,22 +248,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Cryptography_Echo_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Cryptography_Echo_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -273,22 +271,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Cryptography_GetAlgorithms_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Cryptography_GetAlgorithms_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetAlgorithms_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_GetAlgorithms_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -298,22 +294,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Cryptography_GetAlgorithmsInRange_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Cryptography_GetAlgorithmsInRange_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetAlgorithmsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_GetAlgorithmsInRange_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -323,22 +317,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Cryptography_GetVersionsInRange_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Cryptography_GetVersionsInRange_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetVersionsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_GetVersionsInRange_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -348,22 +340,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Cryptography_GetHintsInRange_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Cryptography_GetHintsInRange_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetHintsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_GetHintsInRange_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -373,22 +363,20 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Cryptography_GetEncryptionHints_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Cryptography_GetEncryptionHints_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetEncryptionHints_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_GetEncryptionHints_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -398,7 +386,7 @@ func RegisterCryptographyHandlerServer(ctx context.Context, mux *runtime.ServeMu // RegisterCryptographyHandlerFromEndpoint is same as RegisterCryptographyHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterCryptographyHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.Dial(endpoint, opts...) if err != nil { return err } @@ -437,21 +425,19 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/Echo", runtime.WithHTTPPathPattern("/api/v2/cryptography/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Cryptography_Echo_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Cryptography_Echo_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -459,21 +445,19 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithms", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithms")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Cryptography_GetAlgorithms_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Cryptography_GetAlgorithms_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetAlgorithms_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_GetAlgorithms_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -481,21 +465,19 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetAlgorithmsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/algorithmsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Cryptography_GetAlgorithmsInRange_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Cryptography_GetAlgorithmsInRange_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetAlgorithmsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_GetAlgorithmsInRange_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -503,21 +485,19 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetVersionsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/versionsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Cryptography_GetVersionsInRange_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Cryptography_GetVersionsInRange_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetVersionsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_GetVersionsInRange_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -525,21 +505,19 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetHintsInRange", runtime.WithHTTPPathPattern("/api/v2/cryptography/hintsInRange")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Cryptography_GetHintsInRange_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Cryptography_GetHintsInRange_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetHintsInRange_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_GetHintsInRange_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -547,21 +525,19 @@ func RegisterCryptographyHandlerClient(ctx context.Context, mux *runtime.ServeMu ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.cryptography.v2.Cryptography/GetEncryptionHints", runtime.WithHTTPPathPattern("/api/v2/cryptography/hints")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Cryptography_GetEncryptionHints_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Cryptography_GetEncryptionHints_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Cryptography_GetEncryptionHints_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Cryptography_GetEncryptionHints_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) diff --git a/api/cryptographyv2/scanoss-cryptography_grpc.pb.go b/api/cryptographyv2/scanoss-cryptography_grpc.pb.go index b886ce8..b733bb2 100644 --- a/api/cryptographyv2/scanoss-cryptography_grpc.pb.go +++ b/api/cryptographyv2/scanoss-cryptography_grpc.pb.go @@ -28,7 +28,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc v5.29.3 // source: scanoss/api/cryptography/v2/scanoss-cryptography.proto package cryptographyv2 diff --git a/api/dependenciesv2/scanoss-dependencies.pb.go b/api/dependenciesv2/scanoss-dependencies.pb.go index c5bfd75..f80a8ee 100644 --- a/api/dependenciesv2/scanoss-dependencies.pb.go +++ b/api/dependenciesv2/scanoss-dependencies.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.28.1 +// protoc v5.29.3 // source: scanoss/api/dependencies/v2/scanoss-dependencies.proto package dependenciesv2 @@ -50,7 +50,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Dependency request data (JSON payload) type DependencyRequest struct { state protoimpl.MessageState @@ -109,7 +108,6 @@ func (x *DependencyRequest) GetDepth() int32 { return 0 } -// // Dependency response data (JSON payload) type DependencyResponse struct { state protoimpl.MessageState @@ -168,6 +166,140 @@ func (x *DependencyResponse) GetStatus() *commonv2.StatusResponse { return nil } +// Transitive dependency request data (JSON payload) +type TransitiveDependencyRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // Ecosystem to restrict reporting on (i.e. npm, maven, github, etc.) - optional + Ecosystem string `protobuf:"bytes,1,opt,name=ecosystem,proto3" json:"ecosystem,omitempty"` + // Depth (number of layers) to go when searching for dependencies - optional + Depth int32 `protobuf:"varint,2,opt,name=depth,proto3" json:"depth,omitempty"` + // Limit the number of components reported back - optional + Limit int32 `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"` + // List of Purls from the same ecosystem + Purls []*commonv2.Purl `protobuf:"bytes,5,rep,name=purls,proto3" json:"purls,omitempty"` +} + +func (x *TransitiveDependencyRequest) Reset() { + *x = TransitiveDependencyRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TransitiveDependencyRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TransitiveDependencyRequest) ProtoMessage() {} + +func (x *TransitiveDependencyRequest) ProtoReflect() protoreflect.Message { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TransitiveDependencyRequest.ProtoReflect.Descriptor instead. +func (*TransitiveDependencyRequest) Descriptor() ([]byte, []int) { + return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP(), []int{2} +} + +func (x *TransitiveDependencyRequest) GetEcosystem() string { + if x != nil { + return x.Ecosystem + } + return "" +} + +func (x *TransitiveDependencyRequest) GetDepth() int32 { + if x != nil { + return x.Depth + } + return 0 +} + +func (x *TransitiveDependencyRequest) GetLimit() int32 { + if x != nil { + return x.Limit + } + return 0 +} + +func (x *TransitiveDependencyRequest) GetPurls() []*commonv2.Purl { + if x != nil { + return x.Purls + } + return nil +} + +// Transitive dependency response data (JSON payload) +type TransitiveDependencyResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // Dependency response details + Dependencies []*TransitiveDependencyResponse_Dependencies `protobuf:"bytes,1,rep,name=dependencies,proto3" json:"dependencies,omitempty"` + // Response status + Status *commonv2.StatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` +} + +func (x *TransitiveDependencyResponse) Reset() { + *x = TransitiveDependencyResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TransitiveDependencyResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TransitiveDependencyResponse) ProtoMessage() {} + +func (x *TransitiveDependencyResponse) ProtoReflect() protoreflect.Message { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TransitiveDependencyResponse.ProtoReflect.Descriptor instead. +func (*TransitiveDependencyResponse) Descriptor() ([]byte, []int) { + return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP(), []int{3} +} + +func (x *TransitiveDependencyResponse) GetDependencies() []*TransitiveDependencyResponse_Dependencies { + if x != nil { + return x.Dependencies + } + return nil +} + +func (x *TransitiveDependencyResponse) GetStatus() *commonv2.StatusResponse { + if x != nil { + return x.Status + } + return nil +} + // List of Purls/requirements type DependencyRequest_Purls struct { state protoimpl.MessageState @@ -183,7 +315,7 @@ type DependencyRequest_Purls struct { func (x *DependencyRequest_Purls) Reset() { *x = DependencyRequest_Purls{} if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -196,7 +328,7 @@ func (x *DependencyRequest_Purls) String() string { func (*DependencyRequest_Purls) ProtoMessage() {} func (x *DependencyRequest_Purls) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2] + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -241,7 +373,7 @@ type DependencyRequest_Files struct { func (x *DependencyRequest_Files) Reset() { *x = DependencyRequest_Files{} if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -254,7 +386,7 @@ func (x *DependencyRequest_Files) String() string { func (*DependencyRequest_Files) ProtoMessage() {} func (x *DependencyRequest_Files) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3] + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -298,7 +430,7 @@ type DependencyResponse_Licenses struct { func (x *DependencyResponse_Licenses) Reset() { *x = DependencyResponse_Licenses{} if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -311,7 +443,7 @@ func (x *DependencyResponse_Licenses) String() string { func (*DependencyResponse_Licenses) ProtoMessage() {} func (x *DependencyResponse_Licenses) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4] + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -371,7 +503,7 @@ type DependencyResponse_Dependencies struct { func (x *DependencyResponse_Dependencies) Reset() { *x = DependencyResponse_Dependencies{} if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -384,7 +516,7 @@ func (x *DependencyResponse_Dependencies) String() string { func (*DependencyResponse_Dependencies) ProtoMessage() {} func (x *DependencyResponse_Dependencies) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5] + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -456,7 +588,7 @@ type DependencyResponse_Files struct { func (x *DependencyResponse_Files) Reset() { *x = DependencyResponse_Files{} if protoimpl.UnsafeEnabled { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -469,7 +601,7 @@ func (x *DependencyResponse_Files) String() string { func (*DependencyResponse_Files) ProtoMessage() {} func (x *DependencyResponse_Files) ProtoReflect() protoreflect.Message { - mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6] + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -513,6 +645,61 @@ func (x *DependencyResponse_Files) GetDependencies() []*DependencyResponse_Depen return nil } +type TransitiveDependencyResponse_Dependencies struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Purl string `protobuf:"bytes,1,opt,name=purl,proto3" json:"purl,omitempty"` + Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` // optional string scope = 3; // TODO: Add scope field +} + +func (x *TransitiveDependencyResponse_Dependencies) Reset() { + *x = TransitiveDependencyResponse_Dependencies{} + if protoimpl.UnsafeEnabled { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TransitiveDependencyResponse_Dependencies) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TransitiveDependencyResponse_Dependencies) ProtoMessage() {} + +func (x *TransitiveDependencyResponse_Dependencies) ProtoReflect() protoreflect.Message { + mi := &file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TransitiveDependencyResponse_Dependencies.ProtoReflect.Descriptor instead. +func (*TransitiveDependencyResponse_Dependencies) Descriptor() ([]byte, []int) { + return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP(), []int{3, 0} +} + +func (x *TransitiveDependencyResponse_Dependencies) GetPurl() string { + if x != nil { + return x.Purl + } + return "" +} + +func (x *TransitiveDependencyResponse_Dependencies) GetVersion() string { + if x != nil { + return x.Version + } + return "" +} + var File_scanoss_api_dependencies_v2_scanoss_dependencies_proto protoreflect.FileDescriptor var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDesc = []byte{ @@ -588,44 +775,83 @@ var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDesc = []byte 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x52, 0x0c, - 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x32, 0xa8, 0x02, 0x0a, - 0x0c, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x75, 0x0a, - 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, - 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, - 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, - 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, - 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x24, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x01, 0x2a, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x22, 0x9a, 0x01, 0x0a, + 0x1b, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, + 0x65, 0x63, 0x6f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x65, 0x63, 0x6f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, + 0x70, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x70, 0x74, 0x68, + 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x31, 0x0a, 0x05, 0x70, 0x75, 0x72, 0x6c, 0x73, 0x18, + 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x75, + 0x72, 0x6c, 0x52, 0x05, 0x70, 0x75, 0x72, 0x6c, 0x73, 0x22, 0x87, 0x02, 0x0a, 0x1c, 0x54, 0x72, + 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, + 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6a, 0x0a, 0x0c, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x46, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, + 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x54, + 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x65, 0x70, 0x65, + 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x52, 0x0c, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, + 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x3d, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x06, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a, 0x3c, 0x0a, 0x0c, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x75, 0x72, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x32, 0xe7, 0x03, 0x0a, 0x0c, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, + 0x63, 0x69, 0x65, 0x73, 0x12, 0x75, 0x0a, 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x22, 0x2e, 0x73, + 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, + 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, + 0x69, 0x65, 0x73, 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0xa0, 0x01, 0x0a, 0x0f, + 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, + 0x2e, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x2f, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x22, 0x21, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, + 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x64, + 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x3a, 0x01, 0x2a, 0x12, 0xbc, + 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, + 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x38, 0x2e, 0x73, + 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, + 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x39, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, + 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, + 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x22, 0x1f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2f, - 0x65, 0x63, 0x68, 0x6f, 0x12, 0xa0, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, - 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x2e, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, - 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, - 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, - 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x26, 0x3a, 0x01, 0x2a, 0x22, 0x21, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, - 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, - 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x42, 0x9c, 0x02, 0x92, 0x41, 0xdd, 0x01, 0x12, 0x77, - 0x0a, 0x1a, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, - 0x65, 0x6e, 0x63, 0x79, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x54, 0x0a, 0x14, - 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, - 0x63, 0x69, 0x65, 0x73, 0x12, 0x27, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, - 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x1a, 0x13, 0x73, - 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, - 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, - 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, - 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, - 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, - 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x5a, 0x39, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, - 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, - 0x6e, 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x3b, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, - 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x3a, 0x01, 0x2a, 0x42, 0x9c, 0x02, + 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, + 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x65, + 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x3b, 0x64, 0x65, 0x70, + 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x76, 0x32, 0x92, 0x41, 0xdd, 0x01, 0x12, + 0x77, 0x0a, 0x1a, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x44, 0x65, 0x70, 0x65, 0x6e, + 0x64, 0x65, 0x6e, 0x63, 0x79, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x54, 0x0a, + 0x14, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, + 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x27, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, + 0x73, 0x2f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x1a, 0x13, + 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, + 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, + 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, + 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, + 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, + 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, + 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -640,35 +866,44 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescGZIP() [ return file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDescData } -var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_goTypes = []interface{}{ - (*DependencyRequest)(nil), // 0: scanoss.api.dependencies.v2.DependencyRequest - (*DependencyResponse)(nil), // 1: scanoss.api.dependencies.v2.DependencyResponse - (*DependencyRequest_Purls)(nil), // 2: scanoss.api.dependencies.v2.DependencyRequest.Purls - (*DependencyRequest_Files)(nil), // 3: scanoss.api.dependencies.v2.DependencyRequest.Files - (*DependencyResponse_Licenses)(nil), // 4: scanoss.api.dependencies.v2.DependencyResponse.Licenses - (*DependencyResponse_Dependencies)(nil), // 5: scanoss.api.dependencies.v2.DependencyResponse.Dependencies - (*DependencyResponse_Files)(nil), // 6: scanoss.api.dependencies.v2.DependencyResponse.Files - (*commonv2.StatusResponse)(nil), // 7: scanoss.api.common.v2.StatusResponse - (*commonv2.EchoRequest)(nil), // 8: scanoss.api.common.v2.EchoRequest - (*commonv2.EchoResponse)(nil), // 9: scanoss.api.common.v2.EchoResponse + (*DependencyRequest)(nil), // 0: scanoss.api.dependencies.v2.DependencyRequest + (*DependencyResponse)(nil), // 1: scanoss.api.dependencies.v2.DependencyResponse + (*TransitiveDependencyRequest)(nil), // 2: scanoss.api.dependencies.v2.TransitiveDependencyRequest + (*TransitiveDependencyResponse)(nil), // 3: scanoss.api.dependencies.v2.TransitiveDependencyResponse + (*DependencyRequest_Purls)(nil), // 4: scanoss.api.dependencies.v2.DependencyRequest.Purls + (*DependencyRequest_Files)(nil), // 5: scanoss.api.dependencies.v2.DependencyRequest.Files + (*DependencyResponse_Licenses)(nil), // 6: scanoss.api.dependencies.v2.DependencyResponse.Licenses + (*DependencyResponse_Dependencies)(nil), // 7: scanoss.api.dependencies.v2.DependencyResponse.Dependencies + (*DependencyResponse_Files)(nil), // 8: scanoss.api.dependencies.v2.DependencyResponse.Files + (*TransitiveDependencyResponse_Dependencies)(nil), // 9: scanoss.api.dependencies.v2.TransitiveDependencyResponse.Dependencies + (*commonv2.StatusResponse)(nil), // 10: scanoss.api.common.v2.StatusResponse + (*commonv2.Purl)(nil), // 11: scanoss.api.common.v2.Purl + (*commonv2.EchoRequest)(nil), // 12: scanoss.api.common.v2.EchoRequest + (*commonv2.EchoResponse)(nil), // 13: scanoss.api.common.v2.EchoResponse } var file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_depIdxs = []int32{ - 3, // 0: scanoss.api.dependencies.v2.DependencyRequest.files:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Files - 6, // 1: scanoss.api.dependencies.v2.DependencyResponse.files:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Files - 7, // 2: scanoss.api.dependencies.v2.DependencyResponse.status:type_name -> scanoss.api.common.v2.StatusResponse - 2, // 3: scanoss.api.dependencies.v2.DependencyRequest.Files.purls:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Purls - 4, // 4: scanoss.api.dependencies.v2.DependencyResponse.Dependencies.licenses:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Licenses - 5, // 5: scanoss.api.dependencies.v2.DependencyResponse.Files.dependencies:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Dependencies - 8, // 6: scanoss.api.dependencies.v2.Dependencies.Echo:input_type -> scanoss.api.common.v2.EchoRequest - 0, // 7: scanoss.api.dependencies.v2.Dependencies.GetDependencies:input_type -> scanoss.api.dependencies.v2.DependencyRequest - 9, // 8: scanoss.api.dependencies.v2.Dependencies.Echo:output_type -> scanoss.api.common.v2.EchoResponse - 1, // 9: scanoss.api.dependencies.v2.Dependencies.GetDependencies:output_type -> scanoss.api.dependencies.v2.DependencyResponse - 8, // [8:10] is the sub-list for method output_type - 6, // [6:8] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name + 5, // 0: scanoss.api.dependencies.v2.DependencyRequest.files:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Files + 8, // 1: scanoss.api.dependencies.v2.DependencyResponse.files:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Files + 10, // 2: scanoss.api.dependencies.v2.DependencyResponse.status:type_name -> scanoss.api.common.v2.StatusResponse + 11, // 3: scanoss.api.dependencies.v2.TransitiveDependencyRequest.purls:type_name -> scanoss.api.common.v2.Purl + 9, // 4: scanoss.api.dependencies.v2.TransitiveDependencyResponse.dependencies:type_name -> scanoss.api.dependencies.v2.TransitiveDependencyResponse.Dependencies + 10, // 5: scanoss.api.dependencies.v2.TransitiveDependencyResponse.status:type_name -> scanoss.api.common.v2.StatusResponse + 4, // 6: scanoss.api.dependencies.v2.DependencyRequest.Files.purls:type_name -> scanoss.api.dependencies.v2.DependencyRequest.Purls + 6, // 7: scanoss.api.dependencies.v2.DependencyResponse.Dependencies.licenses:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Licenses + 7, // 8: scanoss.api.dependencies.v2.DependencyResponse.Files.dependencies:type_name -> scanoss.api.dependencies.v2.DependencyResponse.Dependencies + 12, // 9: scanoss.api.dependencies.v2.Dependencies.Echo:input_type -> scanoss.api.common.v2.EchoRequest + 0, // 10: scanoss.api.dependencies.v2.Dependencies.GetDependencies:input_type -> scanoss.api.dependencies.v2.DependencyRequest + 2, // 11: scanoss.api.dependencies.v2.Dependencies.GetTransitiveDependencies:input_type -> scanoss.api.dependencies.v2.TransitiveDependencyRequest + 13, // 12: scanoss.api.dependencies.v2.Dependencies.Echo:output_type -> scanoss.api.common.v2.EchoResponse + 1, // 13: scanoss.api.dependencies.v2.Dependencies.GetDependencies:output_type -> scanoss.api.dependencies.v2.DependencyResponse + 3, // 14: scanoss.api.dependencies.v2.Dependencies.GetTransitiveDependencies:output_type -> scanoss.api.dependencies.v2.TransitiveDependencyResponse + 12, // [12:15] is the sub-list for method output_type + 9, // [9:12] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() } @@ -702,7 +937,7 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() { } } file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyRequest_Purls); i { + switch v := v.(*TransitiveDependencyRequest); i { case 0: return &v.state case 1: @@ -714,7 +949,7 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() { } } file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyRequest_Files); i { + switch v := v.(*TransitiveDependencyResponse); i { case 0: return &v.state case 1: @@ -726,7 +961,7 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() { } } file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyResponse_Licenses); i { + switch v := v.(*DependencyRequest_Purls); i { case 0: return &v.state case 1: @@ -738,7 +973,7 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() { } } file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DependencyResponse_Dependencies); i { + switch v := v.(*DependencyRequest_Files); i { case 0: return &v.state case 1: @@ -750,6 +985,30 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() { } } file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DependencyResponse_Licenses); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DependencyResponse_Dependencies); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DependencyResponse_Files); i { case 0: return &v.state @@ -761,6 +1020,18 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() { return nil } } + file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TransitiveDependencyResponse_Dependencies); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -768,7 +1039,7 @@ func file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_scanoss_api_dependencies_v2_scanoss_dependencies_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 10, NumExtensions: 0, NumServices: 1, }, diff --git a/api/dependenciesv2/scanoss-dependencies.pb.gw.go b/api/dependenciesv2/scanoss-dependencies.pb.gw.go index e8635ba..d7a826d 100644 --- a/api/dependenciesv2/scanoss-dependencies.pb.gw.go +++ b/api/dependenciesv2/scanoss-dependencies.pb.gw.go @@ -100,6 +100,40 @@ func local_request_Dependencies_GetDependencies_0(ctx context.Context, marshaler } +func request_Dependencies_GetTransitiveDependencies_0(ctx context.Context, marshaler runtime.Marshaler, client DependenciesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq TransitiveDependencyRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.GetTransitiveDependencies(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Dependencies_GetTransitiveDependencies_0(ctx context.Context, marshaler runtime.Marshaler, server DependenciesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq TransitiveDependencyRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.GetTransitiveDependencies(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterDependenciesHandlerServer registers the http handlers for service Dependencies to "mux". // UnaryRPC :call DependenciesServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -112,22 +146,20 @@ func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMu var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Dependencies_Echo_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Dependencies_Echo_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Dependencies_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Dependencies_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -137,22 +169,43 @@ func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMu var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Dependencies_GetDependencies_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Dependencies_GetDependencies_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Dependencies_GetDependencies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Dependencies_GetDependencies_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("POST", pattern_Dependencies_GetTransitiveDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetTransitiveDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/transitive")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Dependencies_GetTransitiveDependencies_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Dependencies_GetTransitiveDependencies_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -162,7 +215,7 @@ func RegisterDependenciesHandlerServer(ctx context.Context, mux *runtime.ServeMu // RegisterDependenciesHandlerFromEndpoint is same as RegisterDependenciesHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterDependenciesHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.Dial(endpoint, opts...) if err != nil { return err } @@ -201,21 +254,19 @@ func RegisterDependenciesHandlerClient(ctx context.Context, mux *runtime.ServeMu ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/Echo", runtime.WithHTTPPathPattern("/api/v2/dependencies/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Dependencies_Echo_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Dependencies_Echo_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Dependencies_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Dependencies_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -223,21 +274,39 @@ func RegisterDependenciesHandlerClient(ctx context.Context, mux *runtime.ServeMu ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/dependencies")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Dependencies_GetDependencies_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Dependencies_GetDependencies_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Dependencies_GetDependencies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Dependencies_GetDependencies_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("POST", pattern_Dependencies_GetTransitiveDependencies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.dependencies.v2.Dependencies/GetTransitiveDependencies", runtime.WithHTTPPathPattern("/api/v2/dependencies/transitive")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Dependencies_GetTransitiveDependencies_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Dependencies_GetTransitiveDependencies_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -248,10 +317,14 @@ var ( pattern_Dependencies_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "dependencies", "echo"}, "")) pattern_Dependencies_GetDependencies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 2}, []string{"api", "v2", "dependencies"}, "")) + + pattern_Dependencies_GetTransitiveDependencies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v2", "dependencies", "transitive"}, "")) ) var ( forward_Dependencies_Echo_0 = runtime.ForwardResponseMessage forward_Dependencies_GetDependencies_0 = runtime.ForwardResponseMessage + + forward_Dependencies_GetTransitiveDependencies_0 = runtime.ForwardResponseMessage ) diff --git a/api/dependenciesv2/scanoss-dependencies_grpc.pb.go b/api/dependenciesv2/scanoss-dependencies_grpc.pb.go index e5c5039..ae7901e 100644 --- a/api/dependenciesv2/scanoss-dependencies_grpc.pb.go +++ b/api/dependenciesv2/scanoss-dependencies_grpc.pb.go @@ -28,7 +28,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc v5.29.3 // source: scanoss/api/dependencies/v2/scanoss-dependencies.proto package dependenciesv2 @@ -47,8 +47,9 @@ import ( const _ = grpc.SupportPackageIsVersion7 const ( - Dependencies_Echo_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/Echo" - Dependencies_GetDependencies_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/GetDependencies" + Dependencies_Echo_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/Echo" + Dependencies_GetDependencies_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/GetDependencies" + Dependencies_GetTransitiveDependencies_FullMethodName = "/scanoss.api.dependencies.v2.Dependencies/GetTransitiveDependencies" ) // DependenciesClient is the client API for Dependencies service. @@ -59,6 +60,8 @@ type DependenciesClient interface { Echo(ctx context.Context, in *commonv2.EchoRequest, opts ...grpc.CallOption) (*commonv2.EchoResponse, error) // Get dependency details GetDependencies(ctx context.Context, in *DependencyRequest, opts ...grpc.CallOption) (*DependencyResponse, error) + // Get transitive dependency details + GetTransitiveDependencies(ctx context.Context, in *TransitiveDependencyRequest, opts ...grpc.CallOption) (*TransitiveDependencyResponse, error) } type dependenciesClient struct { @@ -87,6 +90,15 @@ func (c *dependenciesClient) GetDependencies(ctx context.Context, in *Dependency return out, nil } +func (c *dependenciesClient) GetTransitiveDependencies(ctx context.Context, in *TransitiveDependencyRequest, opts ...grpc.CallOption) (*TransitiveDependencyResponse, error) { + out := new(TransitiveDependencyResponse) + err := c.cc.Invoke(ctx, Dependencies_GetTransitiveDependencies_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // DependenciesServer is the server API for Dependencies service. // All implementations must embed UnimplementedDependenciesServer // for forward compatibility @@ -95,6 +107,8 @@ type DependenciesServer interface { Echo(context.Context, *commonv2.EchoRequest) (*commonv2.EchoResponse, error) // Get dependency details GetDependencies(context.Context, *DependencyRequest) (*DependencyResponse, error) + // Get transitive dependency details + GetTransitiveDependencies(context.Context, *TransitiveDependencyRequest) (*TransitiveDependencyResponse, error) mustEmbedUnimplementedDependenciesServer() } @@ -108,6 +122,9 @@ func (UnimplementedDependenciesServer) Echo(context.Context, *commonv2.EchoReque func (UnimplementedDependenciesServer) GetDependencies(context.Context, *DependencyRequest) (*DependencyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetDependencies not implemented") } +func (UnimplementedDependenciesServer) GetTransitiveDependencies(context.Context, *TransitiveDependencyRequest) (*TransitiveDependencyResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetTransitiveDependencies not implemented") +} func (UnimplementedDependenciesServer) mustEmbedUnimplementedDependenciesServer() {} // UnsafeDependenciesServer may be embedded to opt out of forward compatibility for this service. @@ -157,6 +174,24 @@ func _Dependencies_GetDependencies_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } +func _Dependencies_GetTransitiveDependencies_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(TransitiveDependencyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(DependenciesServer).GetTransitiveDependencies(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Dependencies_GetTransitiveDependencies_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(DependenciesServer).GetTransitiveDependencies(ctx, req.(*TransitiveDependencyRequest)) + } + return interceptor(ctx, in, info, handler) +} + // Dependencies_ServiceDesc is the grpc.ServiceDesc for Dependencies service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -172,6 +207,10 @@ var Dependencies_ServiceDesc = grpc.ServiceDesc{ MethodName: "GetDependencies", Handler: _Dependencies_GetDependencies_Handler, }, + { + MethodName: "GetTransitiveDependencies", + Handler: _Dependencies_GetTransitiveDependencies_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "scanoss/api/dependencies/v2/scanoss-dependencies.proto", diff --git a/api/provenancev2/scanoss-provenance.pb.go b/api/provenancev2/scanoss-provenance.pb.go index b6a0b36..2906f0c 100644 --- a/api/provenancev2/scanoss-provenance.pb.go +++ b/api/provenancev2/scanoss-provenance.pb.go @@ -26,8 +26,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.28.1 +// protoc v5.29.3 // source: scanoss/api/provenance/v2/scanoss-provenance.proto package provenancev2 @@ -49,7 +49,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -//* +// * // Component level Provenance Response data (JSON payload) type ProvenanceResponse struct { state protoimpl.MessageState @@ -357,36 +357,36 @@ var file_scanoss_api_provenance_v2_scanoss_provenance_proto_rawDesc = []byte{ 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x3a, 0x01, 0x2a, 0x22, 0x17, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, - 0x65, 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x12, 0x94, 0x01, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x43, 0x6f, + 0x73, 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x22, 0x17, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2f, 0x65, + 0x63, 0x68, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x94, 0x01, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x75, 0x72, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x3a, 0x01, 0x2a, 0x22, - 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, - 0x6e, 0x63, 0x65, 0x2f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x42, 0x94, 0x02, - 0x92, 0x41, 0xd9, 0x01, 0x12, 0x73, 0x0a, 0x1a, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, - 0x50, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x22, 0x50, 0x0a, 0x12, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x70, 0x72, - 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x25, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, - 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, - 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x1a, - 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, - 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, - 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, - 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, - 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, - 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x5a, 0x35, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, - 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x65, - 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x76, 0x32, 0x3b, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, - 0x63, 0x65, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, + 0x2f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x3a, 0x01, 0x2a, 0x42, 0x94, 0x02, + 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, + 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, + 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x76, 0x32, 0x3b, 0x70, 0x72, 0x6f, 0x76, 0x65, + 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x76, 0x32, 0x92, 0x41, 0xd9, 0x01, 0x12, 0x73, 0x0a, 0x1a, 0x53, + 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x50, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, + 0x65, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x12, 0x73, 0x63, 0x61, + 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x12, + 0x25, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x76, + 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, + 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, + 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, + 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, + 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, + 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, + 0x9a, 0x02, 0x01, 0x07, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/provenancev2/scanoss-provenance.pb.gw.go b/api/provenancev2/scanoss-provenance.pb.gw.go index 1c659f8..f869ce1 100644 --- a/api/provenancev2/scanoss-provenance.pb.gw.go +++ b/api/provenancev2/scanoss-provenance.pb.gw.go @@ -112,22 +112,20 @@ func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Provenance_Echo_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Provenance_Echo_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Provenance_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Provenance_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -137,22 +135,20 @@ func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Provenance_GetComponentProvenance_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Provenance_GetComponentProvenance_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Provenance_GetComponentProvenance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Provenance_GetComponentProvenance_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -162,7 +158,7 @@ func RegisterProvenanceHandlerServer(ctx context.Context, mux *runtime.ServeMux, // RegisterProvenanceHandlerFromEndpoint is same as RegisterProvenanceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterProvenanceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.Dial(endpoint, opts...) if err != nil { return err } @@ -201,21 +197,19 @@ func RegisterProvenanceHandlerClient(ctx context.Context, mux *runtime.ServeMux, ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/Echo", runtime.WithHTTPPathPattern("/api/v2/provenance/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Provenance_Echo_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Provenance_Echo_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Provenance_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Provenance_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -223,21 +217,19 @@ func RegisterProvenanceHandlerClient(ctx context.Context, mux *runtime.ServeMux, ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.provenance.v2.Provenance/GetComponentProvenance", runtime.WithHTTPPathPattern("/api/v2/provenance/countries")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Provenance_GetComponentProvenance_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Provenance_GetComponentProvenance_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Provenance_GetComponentProvenance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Provenance_GetComponentProvenance_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) diff --git a/api/provenancev2/scanoss-provenance_grpc.pb.go b/api/provenancev2/scanoss-provenance_grpc.pb.go index bfad79f..33e0cd2 100644 --- a/api/provenancev2/scanoss-provenance_grpc.pb.go +++ b/api/provenancev2/scanoss-provenance_grpc.pb.go @@ -27,7 +27,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc v5.29.3 // source: scanoss/api/provenance/v2/scanoss-provenance.proto package provenancev2 diff --git a/api/scanningv2/scanoss-scanning.pb.go b/api/scanningv2/scanoss-scanning.pb.go index 515a29c..3d539d8 100644 --- a/api/scanningv2/scanoss-scanning.pb.go +++ b/api/scanningv2/scanoss-scanning.pb.go @@ -28,7 +28,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.21.12 +// protoc v5.29.3 // source: scanoss/api/scanning/v2/scanoss-scanning.proto package scanningv2 diff --git a/api/scanningv2/scanoss-scanning_grpc.pb.go b/api/scanningv2/scanoss-scanning_grpc.pb.go index 5df6077..f55b0dc 100644 --- a/api/scanningv2/scanoss-scanning_grpc.pb.go +++ b/api/scanningv2/scanoss-scanning_grpc.pb.go @@ -28,7 +28,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v5.29.3 // source: scanoss/api/scanning/v2/scanoss-scanning.proto package scanningv2 diff --git a/api/semgrepv2/scanoss-semgrep.pb.go b/api/semgrepv2/scanoss-semgrep.pb.go index 5a10328..e611934 100644 --- a/api/semgrepv2/scanoss-semgrep.pb.go +++ b/api/semgrepv2/scanoss-semgrep.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.28.1 +// protoc v5.29.3 // source: scanoss/api/semgrep/v2/scanoss-semgrep.proto package semgrepv2 @@ -50,7 +50,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Semgrep issue response data (JSON payload) type SemgrepResponse struct { state protoimpl.MessageState @@ -358,33 +357,33 @@ var file_scanoss_api_semgrep_v2_scanoss_semgrep_proto_rawDesc = []byte{ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x19, 0x3a, 0x01, 0x2a, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, - 0x2f, 0x73, 0x65, 0x6d, 0x67, 0x72, 0x65, 0x70, 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x12, 0x7b, 0x0a, + 0xe4, 0x93, 0x02, 0x19, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x65, + 0x6d, 0x67, 0x72, 0x65, 0x70, 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x7b, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x49, 0x73, 0x73, 0x75, 0x65, 0x73, 0x12, 0x22, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x75, 0x72, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x65, 0x6d, 0x67, 0x72, 0x65, 0x70, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65, 0x6d, 0x67, 0x72, 0x65, 0x70, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x3a, - 0x01, 0x2a, 0x22, 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x65, 0x6d, 0x67, - 0x72, 0x65, 0x70, 0x2f, 0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x42, 0x85, 0x02, 0x92, 0x41, 0xd0, - 0x01, 0x12, 0x6a, 0x0a, 0x17, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x53, 0x65, 0x6d, - 0x67, 0x72, 0x65, 0x70, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x4a, 0x0a, 0x0f, - 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x73, 0x65, 0x6d, 0x67, 0x72, 0x65, 0x70, 0x12, - 0x22, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x73, 0x65, 0x6d, 0x67, - 0x72, 0x65, 0x70, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, - 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, - 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, - 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, - 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, - 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, - 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, - 0x07, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, - 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, - 0x65, 0x6d, 0x67, 0x72, 0x65, 0x70, 0x76, 0x32, 0x3b, 0x73, 0x65, 0x6d, 0x67, 0x72, 0x65, 0x70, - 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x22, + 0x16, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x65, 0x6d, 0x67, 0x72, 0x65, 0x70, + 0x2f, 0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x3a, 0x01, 0x2a, 0x42, 0x85, 0x02, 0x5a, 0x2f, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, + 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x6d, 0x67, 0x72, + 0x65, 0x70, 0x76, 0x32, 0x3b, 0x73, 0x65, 0x6d, 0x67, 0x72, 0x65, 0x70, 0x76, 0x32, 0x92, 0x41, + 0xd0, 0x01, 0x12, 0x6a, 0x0a, 0x17, 0x53, 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x53, 0x65, + 0x6d, 0x67, 0x72, 0x65, 0x70, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x4a, 0x0a, + 0x0f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x73, 0x65, 0x6d, 0x67, 0x72, 0x65, 0x70, + 0x12, 0x22, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x73, 0x65, 0x6d, + 0x67, 0x72, 0x65, 0x70, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, + 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, + 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, + 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, + 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, + 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, + 0x01, 0x07, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/semgrepv2/scanoss-semgrep.pb.gw.go b/api/semgrepv2/scanoss-semgrep.pb.gw.go index 34361da..e1ad974 100644 --- a/api/semgrepv2/scanoss-semgrep.pb.gw.go +++ b/api/semgrepv2/scanoss-semgrep.pb.gw.go @@ -112,22 +112,20 @@ func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, se var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Semgrep_Echo_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Semgrep_Echo_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Semgrep_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Semgrep_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -137,22 +135,20 @@ func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, se var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Semgrep_GetIssues_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Semgrep_GetIssues_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Semgrep_GetIssues_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Semgrep_GetIssues_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -162,7 +158,7 @@ func RegisterSemgrepHandlerServer(ctx context.Context, mux *runtime.ServeMux, se // RegisterSemgrepHandlerFromEndpoint is same as RegisterSemgrepHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterSemgrepHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.Dial(endpoint, opts...) if err != nil { return err } @@ -201,21 +197,19 @@ func RegisterSemgrepHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/Echo", runtime.WithHTTPPathPattern("/api/v2/semgrep/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Semgrep_Echo_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Semgrep_Echo_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Semgrep_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Semgrep_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -223,21 +217,19 @@ func RegisterSemgrepHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.semgrep.v2.Semgrep/GetIssues", runtime.WithHTTPPathPattern("/api/v2/semgrep/issues")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Semgrep_GetIssues_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Semgrep_GetIssues_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Semgrep_GetIssues_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Semgrep_GetIssues_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) diff --git a/api/semgrepv2/scanoss-semgrep_grpc.pb.go b/api/semgrepv2/scanoss-semgrep_grpc.pb.go index 49f1f3b..66a5403 100644 --- a/api/semgrepv2/scanoss-semgrep_grpc.pb.go +++ b/api/semgrepv2/scanoss-semgrep_grpc.pb.go @@ -28,7 +28,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc v5.29.3 // source: scanoss/api/semgrep/v2/scanoss-semgrep.proto package semgrepv2 diff --git a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go index 0fcb0f2..b37d914 100644 --- a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go +++ b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.go @@ -27,8 +27,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v5.27.3 +// protoc-gen-go v1.28.1 +// protoc v5.29.3 // source: scanoss/api/vulnerabilities/v2/scanoss-vulnerabilities.proto package vulnerabilitiesv2 @@ -50,7 +50,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// // Vulnerability request data (JSON payload) type VulnerabilityRequest struct { state protoimpl.MessageState @@ -100,7 +99,6 @@ func (x *VulnerabilityRequest) GetPurls() []*VulnerabilityRequest_Purls { return nil } -// // Vulnerability CPE response data (JSON payload) type CpeResponse struct { state protoimpl.MessageState @@ -159,7 +157,6 @@ func (x *CpeResponse) GetStatus() *commonv2.StatusResponse { return nil } -// // Vulnerability response data (JSON payload) type VulnerabilityResponse struct { state protoimpl.MessageState @@ -565,18 +562,18 @@ var file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_rawDesc = 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x21, 0x3a, 0x01, 0x2a, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x76, 0x75, - 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2f, 0x65, 0x63, - 0x68, 0x6f, 0x12, 0x95, 0x01, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x43, 0x70, 0x65, 0x73, 0x12, 0x34, + 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x65, + 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2f, 0x65, 0x63, 0x68, 0x6f, 0x3a, + 0x01, 0x2a, 0x12, 0x95, 0x01, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x43, 0x70, 0x65, 0x73, 0x12, 0x34, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x70, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x3a, 0x01, 0x2a, 0x22, 0x1c, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, - 0x69, 0x74, 0x69, 0x65, 0x73, 0x2f, 0x63, 0x70, 0x65, 0x73, 0x12, 0xb5, 0x01, 0x0a, 0x12, 0x47, + 0x65, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x76, 0x32, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, + 0x65, 0x73, 0x2f, 0x63, 0x70, 0x65, 0x73, 0x3a, 0x01, 0x2a, 0x12, 0xb5, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x34, 0x2e, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, @@ -585,29 +582,29 @@ var file_scanoss_api_vulnerabilities_v2_scanoss_vulnerabilities_proto_rawDesc = 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2c, 0x3a, 0x01, 0x2a, 0x22, 0x27, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x76, 0x32, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, - 0x65, 0x73, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, - 0x65, 0x73, 0x42, 0xac, 0x02, 0x92, 0x41, 0xe7, 0x01, 0x12, 0x80, 0x01, 0x0a, 0x1d, 0x53, 0x43, - 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, - 0x69, 0x74, 0x79, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x5a, 0x0a, 0x17, 0x73, - 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, - 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x2a, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, - 0x73, 0x73, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, - 0x65, 0x73, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, 0x6e, - 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, 0x32, - 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, - 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, - 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, - 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, - 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, - 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, - 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x75, - 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x76, 0x32, 0x3b, - 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x76, - 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2c, 0x22, 0x27, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, + 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x2f, + 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x3a, + 0x01, 0x2a, 0x42, 0xac, 0x02, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2f, 0x70, 0x61, 0x70, 0x69, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, + 0x65, 0x73, 0x76, 0x32, 0x3b, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, + 0x74, 0x69, 0x65, 0x73, 0x76, 0x32, 0x92, 0x41, 0xe7, 0x01, 0x12, 0x80, 0x01, 0x0a, 0x1d, 0x53, + 0x43, 0x41, 0x4e, 0x4f, 0x53, 0x53, 0x20, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, + 0x6c, 0x69, 0x74, 0x79, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x5a, 0x0a, 0x17, + 0x73, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x73, 0x2d, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x2a, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, + 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x63, 0x61, 0x6e, + 0x6f, 0x73, 0x73, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, + 0x69, 0x65, 0x73, 0x1a, 0x13, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x73, 0x63, 0x61, + 0x6e, 0x6f, 0x73, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x01, + 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, + 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, + 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, + 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, + 0x07, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go index a875d4d..c325753 100644 --- a/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go +++ b/api/vulnerabilitiesv2/scanoss-vulnerabilities.pb.gw.go @@ -146,22 +146,20 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Vulnerabilities_Echo_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Vulnerabilities_Echo_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Vulnerabilities_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -171,22 +169,20 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Vulnerabilities_GetCpes_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Vulnerabilities_GetCpes_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_GetCpes_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Vulnerabilities_GetCpes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -196,22 +192,20 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Vulnerabilities_GetVulnerabilities_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Vulnerabilities_GetVulnerabilities_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_GetVulnerabilities_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Vulnerabilities_GetVulnerabilities_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -221,7 +215,7 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv // RegisterVulnerabilitiesHandlerFromEndpoint is same as RegisterVulnerabilitiesHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterVulnerabilitiesHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.Dial(endpoint, opts...) if err != nil { return err } @@ -260,21 +254,19 @@ func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.Serv ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/Echo", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Vulnerabilities_Echo_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Vulnerabilities_Echo_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_Echo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Vulnerabilities_Echo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -282,21 +274,19 @@ func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.Serv ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetCpes", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/cpes")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Vulnerabilities_GetCpes_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Vulnerabilities_GetCpes_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_GetCpes_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Vulnerabilities_GetCpes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -304,21 +294,19 @@ func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.Serv ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) + rctx, err := runtime.AnnotateContext(ctx, mux, req, "/scanoss.api.vulnerabilities.v2.Vulnerabilities/GetVulnerabilities", runtime.WithHTTPPathPattern("/api/v2/vulnerabilities/vulnerabilities")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Vulnerabilities_GetVulnerabilities_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + resp, md, err := request_Vulnerabilities_GetVulnerabilities_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Vulnerabilities_GetVulnerabilities_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Vulnerabilities_GetVulnerabilities_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) diff --git a/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go b/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go index 2c18a0c..f419f05 100644 --- a/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go +++ b/api/vulnerabilitiesv2/scanoss-vulnerabilities_grpc.pb.go @@ -28,7 +28,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.3 +// - protoc v5.29.3 // source: scanoss/api/vulnerabilities/v2/scanoss-vulnerabilities.proto package vulnerabilitiesv2 diff --git a/protobuf/scanoss/api/common/v2/scanoss-common.proto b/protobuf/scanoss/api/common/v2/scanoss-common.proto index aec3a3a..c2a5769 100644 --- a/protobuf/scanoss/api/common/v2/scanoss-common.proto +++ b/protobuf/scanoss/api/common/v2/scanoss-common.proto @@ -69,13 +69,11 @@ message EchoResponse { * Purl request data (JSON payload) */ message PurlRequest { - /* TODO: Refactor this API - Remove nested Purls message and replace with top-level Purl message type. - Update field definition below to: repeated Purl purls = 1; */ - message Purls { // @description: purl to be requested string purl = 1; diff --git a/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json b/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json index 6e6e45b..e075b42 100644 --- a/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json +++ b/protobuf/scanoss/api/components/v2/scanoss-components.swagger.json @@ -471,7 +471,8 @@ "requirement": { "type": "string" } - } + }, + "title": "TODO: Refactor this API\n- Remove nested Purls message and replace with top-level Purl message type.\n- Update field definition below to: repeated Purl purls = 1;" }, "v2StatusCode": { "type": "string", diff --git a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto index 2f3f217..9b62037 100644 --- a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto +++ b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.proto @@ -78,7 +78,7 @@ service Dependencies { body: "*" }; }; - +// Get transitive dependency details rpc GetTransitiveDependencies(TransitiveDependencyRequest) returns(TransitiveDependencyResponse) { option (google.api.http) = { post: "/api/v2/dependencies/transitive" @@ -147,20 +147,18 @@ message DependencyResponse { /* * Transitive dependency request data (JSON payload) */ - message TransitiveDependencyRequest { + // Ecosystem to restrict reporting on (i.e. npm, maven, github, etc.) - optional string ecosystem = 1; - // Depth to go when searching dependencies + // Depth (number of layers) to go when searching for dependencies - optional int32 depth = 2; - // Limit used on response + // Limit the number of components reported back - optional int32 limit = 3; - /* TODO: Add scope filters: repeated string scopes = 4; Using a list of strings allows filtering by multiple scopes simultaneously (e.g., include both "dev" and "test" dependencies in a single request) */ - // List of Purls from the same ecosystem repeated scanoss.api.common.v2.Purl purls = 5; } @@ -172,9 +170,7 @@ message TransitiveDependencyResponse { message Dependencies { string purl = 1; string version = 2; - - // TODO: Add scope field - // optional string scope = 3; + // optional string scope = 3; // TODO: Add scope field } // Dependency response details repeated Dependencies dependencies = 1; diff --git a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json index 85b24c0..fb1e55f 100644 --- a/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json +++ b/protobuf/scanoss/api/dependencies/v2/scanoss-dependencies.swagger.json @@ -98,35 +98,49 @@ "Dependencies" ] } - } - }, - "definitions": { - "DependencyResponseDependencies": { - "type": "object", - "properties": { - "component": { - "type": "string" - }, - "purl": { - "type": "string" - }, - "version": { - "type": "string" - }, - "licenses": { - "type": "array", - "items": { - "$ref": "#/definitions/DependencyResponseLicenses" + }, + "/api/v2/dependencies/transitive": { + "post": { + "summary": "Get transitive dependency details", + "operationId": "Dependencies_GetTransitiveDependencies", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/v2TransitiveDependencyResponse" + } + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "type": "string", + "format": "string" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, - "url": { - "type": "string" - }, - "comment": { - "type": "string" - } + "parameters": [ + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/v2TransitiveDependencyRequest" + } + } + ], + "tags": [ + "Dependencies" + ] } - }, + } + }, + "definitions": { "DependencyResponseLicenses": { "type": "object", "properties": { @@ -246,6 +260,32 @@ }, "title": "Dependency response data (JSON payload)" }, + "v2DependencyResponseDependencies": { + "type": "object", + "properties": { + "component": { + "type": "string" + }, + "purl": { + "type": "string" + }, + "version": { + "type": "string" + }, + "licenses": { + "type": "array", + "items": { + "$ref": "#/definitions/DependencyResponseLicenses" + } + }, + "url": { + "type": "string" + }, + "comment": { + "type": "string" + } + } + }, "v2DependencyResponseFiles": { "type": "object", "properties": { @@ -261,7 +301,7 @@ "dependencies": { "type": "array", "items": { - "$ref": "#/definitions/DependencyResponseDependencies" + "$ref": "#/definitions/v2DependencyResponseDependencies" } } } @@ -284,6 +324,18 @@ }, "title": "Echo Message Response" }, + "v2Purl": { + "type": "object", + "properties": { + "purl": { + "type": "string" + }, + "requirement": { + "type": "string" + } + }, + "title": "Purl to be requested" + }, "v2StatusCode": { "type": "string", "enum": [ @@ -309,6 +361,61 @@ } }, "title": "Detailed response details" + }, + "v2TransitiveDependencyRequest": { + "type": "object", + "properties": { + "ecosystem": { + "type": "string", + "title": "Ecosystem to restrict reporting on (i.e. npm, maven, github, etc.) - optional" + }, + "depth": { + "type": "integer", + "format": "int32", + "title": "Depth (number of layers) to go when searching for dependencies - optional" + }, + "limit": { + "type": "integer", + "format": "int32", + "title": "Limit the number of components reported back - optional" + }, + "purls": { + "type": "array", + "items": { + "$ref": "#/definitions/v2Purl" + }, + "title": "List of Purls from the same ecosystem" + } + }, + "title": "Transitive dependency request data (JSON payload)" + }, + "v2TransitiveDependencyResponse": { + "type": "object", + "properties": { + "dependencies": { + "type": "array", + "items": { + "$ref": "#/definitions/v2TransitiveDependencyResponseDependencies" + }, + "title": "Dependency response details" + }, + "status": { + "$ref": "#/definitions/v2StatusResponse", + "title": "Response status" + } + }, + "title": "Transitive dependency response data (JSON payload)" + }, + "v2TransitiveDependencyResponseDependencies": { + "type": "object", + "properties": { + "purl": { + "type": "string" + }, + "version": { + "type": "string" + } + } } } } diff --git a/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json b/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json index 7516558..e05a698 100644 --- a/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json +++ b/protobuf/scanoss/api/provenance/v2/scanoss-provenance.swagger.json @@ -252,7 +252,8 @@ "requirement": { "type": "string" } - } + }, + "title": "TODO: Refactor this API\n- Remove nested Purls message and replace with top-level Purl message type.\n- Update field definition below to: repeated Purl purls = 1;" }, "v2StatusCode": { "type": "string", diff --git a/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json b/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json index caac2fb..86f016b 100644 --- a/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json +++ b/protobuf/scanoss/api/scanning/v2/scanoss-scanning.swagger.json @@ -170,7 +170,7 @@ "properties": { "type_url": { "type": "string", - "description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n URL, or have them precompiled into a binary to avoid any\n lookup. Therefore, binary compatibility needs to be preserved\n on changes to types. (Use versioned type names to manage\n breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics." + "description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n URL, or have them precompiled into a binary to avoid any\n lookup. Therefore, binary compatibility needs to be preserved\n on changes to types. (Use versioned type names to manage\n breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com. As of May 2023, there are no widely used type server\nimplementations and no plans to implement one.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics." }, "value": { "type": "string", @@ -178,7 +178,7 @@ "description": "Must be a valid serialized protocol buffer of the above specified type." } }, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n\nExample 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\nExample 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" }, "runtimeError": { "type": "object", diff --git a/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json b/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json index 1858b0f..986d76f 100644 --- a/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json +++ b/protobuf/scanoss/api/semgrep/v2/scanoss-semgrep.swagger.json @@ -212,7 +212,8 @@ "requirement": { "type": "string" } - } + }, + "title": "TODO: Refactor this API\n- Remove nested Purls message and replace with top-level Purl message type.\n- Update field definition below to: repeated Purl purls = 1;" }, "v2SemgrepResponse": { "type": "object",