From cfc60fe910637b7a36d53d070f1f6849af019abd Mon Sep 17 00:00:00 2001
From: Jonathan Gangi <jgangi@redhat.com>
Date: Fri, 19 Sep 2025 15:49:35 -0300
Subject: [PATCH] bugfix(SPSTRAT-601): VHDPushItem model _from_data

This commit fixes a bad converter for `support_legacy` on `VHDPushItem`
model which was preventing to load its class using `_from_data` whenever
the value for `support_legacy` was `False`.

In the previous version the following line would evaluate the truthful
to `else` and cause the `or` to define it as `None`, generating an
invalid parameter:

```
"support_legacy": data.get("support_legacy") or None,
```

Besides the fix it also includes a new model test to detect this
scenario as well as a test on `Pub` source which reproduces this issue
in the previous code.

Refers to SPSTRAT-601

Signed-off-by: Jonathan Gangi <jgangi@redhat.com>
---
 src/pushsource/_impl/model/azure.py |  2 +-
 tests/model/test_vhd.py             | 26 +++++++++-
 tests/pub/data/3776845/clouds.json  | 75 +++++++++++++++++++++++++++++
 tests/pub/test_pub_source.py        | 58 ++++++++++++++++++++++
 4 files changed, 159 insertions(+), 2 deletions(-)
 create mode 100644 tests/pub/data/3776845/clouds.json

diff --git a/src/pushsource/_impl/model/azure.py b/src/pushsource/_impl/model/azure.py
index acb35eca..3a8e4926 100644
--- a/src/pushsource/_impl/model/azure.py
+++ b/src/pushsource/_impl/model/azure.py
@@ -84,7 +84,7 @@ def _from_data(cls, data):
             "description": data["description"],
             "generation": data.get("generation") or None,
             "sku_id": data.get("sku_id") or None,
-            "support_legacy": data.get("support_legacy") or None,
+            "support_legacy": data.get("support_legacy") or False,
             "release": VMIRelease._from_data(data.get("release", {})),
             "legacy_sku_id": data.get("legacy_sku_id") or None,
             "disk_version": data.get("disk_version") or None,
diff --git a/tests/model/test_vhd.py b/tests/model/test_vhd.py
index e4b2d581..45109bec 100644
--- a/tests/model/test_vhd.py
+++ b/tests/model/test_vhd.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from pytest import raises
+from pytest import mark, raises
 
 from pushsource import VHDPushItem, VMIRelease, AmiRelease
 
@@ -36,6 +36,30 @@ def test_invalid_legacy_sku():
     ) in str(exc_info.value)
 
 
+@mark.parametrize("value", [True, False, None])
+def test_support_legacy(value):
+    """Ensure ``support_legacy`` works for all expected inputs."""
+    v = VHDPushItem._from_data(
+        {
+            "name": "test",
+            "release": {
+                "product": "TEST",
+                "date": "20250730",
+                "arch": "x86_64",
+                "respin": 0,
+            },
+            "description": "test",
+            "disk_version": "1.0.0",
+            "sas_uri": "foo.com/bar",
+            "support_legacy": value,
+        }
+    )
+    if value:
+        assert v.support_legacy == value
+    else:
+        assert v.support_legacy == False
+
+
 def test_vmi_release():
     """Ensure that subclasses of VMIRelease can not be associated with VHDPushItem."""
     release_params = {
diff --git a/tests/pub/data/3776845/clouds.json b/tests/pub/data/3776845/clouds.json
new file mode 100644
index 00000000..a444444b
--- /dev/null
+++ b/tests/pub/data/3776845/clouds.json
@@ -0,0 +1,75 @@
+[
+  {
+    "boot_mode": null,
+    "build": "test-prd-azure-9.6-20250730.3",
+    "build_info": {
+      "id": 3776845,
+      "name": "test-prd-azure",
+      "release": "20250730.3",
+      "version": "9.6"
+    },
+    "cloud_info": {
+      "account": "azure-na",
+      "provider": "azure"
+    },
+    "description": "",
+    "dest": [
+      "test-prd/9_6_prd"
+    ],
+    "generation": "V2",
+    "md5sum": "ac3b1c069d7b3f3ce9e77de83bb4305e",
+    "name": "test-prd-azure-9.6-20250730.3.x86_64.vhd.xz",
+    "origin": "RHBA-2025:123456",
+    "recommended_sizes": [],
+    "release": {
+      "arch": "x86_64",
+      "base_product": null,
+      "base_version": null,
+      "date": "20250730",
+      "product": "TEST-PRD",
+      "respin": 0,
+      "type": null,
+      "variant": null,
+      "version": "9.6"
+    },
+    "sas_uri": "https://test.blob.core.windows.net/pubupload/test-prd-azure-9.6-20250730.3.x86_64.vhd?se=2028-08-05T15%3A05%3A37Z&sp=r&sv=2023-08-03&sr=b&sig=fakesig",
+    "src": "/mnt/koji/packages/test-prd-azure/9.6/20250730.3/images/test-prd-azure-9.6-20250730.3.x86_64.vhd.xz",
+    "starmap_query": {
+      "billing_code_config": {},
+      "cloud": "azure",
+      "mappings": {
+        "azure-na": {
+          "destinations": [
+            {
+              "ami_version_template": null,
+              "architecture": "x86_64",
+              "destination": "test-prd/9_6_prd",
+              "id": null,
+              "meta": {
+                "generation": "V2"
+              },
+              "overwrite": false,
+              "provider": null,
+              "restrict_major": null,
+              "restrict_minor": null,
+              "restrict_version": false,
+              "tags": null,
+              "vhd_check_base_sas_only": true
+            }
+          ],
+          "meta": {
+            "generation": "V2"
+          },
+          "provider": null
+        }
+      },
+      "meta": {
+        "generation": "V2"
+      },
+      "name": "test-prd-azure",
+      "workflow": "stratosphere"
+    },
+    "state": "PUSHED",
+    "support_legacy": false
+  }
+]
\ No newline at end of file
diff --git a/tests/pub/test_pub_source.py b/tests/pub/test_pub_source.py
index bd5b7b79..8352e299 100644
--- a/tests/pub/test_pub_source.py
+++ b/tests/pub/test_pub_source.py
@@ -230,6 +230,64 @@ def test_get_azure_push_items_single_task_clouds(requests_mock):
     ]
 
 
+def test_get_azure_push_items_no_legacy_support(requests_mock):
+    """
+    Tests getting push item from one Stratosphere Pub task.
+    """
+    # test setup
+    task_id = 3776845
+    pub_url = "https://pub.example.com"
+    request_url = os.path.join(
+        pub_url, "pub/task", str(task_id), "log/clouds.json?format=raw"
+    )
+
+    requests_mock.register_uri(
+        "GET", request_url, json=make_response(task_id, "clouds.json")
+    )
+
+    # Add 404 for images.json
+    request_url = os.path.join(
+        pub_url, "pub/task", str(task_id), "log/images.json?format=raw"
+    )
+    requests_mock.register_uri("GET", request_url, status_code=404)
+
+    # request push items from source
+    with Source.get("pub:%s" % pub_url, task_id=task_id) as source:
+        push_items = [item for item in source]
+
+    # there should be exactly 1 push item
+    assert len(push_items) == 1
+
+    # with following content
+    assert push_items == [
+        VHDPushItem(
+            name="test-prd-azure-9.6-20250730.3.x86_64.vhd.xz",
+            state="PENDING",
+            src="/mnt/koji/packages/test-prd-azure/9.6/20250730.3/images/test-prd-azure-9.6-20250730.3.x86_64.vhd.xz",
+            dest=["test-prd/9_6_prd"],
+            build="test-prd-azure-9.6-20250730.3",
+            build_info=KojiBuildInfo(
+                name="test-prd-azure",
+                version="9.6",
+                release="20250730.3",
+                id=None,
+            ),
+            origin="RHBA-2025:123456",
+            release=VMIRelease(
+                arch="x86_64",
+                date="20250730",
+                product="TEST-PRD",
+                respin=0,
+                version="9.6",
+            ),
+            description="",
+            sas_uri="https://test.blob.core.windows.net/pubupload/test-prd-azure-9.6-20250730.3.x86_64.vhd?se=2028-08-05T15%3A05%3A37Z&sp=r&sv=2023-08-03&sr=b&sig=fakesig",
+            generation="V2",
+            support_legacy=False,
+        )
+    ]
+
+
 def test_get_ami_push_items_rhcos_task_cloud(requests_mock):
     """
     Tests getting push item from one Stratosphere RHCOS Pub task.