fixes: openapi: uuid types don't look like uuids #792

Signed-off-by: Hiram Chirino <hiram@hiramchirino.com>

Author: chirino

modules/fundamental/src/advisory/model/mod.rs

@@ -18,6 +18,7 @@ use utoipa::ToSchema;
 pub struct AdvisoryHead {
     /// The opaque UUID of the advisory.
     #[serde(with = "uuid::serde::urn")]
+    #[schema(value_type=String)]
     pub uuid: Uuid,
 
     /// The identifier of the advisory, as assigned by the issuing organization.

modules/fundamental/src/license/model/mod.rs

@@ -12,6 +12,7 @@ use uuid::Uuid;
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
 pub struct LicenseSummary {
     #[serde(with = "uuid::serde::urn")]
+    #[schema(value_type=String)]
     pub id: Uuid,
     pub license: String,
     pub spdx_licenses: Vec<String>,

modules/fundamental/src/product/model/mod.rs

@@ -12,6 +12,7 @@ use trustify_entity::{product, product_version};
 #[derive(Serialize, Deserialize, Debug, Clone, ToSchema)]
 pub struct ProductHead {
     #[serde(with = "uuid::serde::urn")]
+    #[schema(value_type=String)]
     pub id: Uuid,
     pub name: String,
 }
@@ -31,13 +32,15 @@ impl ProductHead {
 #[derive(Serialize, Deserialize, Debug, Clone, ToSchema)]
 pub struct ProductVersionHead {
     #[serde(with = "uuid::serde::urn")]
+    #[schema(value_type=String)]
     pub id: Uuid,
     pub version: String,
     #[serde(
         default,
         skip_serializing_if = "Option::is_none",
         with = "trustify_common::uuid::serde::urn"
     )]
+    #[schema(value_type=String)]
     pub sbom_id: Option<Uuid>,
 }
 

modules/fundamental/src/sbom/model/mod.rs

@@ -17,6 +17,7 @@ use super::service::SbomService;
 #[derive(Serialize, Deserialize, Debug, Clone, ToSchema)]
 pub struct SbomHead {
     #[serde(with = "uuid::serde::urn")]
+    #[schema(value_type=String)]
     pub id: Uuid,
     pub hashes: Vec<Id>,
 

openapi.yaml

@@ -1819,7 +1819,6 @@ components:
           nullable: true
         uuid:
           type: string
-          format: uuid
           description: The opaque UUID of the advisory.
         withdrawn:
           type: string
@@ -2322,7 +2321,6 @@ components:
       properties:
         id:
           type: string
-          format: uuid
         license:
           type: string
         purls:
@@ -2687,7 +2685,6 @@ components:
       properties:
         id:
           type: string
-          format: uuid
         name:
           type: string
     ProductSbomHead:
@@ -2735,11 +2732,8 @@ components:
       properties:
         id:
           type: string
-          format: uuid
         sbom_id:
           type: string
-          format: uuid
-          nullable: true
         version:
           type: string
     Progress:
@@ -2953,7 +2947,6 @@ components:
             $ref: '#/components/schemas/Id'
         id:
           type: string
-          format: uuid
         labels:
           $ref: '#/components/schemas/Labels'
         name: