diff --git a/client/openapi/trustd.yaml b/client/openapi/trustd.yaml index 027059c1..2a0787f4 100644 --- a/client/openapi/trustd.yaml +++ b/client/openapi/trustd.yaml @@ -5,7 +5,7 @@ info: license: name: Apache License, Version 2.0 identifier: Apache-2.0 - version: 0.1.0-alpha.23 + version: 0.1.0-alpha.24 paths: /.well-known/trustify: get: @@ -2243,6 +2243,7 @@ components: required: - sbom_id - node_id + - relationship - purl - name - version @@ -2253,6 +2254,8 @@ components: type: string purl: type: string + relationship: + type: string sbom_id: type: string version: @@ -3034,17 +3037,11 @@ components: - type: object required: - described_by - - number_of_packages properties: described_by: type: array items: $ref: '#/components/schemas/SbomPackage' - number_of_packages: - type: integer - format: int64 - description: The number of packages this SBOM has - minimum: 0 total: type: integer format: int64 @@ -3344,6 +3341,7 @@ components: - dev_tool_of - described_by - package_of + - undefined Report: type: object required: @@ -3427,6 +3425,7 @@ components: - published - authors - name + - number_of_packages properties: authors: type: array @@ -3444,6 +3443,11 @@ components: $ref: '#/components/schemas/Labels' name: type: string + number_of_packages: + type: integer + format: int64 + description: The number of packages this SBOM has + minimum: 0 published: type: - string @@ -3542,17 +3546,11 @@ components: - type: object required: - described_by - - number_of_packages properties: described_by: type: array items: $ref: '#/components/schemas/SbomPackage' - number_of_packages: - type: integer - format: int64 - description: The number of packages this SBOM has - minimum: 0 Severity: type: string description: |- diff --git a/client/src/app/client/schemas.gen.ts b/client/src/app/client/schemas.gen.ts index 3f53d01f..8c897151 100644 --- a/client/src/app/client/schemas.gen.ts +++ b/client/src/app/client/schemas.gen.ts @@ -276,7 +276,7 @@ export const AnalysisStatusSchema = { export const AncNodeSchema = { type: "object", - required: ["sbom_id", "node_id", "purl", "name", "version"], + required: ["sbom_id", "node_id", "relationship", "purl", "name", "version"], properties: { name: { type: "string", @@ -287,6 +287,9 @@ export const AncNodeSchema = { purl: { type: "string", }, + relationship: { + type: "string", + }, sbom_id: { type: "string", }, @@ -1382,7 +1385,7 @@ export const PaginatedResults_SbomSummarySchema = { }, { type: "object", - required: ["described_by", "number_of_packages"], + required: ["described_by"], properties: { described_by: { type: "array", @@ -1390,12 +1393,6 @@ export const PaginatedResults_SbomSummarySchema = { $ref: "#/components/schemas/SbomPackage", }, }, - number_of_packages: { - type: "integer", - format: "int64", - description: "The number of packages this SBOM has", - minimum: 0, - }, }, }, ], @@ -1843,6 +1840,7 @@ export const RelationshipSchema = { "dev_tool_of", "described_by", "package_of", + "undefined", ], } as const; @@ -1952,6 +1950,7 @@ export const SbomHeadSchema = { "published", "authors", "name", + "number_of_packages", ], properties: { authors: { @@ -1978,6 +1977,12 @@ export const SbomHeadSchema = { name: { type: "string", }, + number_of_packages: { + type: "integer", + format: "int64", + description: "The number of packages this SBOM has", + minimum: 0, + }, published: { type: ["string", "null"], format: "date-time", @@ -2122,7 +2127,7 @@ export const SbomSummarySchema = { }, { type: "object", - required: ["described_by", "number_of_packages"], + required: ["described_by"], properties: { described_by: { type: "array", @@ -2130,12 +2135,6 @@ export const SbomSummarySchema = { $ref: "#/components/schemas/SbomPackage", }, }, - number_of_packages: { - type: "integer", - format: "int64", - description: "The number of packages this SBOM has", - minimum: 0, - }, }, }, ], diff --git a/client/src/app/client/types.gen.ts b/client/src/app/client/types.gen.ts index 0eaa7805..518d0c15 100644 --- a/client/src/app/client/types.gen.ts +++ b/client/src/app/client/types.gen.ts @@ -119,6 +119,7 @@ export type AncNode = { name: string; node_id: string; purl: string; + relationship: string; sbom_id: string; version: string; }; @@ -537,10 +538,6 @@ export type PaginatedResults_SbomSummary = { SbomHead & (null | SourceDocument) & { described_by: Array; - /** - * The number of packages this SBOM has - */ - number_of_packages: number; } >; total: number; @@ -687,7 +684,8 @@ export type Relationship = | "build_tool_of" | "dev_tool_of" | "described_by" - | "package_of"; + | "package_of" + | "undefined"; export type Report = { /** @@ -741,6 +739,10 @@ export type SbomHead = { id: string; labels: Labels; name: string; + /** + * The number of packages this SBOM has + */ + number_of_packages: number; published: string | null; }; @@ -777,10 +779,6 @@ export type SbomStatus = { export type SbomSummary = SbomHead & (null | SourceDocument) & { described_by: Array; - /** - * The number of packages this SBOM has - */ - number_of_packages: number; }; /**