From 5e8ed84818a9eb695ec8d595020409b2a62c6713 Mon Sep 17 00:00:00 2001
From: Robert Bikar <rbikar@redhat.com>
Date: Thu, 4 Apr 2024 13:55:46 +0200
Subject: [PATCH] Improve `Repository` attrs [RHELDST-22483]

* `content_set` was made properly optional via schema update
* fix converters for `eng_product_id` which now properly handles `None`
  value when converting from or to pulp.
---
 pubtools/pulplib/_impl/model/repository/base.py | 7 ++++---
 pubtools/pulplib/_impl/schema/repository.yaml   | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pubtools/pulplib/_impl/model/repository/base.py b/pubtools/pulplib/_impl/model/repository/base.py
index ca254ce8..4d5f6ce7 100644
--- a/pubtools/pulplib/_impl/model/repository/base.py
+++ b/pubtools/pulplib/_impl/model/repository/base.py
@@ -4,7 +4,8 @@
 import json
 from functools import partial
 
-from attr import validators, asdict
+from attr import validators, asdict, converters
+
 from frozenlist2 import frozenlist
 from more_executors.futures import f_proxy, f_map, f_flat_map
 
@@ -247,8 +248,8 @@ class Repository(PulpObject, Deletable):
         default=None,
         type=int,
         pulp_field="notes.eng_product",
-        pulp_py_converter=int,
-        py_pulp_converter=str,
+        pulp_py_converter=converters.optional(int),
+        py_pulp_converter=converters.optional(str),
     )
     """ID of the product to which this repository belongs (if any)."""
 
diff --git a/pubtools/pulplib/_impl/schema/repository.yaml b/pubtools/pulplib/_impl/schema/repository.yaml
index aca79362..c01c2a90 100644
--- a/pubtools/pulplib/_impl/schema/repository.yaml
+++ b/pubtools/pulplib/_impl/schema/repository.yaml
@@ -98,7 +98,9 @@ properties:
 
       # Name of content set that is associated with this repository
       content_set:
-        type: string
+        anyOf:
+        - type: "null"
+        - type: string
 
       # Version of ubi config that should be used for population of this repository
       ubi_config_version: