converter

Signed-off-by: Gabriele Santomaggio <[email protected]>

Author: Gsantomaggio

.ci/ubuntu/gha-setup.sh

@@ -7,7 +7,7 @@ set -o xtrace
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 readonly script_dir
 echo "[INFO] script_dir: '$script_dir'"
-readonly rabbitmq_image=rabbitmq:4.1.0-beta.4-management-alpine
+readonly rabbitmq_image=rabbitmq:4.1.0-management
 
 
 readonly docker_name_prefix='rabbitmq-amqp-python-client'

examples/getting_started/getting_started.py

@@ -11,11 +11,7 @@
     ExchangeToQueueBindingSpecification,
     Message,
     OutcomeState,
-    QuorumQueueSpecification,
-)
-from rabbitmq_amqp_python_client.utils import (
-    bytes_to_string,
-    string_to_bytes,
+    QuorumQueueSpecification, Converter,
 )
 
 MESSAGES_TO_PUBLISH = 100
@@ -28,7 +24,7 @@ def __init__(self):
         self._count = 0
 
     def on_amqp_message(self, event: Event):
-        print("received message: {} ".format(bytes_to_string(event.message.body)))
+        print("received message: {} ".format(Converter.bytes_to_string(event.message.body)))
 
         # accepting
         self.delivery_context.accept(event)
@@ -47,13 +43,11 @@ def on_amqp_message(self, event: Event):
         # in case of rejection with annotations added
         # self.delivery_context.discard_with_annotations(event)
 
-        print("count " + str(self._count))
-
         self._count = self._count + 1
+        print("count " + str(self._count))
 
         if self._count == MESSAGES_TO_PUBLISH:
-            print("closing receiver")
-            # if you want you can add cleanup operations here
+            print("received all messages")
 
     def on_connection_closed(self, event: Event):
         # if you want you can add cleanup operations here
@@ -125,9 +119,8 @@ def main() -> None:
 
     # publish 10 messages
     for i in range(MESSAGES_TO_PUBLISH):
-        print("publishing")
         status = publisher.publish(
-            Message(body=string_to_bytes("test message {} ".format(i)))
+            Message(body=Converter.string_to_bytes("test message {} ".format(i)))
         )
         if status.remote_state == OutcomeState.ACCEPTED:
             print("message accepted")

rabbitmq_amqp_python_client/connection.py

@@ -180,6 +180,7 @@ def dial(self) -> None:
             self._ssl_domain = SSLDomain(SSLDomain.MODE_CLIENT)
             assert self._ssl_domain
 
+
             if isinstance(self._conf_ssl_context, PosixSslConfigurationContext):
                 ca_cert = self._conf_ssl_context.ca_cert
             elif isinstance(self._conf_ssl_context, WinSslConfigurationContext):

rabbitmq_amqp_python_client/qpid/proton/_message.py

@@ -511,7 +511,7 @@ def instructions(self) -> Optional[AnnotationDict]:
 
     @instructions.setter
     def instructions(
-        self, instructions: Optional[Dict[Union[str, int], "PythonAMQPData"]]
+            self, instructions: Optional[Dict[Union[str, int], "PythonAMQPData"]]
     ) -> None:
         if isinstance(instructions, dict):
             self.instruction_dict = AnnotationDict(instructions, raise_on_error=False)
@@ -534,7 +534,7 @@ def annotations(self) -> Optional[AnnotationDict]:
 
     @annotations.setter
     def annotations(
-        self, annotations: Optional[Dict[Union[str, int], "PythonAMQPData"]]
+            self, annotations: Optional[Dict[Union[str, int], "PythonAMQPData"]]
     ) -> None:
         if isinstance(annotations, dict):
             self.annotation_dict = AnnotationDict(annotations, raise_on_error=False)
@@ -601,7 +601,8 @@ def send(self, sender: "Sender", tag: Optional[str] = None) -> "Delivery":
         return dlv
 
     @overload
-    def recv(self, link: "Sender") -> None: ...
+    def recv(self, link: "Sender") -> None:
+        ...
 
     def recv(self, link: "Receiver") -> Optional["Delivery"]:
         """
@@ -632,24 +633,24 @@ def recv(self, link: "Receiver") -> Optional["Delivery"]:
     def __repr__(self) -> str:
         props = []
         for attr in (
-            "inferred",
-            "address",
-            "reply_to",
-            "durable",
-            "ttl",
-            "priority",
-            "first_acquirer",
-            "delivery_count",
-            "id",
-            "correlation_id",
-            "user_id",
-            "group_id",
-            "group_sequence",
-            "reply_to_group_id",
-            "instructions",
-            "annotations",
-            "properties",
-            "body",
+                "inferred",
+                "address",
+                "reply_to",
+                "durable",
+                "ttl",
+                "priority",
+                "first_acquirer",
+                "delivery_count",
+                "id",
+                "correlation_id",
+                "user_id",
+                "group_id",
+                "group_sequence",
+                "reply_to_group_id",
+                "instructions",
+                "annotations",
+                "properties",
+                "body",
         ):
             value = getattr(self, attr)
             if value:

tests/test_connection.py

@@ -1,5 +1,6 @@
 import time
 from datetime import datetime, timedelta
+from pathlib import Path
 
 from rabbitmq_amqp_python_client import (
     ConnectionClosed,
@@ -37,7 +38,17 @@ def test_connection_ssl(ssl_context) -> None:
     environment = Environment(
         "amqps://guest:guest@localhost:5671/",
         ssl_context=ssl_context,
+
     )
+    path = Path(ssl_context.ca_cert)
+    assert path.is_file() is True
+    assert path.exists() is True
+
+    path = Path(ssl_context.client_cert.client_cert)
+    assert path.is_file() is True
+
+    path = Path(ssl_context.client_cert.client_key)
+    assert path.is_file() is True
 
     connection = environment.connection()
     connection.dial()