utf-queue-client 1.17.0__tar.gz → 1.17.1__tar.gz

{utf-queue-client-1.17.0 → utf-queue-client-1.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: utf-queue-client
-Version: 1.17.0
+Version: 1.17.1
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: Joe Savage

{utf-queue-client-1.17.0 → utf-queue-client-1.17.1}/setup.py

@@ -6,7 +6,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "utf-queue-client"
-VERSION = "1.17.0"
+VERSION = "1.17.1"
 # To install the library, run the following
 #
 # python setup.py install

{utf-queue-client-1.17.0 → utf-queue-client-1.17.1}/test/test_amqp_connections.py

@@ -25,7 +25,7 @@ def queue_server(request):
     ],
 )
 def test_producer(queue_server, username, password):
-    suffix = ".dev.silabs.net"
+    suffix = ".silabs.net"
     queue_server = f"{queue_server}{suffix}"
     l = logging.getLogger("test_producer")
     l.info("Creating producer...")

utf-queue-client-1.17.1/test/test_publish_release_info.py

@@ -0,0 +1,145 @@
+import pytest
+from otel_extensions import inject_context_to_env, instrumented
+import os
+import subprocess
+import sys
+from utf_queue_client.scripts.publish_release_info_cli import publish_release_information, \
+    update_artifacts_retention_days_to_keep_forever, cli
+import requests
+from unittest import mock
+from unittest.mock import MagicMock, patch
+
+
+@pytest.fixture
+def publish_release_info():
+    yield [
+        ("releaseDate", "2023-06-16"),
+        ("branchName", "release/gecko_sdk_3.2"),
+        ("releaseType", "GA"),
+        ("releaseName", "23Q2-GA"),
+        ("SDKBuildNum", "407"),
+        ("installerURLSDK", "https://jenkins-cbs-gecko-sdk.silabs.net/job/Gecko_SDK_Suite_super/job/release%252F21q4/284/"),
+        ("IARVersionNum", "9.20.4"),
+        ("GCCVersionNum", "10.3.1"),
+        ("CommanderVersionNum", "v1.8.1"),
+        ("SEVersionNum", "1.2.4"),
+        ("WSTKFirmwareVersionNum", "v1.4.4")
+    ]
+
+
+@instrumented
+def test_publish_release_info(request, publish_release_info):
+    args = ["--username", "svc_sqabot", "--password", "password"]
+    for k, v in publish_release_info:
+        args += ["--data", k, v]
+
+    base_dir = os.path.dirname(os.path.dirname(__file__))
+    @inject_context_to_env
+    def call_cli_script():
+        assert "TRACEPARENT" in os.environ
+        process = subprocess.Popen(
+            [
+                sys.executable,
+                os.path.join(
+                    base_dir, "utf_queue_client", "scripts", "publish_release_info_cli.py"
+                ),
+            ]
+            + args,
+        )
+        process.communicate()
+        assert process.poll() == 0
+
+    call_cli_script()
+
+
+def test_publish_release_information():
+    requests_post = requests.post
+    requests.post = MagicMock()
+    publish_release_information("", "", {})
+    assert requests.post.call_count == 2
+    requests.post = requests_post
+
+
+def test_publish_release_cli_insufficient_params():
+    requests_post = requests.post
+    requests_post_mock = MagicMock()
+    requests.post = requests_post_mock
+    cli("", "", {})
+    assert requests.post.call_count == 0
+    requests.post = requests_post
+
+
+def test_publish_release_cli():
+    requests_post = requests.post
+    requests_post_mock = MagicMock()
+    requests.post = requests_post_mock
+    cli("", "", {("branchName", "test"), ("releaseData", "")})
+    assert requests_post_mock.call_count == 2
+    post_params = requests_post_mock.call_args.kwargs.get('json')
+    assert post_params.get("branchName") == "test"
+    assert post_params.get("releaseData") is None
+    requests.post = requests_post
+
+
+def test_update_artifacts_retention_days_to_keep_forever():
+    requests_patch = requests.patch
+    requests.patch = MagicMock()
+    data_dict = {"branchName": "release/gec", "SDKBuildNum": "407"}
+    update_artifacts_retention_days_to_keep_forever(data_dict)
+    assert requests.patch.call_count == 1
+    requests.patch = requests_patch
+    patch_response = MagicMock()
+    mocked_patch =mock.patch.object(requests, "patch", return_value=patch_response)
+    patch_response.status_code = 200
+    update_artifacts_retention_days_to_keep_forever(data_dict)
+
+
+@patch('requests.post')
+def test_publish_release_information_success(mock_post):
+    mock_response_auth = MagicMock()
+    mock_response_auth.json.return_value = {"access_token": "test_token"}
+    mock_response_auth.raise_for_status.return_value = None
+
+    mock_response_release = MagicMock()
+    mock_response_release.status_code = 201
+    mock_response_release.json.return_value = {"message": "success"}
+
+    mock_post.side_effect = [mock_response_auth, mock_response_release]
+
+    result = publish_release_information("test_username", "test_password", {"test_key": "test_value"})
+    assert mock_response_release.json.called
+    assert result
+
+@patch('requests.post')
+def test_publish_release_information_release_fail(mock_post):
+    # Mock the responses
+    mock_response_auth = MagicMock()
+    mock_response_auth.json.return_value = {"access_token": "test_token"}
+    mock_response_auth.raise_for_status.return_value = None
+
+    mock_response_release = MagicMock()
+    mock_response_release.status_code = 400
+    mock_response_release.text = "Release failed"
+
+    mock_post.side_effect = [mock_response_auth, mock_response_release]
+
+    result = publish_release_information("test_username", "test_password", {"test_key": "test_value"})
+    assert result is None
+
+@patch('requests.post')
+def test_publish_release_information_release_fail_422(mock_post):
+    # Mock the responses
+    mock_response_auth = MagicMock()
+    mock_response_auth.json.return_value = {"access_token": "test_token"}
+    mock_response_auth.raise_for_status.return_value = None
+
+    mock_response_release = MagicMock()
+    mock_response_release.status_code = 422
+    mock_response_release.json.return_value = {"detail": [{"loc": ["", "test_field"], "msg": "test_error"}]}
+
+    mock_post.side_effect = [mock_response_auth, mock_response_release]
+
+    # Call the function
+    result = publish_release_information("test_username", "test_password", {"test_key": "test_value"})
+    assert mock_response_release.json.called
+    assert result is None

{utf-queue-client-1.17.0 → utf-queue-client-1.17.1}/utf_queue_client/scripts/publish_release_info_cli.py

@@ -1,3 +1,5 @@
+import json
+
 import click
 from utf_queue_client.scripts import setup_telemetry
 from retry import retry
@@ -36,43 +38,46 @@ def cli(username: str, password: str, data: Iterable[Tuple[str, str]]):
     with setup_telemetry():
         data_dict = {}
         for key, value in data:
-            data_dict[key] = value
+            if value:
+                data_dict[key] = value
+            else:
+                data_dict[key] = None
+
+        if "branchName" not in data_dict.keys():
+            print("Please provide 'branchName' field to add it to the UBAI artifacts")
+            return
 
         @retry(Exception, delay=5, backoff=2, max_delay=30, tries=NUM_RETRIES + 1)
         def retry_wrapper():
             response = publish_release_information(username, password, data_dict)
             if response is not None:
                 update_artifacts_retention_days_to_keep_forever(data_dict)
+
         retry_wrapper()
 
 
 @instrumented
 def publish_release_information(username: str, password: str, data_dict: dict):
-    url = 'https://auth.silabs.net/api/v1/auth'
+    url = "https://auth.silabs.net/api/v1/auth"
 
     # Create a dictionary with the username and password
-    credentials = {
-        'username': username,
-        'password': password
-    }
+    credentials = {"username": username, "password": password}
 
     try:
         response = requests.post(url, json=credentials, verify=False)
         response.raise_for_status()  # Raise an exception for 4xx/5xx status codes
 
         # Extract the JWT token from the response
-        jwt_token = response.json()['access_token']
+        jwt_token = response.json()["access_token"]
 
     except requests.exceptions.RequestException as e:
         print(f"Error: {e}")
         return None
 
-    url = 'https://releaseinfo.silabs.net/api/v1/releases'
+    url = "https://releaseinfo.silabs.net/api/v1/releases"
 
     # Create the Authorization header with the Bearer token
-    headers = {
-        'Authorization': f'JWT {jwt_token}'
-    }
+    headers = {"Authorization": f"JWT {jwt_token}"}
 
     # Send the POST request with the headers
     response = requests.post(url, json=data_dict, headers=headers, verify=False)
@@ -80,26 +85,38 @@ def publish_release_information(username: str, password: str, data_dict: dict):
     # Check the response status code
     if response.status_code == 201:
         # Request successful
-        print('Publish release information successful!')
-        print('Response:', response.json())
+        print("Publish release information successful!")
+        print("Response:", response.json())
         return True
     else:
         # Request failed
-        print('Publish release information failed.')
-        print('Status Code:', response.status_code)
+        result = response.text
+        if response.status_code == 422:
+            response_dict = response.json()
+            result = ""
+            for detail in response_dict["detail"]:
+                field_name = detail["loc"][1]
+                error_msg = detail["msg"]
+                result += f"'{field_name}': {error_msg}. "
+
+        print("")
+        print(
+            f"Publish release information failed with status code "
+            f"- {response.status_code} due to - {result}"
+        )
         return None
 
 
 @instrumented
 def update_artifacts_retention_days_to_keep_forever(data_dict: dict):
-    url = 'https://ubai.silabs.net/api/v1/artifacts'
+    url = "https://ubai.silabs.net/api/v1/artifacts"
 
     artifact_search_spec = {
         "metadata": {
             "branch": data_dict["branchName"],
-            "build_number": data_dict["SDKBuildNum"]
+            "build_number": data_dict["SDKBuildNum"],
         },
-        "retentionDays": -1
+        "retentionDays": -1,
     }
 
     # Send the PATCH request with the headers
@@ -112,9 +129,11 @@ def update_artifacts_retention_days_to_keep_forever(data_dict: dict):
         print("Response:", response.json())
     else:
         # Request failed
-        print('Update Retention days in UBAI for release artifact to keep forever failed.')
-        print('Status Code:', response.status_code)
-        print('Response:', response.json())
+        print(
+            "Update Retention days in UBAI for release artifact to keep forever failed."
+        )
+        print("Status Code:", response.status_code)
+        print("Response:", response.json())
         return None
 
 

{utf-queue-client-1.17.0 → utf-queue-client-1.17.1}/utf_queue_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: utf-queue-client
-Version: 1.17.0
+Version: 1.17.1
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: Joe Savage

utf-queue-client-1.17.0/test/test_publish_release_info.py

@@ -1,72 +0,0 @@
-import pytest
-from otel_extensions import inject_context_to_env, instrumented
-import os
-import subprocess
-import sys
-from utf_queue_client.scripts.publish_release_info_cli import publish_release_information, update_artifacts_retention_days_to_keep_forever
-import requests
-from unittest import mock
-from unittest.mock import MagicMock, patch
-
-
-@pytest.fixture
-def publish_release_info():
-    yield [
-        ("releaseDate", "2023-06-16"),
-        ("branchName", "release/gecko_sdk_3.2"),
-        ("releaseType", "GA"),
-        ("releaseName", "23Q2-GA"),
-        ("SDKBuildNum", "407"),
-        ("installerURLSDK", "https://jenkins-cbs-gecko-sdk.silabs.net/job/Gecko_SDK_Suite_super/job/release%252F21q4/284/"),
-        ("IARVersionNum", "9.20.4"),
-        ("GCCVersionNum", "10.3.1"),
-        ("CommanderVersionNum", "v1.8.1"),
-        ("SEVersionNum", "1.2.4"),
-        ("WSTKFirmwareVersionNum", "v1.4.4")
-    ]
-
-
-@instrumented
-def test_publish_release_info(request, publish_release_info):
-    args = ["--username", "svc_sqabot", "--password", "password"]
-    for k, v in publish_release_info:
-        args += ["--data", k, v]
-
-    base_dir = os.path.dirname(os.path.dirname(__file__))
-    @inject_context_to_env
-    def call_cli_script():
-        assert "TRACEPARENT" in os.environ
-        process = subprocess.Popen(
-            [
-                sys.executable,
-                os.path.join(
-                    base_dir, "utf_queue_client", "scripts", "publish_release_info_cli.py"
-                ),
-            ]
-            + args,
-        )
-        process.communicate()
-        assert process.poll() == 0
-
-    call_cli_script()
-
-
-def test_publish_release_information():
-    requests_post = requests.post
-    requests.post = MagicMock()
-    publish_release_information("", "", {})
-    assert requests.post.call_count == 2
-    requests.post = requests_post
-
-
-def test_update_artifacts_retention_days_to_keep_forever():
-    requests_patch = requests.patch
-    requests.patch = MagicMock()
-    data_dict = {"branchName": "release/gec", "SDKBuildNum": "407"}
-    update_artifacts_retention_days_to_keep_forever(data_dict)
-    assert requests.patch.call_count == 1
-    requests.patch = requests_patch
-    patch_response = MagicMock()
-    mocked_patch =mock.patch.object(requests, "patch", return_value=patch_response)
-    patch_response.status_code = 200
-    update_artifacts_retention_days_to_keep_forever(data_dict)