utf-queue-client 1.21.4b4__tar.gz → 1.21.5__tar.gz

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.5}/Jenkinsfile

@@ -46,7 +46,7 @@ pipeline {
                     python3 -m venv venv
                     . venv/bin/activate
                     uv pip install --upgrade pip wheel
-                    uv pip install -r test-requirements.txt
+                    uv pip install --extra-index-url https://artifactory-bos.silabs.net/artifactory/api/pypi/infrasw-python-local/simple -r test-requirements.txt
 
                     pre-commit run --all-files
                 '''
@@ -55,7 +55,7 @@ pipeline {
                     python3 -m venv venv_2
                     . venv_2/bin/activate
                     uv pip install --upgrade pip wheel
-                    uv pip install -r test-requirements-pydantic-v1.txt
+                    uv pip install --extra-index-url https://artifactory-bos.silabs.net/artifactory/api/pypi/infrasw-python-local/simple -r test-requirements-pydantic-v1.txt
                 '''
             }
         }

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.21.4b4
+Version: 1.21.5
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF
@@ -14,7 +14,7 @@ Requires-Dist: typing_extensions; python_version < "3.8"
 Requires-Dist: click
 Requires-Dist: certifi>=2020.4
 Requires-Dist: ubai-client>=1.2.0
-Requires-Dist: package-release-metadata-client
+Requires-Dist: package-release-metadata-client==0.1.4
 Requires-Dist: opentelemetry-distro[otlp]
 Requires-Dist: otel-extensions>=0.1.2
 Requires-Dist: retry>=0.9.2

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "utf-queue-client"
-version = "1.21.4b4"
+version = "1.21.5"
 description = "No description provided"
 authors = [
     { name = "Joe Savage", email = "joe.savage@silabs.com" }
@@ -20,7 +20,7 @@ dependencies = [
     "click",
     "certifi >= 2020.4",
     "ubai-client >= 1.2.0",
-    "package-release-metadata-client",
+    "package-release-metadata-client == 0.1.4",
     "opentelemetry-distro[otlp]",
     "otel-extensions >= 0.1.2",
     "retry>=0.9.2",
@@ -37,6 +37,8 @@ publish_test_results_cli = "utf_queue_client.scripts.publish_test_results_cli:cl
 ubai_update_retention_cli = "utf_queue_client.scripts.ubai_update_retention_cli:cli_entrypoint"
 publish_release_info_cli = "utf_queue_client.scripts.publish_release_info_cli:cli_entrypoint"
 ubai_copy_cli = "utf_queue_client.scripts.ubai_copy_cli:cli_entrypoint"
+pkgrelease_manifest_read = "utf_queue_client.scripts.package_release_metadata_cli:manifest_read_cli_entrypoint"
+pkgrelease_manifest_write = "utf_queue_client.scripts.package_release_metadata_cli:manifest_write_cli_entrypoint"
 pkgrelease_quality_status_update = "utf_queue_client.scripts.package_release_metadata_cli:update_cli_entrypoint"
 pkgrelease_quality_status_enquiry = "utf_queue_client.scripts.package_release_metadata_cli:enquiry_cli_entrypoint"
 

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.5}/requirements.txt

@@ -9,7 +9,7 @@ typing_extensions; python_version < '3.8'
 click
 certifi>=2020.4
 ubai-client>=1.2.0
-package-release-metadata-client==0.1.2
+package-release-metadata-client==0.1.4
 opentelemetry-distro[otlp]
 otel-extensions>=0.2.4
 retry>=0.9.2

{utf_queue_client-1.21.4b4 → utf_queue_client-1.21.5}/test/script_test.groovy

@@ -17,7 +17,7 @@ pipeline {
                     . venv/bin/activate
                     pip install --upgrade pip
                     pip install ubai_client
-                    pip install .
+                    pip install . --extra-index-url https://artifactory-bos.silabs.net/artifactory/api/pypi/infrasw-python-local/simple
                 '''
             }
         }

utf_queue_client-1.21.5/test/scripts/test_package_release_metadata_cli.py

@@ -0,0 +1,497 @@
+import json
+from unittest.mock import MagicMock, patch
+
+import pytest
+from click.testing import CliRunner
+
+pytest.importorskip("package_release_metadata_client")
+
+from utf_queue_client.scripts.package_release_metadata_cli import (  # noqa: E402
+    enquiry_cli_entrypoint,
+    manifest_read_cli_entrypoint,
+    manifest_write_cli_entrypoint,
+    update_cli_entrypoint,
+)
+
+runner = CliRunner()
+
+# ---------------------------------------------------------------------------
+# Shared helpers
+# ---------------------------------------------------------------------------
+
+REQUIRED_UPDATE_ARGS = [
+    "--release-name",
+    "2.4.1",
+    "--build-number",
+    "42",
+    "--job-url",
+    "https://ci/build/1",
+    "--stack-name",
+    "zigbee",
+    "--test-result-type",
+    "sanity",
+    "--status",
+    "pass",
+    "--run-num",
+    "1",
+]
+
+REQUIRED_MANIFEST_WRITE_ARGS = [
+    "--release-name",
+    "2.4.1",
+    "--build-number",
+    "42",
+]
+
+
+def _qs_client_mock(create_data=None, latest_data=None, list_data=None):
+    """Return a MagicMock QualityStatusClient with pre-configured .data on each method."""
+    client = MagicMock()
+    if create_data is not None:
+        client.create_quality_status.return_value = MagicMock(data=create_data)
+    if latest_data is not None:
+        client.get_latest_quality_status.return_value = MagicMock(data=latest_data)
+    if list_data is not None:
+        client.list_quality_status.return_value = MagicMock(data=list_data)
+    return client
+
+
+def _manifest_client_mock(create_data=None, latest_data=None):
+    """Return a MagicMock ManifestClient with pre-configured .data on each method."""
+    client = MagicMock()
+    if create_data is not None:
+        client.create_manifest.return_value = MagicMock(data=create_data)
+    if latest_data is not None:
+        client.get_latest_manifest.return_value = MagicMock(data=latest_data)
+    return client
+
+
+# ---------------------------------------------------------------------------
+# pkgrelease_manifest_read — argument validation
+# ---------------------------------------------------------------------------
+
+
+def test_manifest_read_help_exits_cleanly():
+    result = runner.invoke(manifest_read_cli_entrypoint, ["--help"])
+    assert result.exit_code == 0
+    assert "ManifestRead" in result.output
+
+
+def test_manifest_read_missing_release_name_fails():
+    result = runner.invoke(manifest_read_cli_entrypoint, [])
+    assert result.exit_code != 0
+    assert "Missing option" in result.output
+
+
+# ---------------------------------------------------------------------------
+# pkgrelease_manifest_read — API routing and output
+# ---------------------------------------------------------------------------
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli._make_manifest_client")
+def test_manifest_read_targets_prod_by_default(mock_make):
+    data = MagicMock(manifest_id="uuid-1", to_dict=lambda: {"manifest_id": "uuid-1"})
+    mock_make.return_value = _manifest_client_mock(latest_data=data)
+    runner.invoke(manifest_read_cli_entrypoint, ["--release-name", "2.4.1"])
+    mock_make.assert_called_once_with(False)
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli._make_manifest_client")
+def test_manifest_read_dev_flag_targets_dev(mock_make):
+    data = MagicMock(manifest_id="uuid-1", to_dict=lambda: {"manifest_id": "uuid-1"})
+    mock_make.return_value = _manifest_client_mock(latest_data=data)
+    runner.invoke(manifest_read_cli_entrypoint, ["--release-name", "2.4.1", "--dev"])
+    mock_make.assert_called_once_with(True)
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli._make_manifest_client")
+def test_manifest_read_calls_get_latest_manifest(mock_make):
+    data = MagicMock(manifest_id="uuid-1", to_dict=lambda: {"manifest_id": "uuid-1"})
+    client = _manifest_client_mock(latest_data=data)
+    mock_make.return_value = client
+    result = runner.invoke(manifest_read_cli_entrypoint, ["--release-name", "2.4.1"])
+    assert result.exit_code == 0
+    client.get_latest_manifest.assert_called_once_with("2.4.1")
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli._make_manifest_client")
+def test_manifest_read_output_is_json(mock_make):
+    data = MagicMock(
+        manifest_id="uuid-abc",
+        to_dict=lambda: {"manifest_id": "uuid-abc", "release_name": "2.4.1"},
+    )
+    mock_make.return_value = _manifest_client_mock(latest_data=data)
+    result = runner.invoke(manifest_read_cli_entrypoint, ["--release-name", "2.4.1"])
+    assert result.exit_code == 0
+    parsed = json.loads(result.output)
+    assert parsed["manifest_id"] == "uuid-abc"
+
+
+# ---------------------------------------------------------------------------
+# pkgrelease_manifest_write — argument validation
+# ---------------------------------------------------------------------------
+
+
+def test_manifest_write_help_exits_cleanly():
+    result = runner.invoke(manifest_write_cli_entrypoint, ["--help"])
+    assert result.exit_code == 0
+    assert "ManifestRead" in result.output
+
+
+def test_manifest_write_missing_release_name_fails():
+    result = runner.invoke(manifest_write_cli_entrypoint, ["--build-number", "42"])
+    assert result.exit_code != 0
+    assert "Missing option" in result.output
+
+
+def test_manifest_write_missing_build_number_fails():
+    result = runner.invoke(manifest_write_cli_entrypoint, ["--release-name", "2.4.1"])
+    assert result.exit_code != 0
+    assert "Missing option" in result.output
+
+
+# ---------------------------------------------------------------------------
+# pkgrelease_manifest_write — API routing and output
+# ---------------------------------------------------------------------------
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli._make_manifest_client")
+def test_manifest_write_targets_prod_by_default(mock_make):
+    data = MagicMock(manifest_id="uuid-1", to_dict=lambda: {"manifest_id": "uuid-1"})
+    mock_make.return_value = _manifest_client_mock(create_data=data)
+    runner.invoke(manifest_write_cli_entrypoint, REQUIRED_MANIFEST_WRITE_ARGS)
+    mock_make.assert_called_once_with(False)
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli._make_manifest_client")
+def test_manifest_write_dev_flag_targets_dev(mock_make):
+    data = MagicMock(manifest_id="uuid-1", to_dict=lambda: {"manifest_id": "uuid-1"})
+    mock_make.return_value = _manifest_client_mock(create_data=data)
+    runner.invoke(
+        manifest_write_cli_entrypoint, REQUIRED_MANIFEST_WRITE_ARGS + ["--dev"]
+    )
+    mock_make.assert_called_once_with(True)
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli._make_manifest_client")
+def test_manifest_write_calls_create_manifest(mock_make):
+    data = MagicMock(
+        manifest_id="uuid-new", to_dict=lambda: {"manifest_id": "uuid-new"}
+    )
+    client = _manifest_client_mock(create_data=data)
+    mock_make.return_value = client
+    result = runner.invoke(manifest_write_cli_entrypoint, REQUIRED_MANIFEST_WRITE_ARGS)
+    assert result.exit_code == 0
+    client.create_manifest.assert_called_once()
+    payload = client.create_manifest.call_args[0][0]
+    assert payload.release_name == "2.4.1"
+    assert payload.build_number == 42
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli._make_manifest_client")
+def test_manifest_write_optional_artifactory_url_forwarded(mock_make):
+    data = MagicMock(
+        manifest_id="uuid-new", to_dict=lambda: {"manifest_id": "uuid-new"}
+    )
+    client = _manifest_client_mock(create_data=data)
+    mock_make.return_value = client
+    result = runner.invoke(
+        manifest_write_cli_entrypoint,
+        REQUIRED_MANIFEST_WRITE_ARGS
+        + ["--artifactory-url", "https://art.example.com/pkg"],
+    )
+    assert result.exit_code == 0
+    payload = client.create_manifest.call_args[0][0]
+    assert payload.artifactory_url == "https://art.example.com/pkg"
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli._make_manifest_client")
+def test_manifest_write_output_is_json(mock_make):
+    data = MagicMock(
+        manifest_id="uuid-new",
+        to_dict=lambda: {
+            "manifest_id": "uuid-new",
+            "release_name": "2.4.1",
+            "build_number": 42,
+        },
+    )
+    mock_make.return_value = _manifest_client_mock(create_data=data)
+    result = runner.invoke(manifest_write_cli_entrypoint, REQUIRED_MANIFEST_WRITE_ARGS)
+    assert result.exit_code == 0
+    parsed = json.loads(result.output)
+    assert parsed["manifest_id"] == "uuid-new"
+    assert parsed["build_number"] == 42
+
+
+# ---------------------------------------------------------------------------
+# pkgrelease_quality_status_update — argument validation
+# ---------------------------------------------------------------------------
+
+
+def test_update_help_exits_cleanly():
+    result = runner.invoke(update_cli_entrypoint, ["--help"])
+    assert result.exit_code == 0
+    assert "QualityStatusRead" in result.output
+
+
+def test_update_missing_required_args_fails():
+    result = runner.invoke(update_cli_entrypoint, ["--release-name", "2.4.1"])
+    assert result.exit_code != 0
+    assert "Missing option" in result.output
+
+
+def test_update_invalid_status_rejected():
+    args = REQUIRED_UPDATE_ARGS[:]
+    args[args.index("pass")] = "passed"
+    result = runner.invoke(update_cli_entrypoint, args)
+    assert result.exit_code != 0
+    assert "'passed' is not" in result.output
+
+
+@pytest.mark.parametrize("status", ["pass", "fail", "aborted"])
+def test_update_all_valid_statuses_accepted(status):
+    args = REQUIRED_UPDATE_ARGS[:]
+    args[args.index("pass")] = status
+    data = MagicMock(id=1, to_dict=lambda: {"id": 1})
+    with patch(
+        "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+    ) as mock_make:
+        mock_make.return_value = _qs_client_mock(create_data=data)
+        result = runner.invoke(update_cli_entrypoint, args)
+    assert result.exit_code == 0
+
+
+# ---------------------------------------------------------------------------
+# pkgrelease_quality_status_update — API routing and output
+# ---------------------------------------------------------------------------
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_update_targets_prod_by_default(mock_make):
+    data = MagicMock(id=1, to_dict=lambda: {"id": 1})
+    mock_make.return_value = _qs_client_mock(create_data=data)
+    runner.invoke(update_cli_entrypoint, REQUIRED_UPDATE_ARGS)
+    mock_make.assert_called_once_with(False)
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_update_dev_flag_targets_dev(mock_make):
+    data = MagicMock(id=1, to_dict=lambda: {"id": 1})
+    mock_make.return_value = _qs_client_mock(create_data=data)
+    runner.invoke(update_cli_entrypoint, REQUIRED_UPDATE_ARGS + ["--dev"])
+    mock_make.assert_called_once_with(True)
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_update_calls_create_quality_status(mock_make):
+    data = MagicMock(id=99, to_dict=lambda: {"id": 99})
+    client = _qs_client_mock(create_data=data)
+    mock_make.return_value = client
+    result = runner.invoke(update_cli_entrypoint, REQUIRED_UPDATE_ARGS)
+    assert result.exit_code == 0
+    client.create_quality_status.assert_called_once()
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_update_optional_fields_forwarded(mock_make):
+    data = MagicMock(id=1, to_dict=lambda: {"id": 1})
+    client = _qs_client_mock(create_data=data)
+    mock_make.return_value = client
+    result = runner.invoke(
+        update_cli_entrypoint,
+        REQUIRED_UPDATE_ARGS
+        + [
+            "--pass-cnt",
+            "80",
+            "--fail-cnt",
+            "20",
+            "--total-cnt",
+            "100",
+            "--pass-pct",
+            "80.0",
+            "--sub-stack",
+            "core",
+        ],
+    )
+    assert result.exit_code == 0
+    payload = client.create_quality_status.call_args[0][0]
+    assert payload.pass_cnt == 80
+    assert payload.fail_cnt == 20
+    assert payload.sub_stack == "core"
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_update_output_is_json(mock_make):
+    data = MagicMock(id=7, to_dict=lambda: {"id": 7, "status": "pass"})
+    mock_make.return_value = _qs_client_mock(create_data=data)
+    result = runner.invoke(update_cli_entrypoint, REQUIRED_UPDATE_ARGS)
+    assert result.exit_code == 0
+    parsed = json.loads(result.output)
+    assert parsed["id"] == 7
+
+
+# ---------------------------------------------------------------------------
+# pkgrelease_quality_status_enquiry — argument validation
+# ---------------------------------------------------------------------------
+
+
+def test_enquiry_help_exits_cleanly():
+    result = runner.invoke(enquiry_cli_entrypoint, ["--help"])
+    assert result.exit_code == 0
+    assert "LatestQualityStatusResponse" in result.output
+    assert "List[QualityStatusRead]" in result.output
+
+
+def test_enquiry_missing_release_name_fails():
+    result = runner.invoke(enquiry_cli_entrypoint, [])
+    assert result.exit_code != 0
+    assert "Missing option" in result.output
+
+
+# ---------------------------------------------------------------------------
+# pkgrelease_quality_status_enquiry — API routing
+# ---------------------------------------------------------------------------
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_enquiry_release_name_only_calls_latest(mock_make):
+    data = MagicMock(
+        to_dict=lambda: {"release_name": "2.4.1", "build_number": 42, "stacks": []}
+    )
+    client = _qs_client_mock(latest_data=data)
+    mock_make.return_value = client
+    result = runner.invoke(enquiry_cli_entrypoint, ["--release-name", "2.4.1"])
+    assert result.exit_code == 0
+    client.get_latest_quality_status.assert_called_once_with(
+        release_name="2.4.1", build_number=None
+    )
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_enquiry_with_build_num_calls_latest(mock_make):
+    data = MagicMock(to_dict=lambda: {})
+    client = _qs_client_mock(latest_data=data)
+    mock_make.return_value = client
+    result = runner.invoke(
+        enquiry_cli_entrypoint, ["--release-name", "2.4.1", "--build-num", "42"]
+    )
+    assert result.exit_code == 0
+    client.get_latest_quality_status.assert_called_once_with(
+        release_name="2.4.1", build_number=42
+    )
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_enquiry_with_stack_name_calls_list(mock_make):
+    client = _qs_client_mock(list_data=[])
+    mock_make.return_value = client
+    result = runner.invoke(
+        enquiry_cli_entrypoint, ["--release-name", "2.4.1", "--stack-name", "zigbee"]
+    )
+    assert result.exit_code == 0
+    client.list_quality_status.assert_called_once_with(
+        release_name="2.4.1",
+        build_number=None,
+        stack_name="zigbee",
+        test_result_type=None,
+    )
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_enquiry_with_test_result_type_calls_list(mock_make):
+    client = _qs_client_mock(list_data=[])
+    mock_make.return_value = client
+    result = runner.invoke(
+        enquiry_cli_entrypoint,
+        ["--release-name", "2.4.1", "--test-result-type", "sanity"],
+    )
+    assert result.exit_code == 0
+    client.list_quality_status.assert_called_once_with(
+        release_name="2.4.1",
+        build_number=None,
+        stack_name=None,
+        test_result_type="sanity",
+    )
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_enquiry_targets_prod_by_default(mock_make):
+    data = MagicMock(to_dict=lambda: {})
+    mock_make.return_value = _qs_client_mock(latest_data=data)
+    runner.invoke(enquiry_cli_entrypoint, ["--release-name", "2.4.1"])
+    mock_make.assert_called_once_with(False)
+
+
+@patch(
+    "utf_queue_client.scripts.package_release_metadata_cli._make_quality_status_client"
+)
+def test_enquiry_dev_flag_targets_dev(mock_make):
+    data = MagicMock(to_dict=lambda: {})
+    mock_make.return_value = _qs_client_mock(latest_data=data)
+    runner.invoke(enquiry_cli_entrypoint, ["--release-name", "2.4.1", "--dev"])
+    mock_make.assert_called_once_with(True)
+
+
+# ---------------------------------------------------------------------------
+# _make_manifest_client / _make_quality_status_client — construction
+# ---------------------------------------------------------------------------
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli.ManifestClient")
+def test_make_manifest_client_prod_by_default(mock_cls):
+    from utf_queue_client.scripts.package_release_metadata_cli import (
+        _make_manifest_client,
+    )
+
+    _make_manifest_client(dev=False)
+    mock_cls.assert_called_once_with(dev=False)
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli.ManifestClient")
+def test_make_manifest_client_dev_flag(mock_cls):
+    from utf_queue_client.scripts.package_release_metadata_cli import (
+        _make_manifest_client,
+    )
+
+    _make_manifest_client(dev=True)
+    mock_cls.assert_called_once_with(dev=True)
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli.QualityStatusClient")
+def test_make_quality_status_client_prod_by_default(mock_cls):
+    from utf_queue_client.scripts.package_release_metadata_cli import (
+        _make_quality_status_client,
+    )
+
+    _make_quality_status_client(dev=False)
+    mock_cls.assert_called_once_with(dev=False)
+
+
+@patch("utf_queue_client.scripts.package_release_metadata_cli.QualityStatusClient")
+def test_make_quality_status_client_dev_flag(mock_cls):
+    from utf_queue_client.scripts.package_release_metadata_cli import (
+        _make_quality_status_client,
+    )
+
+    _make_quality_status_client(dev=True)
+    mock_cls.assert_called_once_with(dev=True)