modify action/adding Dockerfile and Makefile

Author: DanielePalaia

.ci/conf/rabbitmq.conf

@@ -5,5 +5,3 @@ ssl_options.certfile = /etc/rabbitmq/certs/server_certificate.pem
 ssl_options.keyfile = /etc/rabbitmq/certs/server_key.pem
 listeners.ssl.default = 5671
 stream.listeners.ssl.default = 5551
-ssl_options.verify               = verify_peer
-ssl_options.fail_if_no_peer_cert = false

.github/workflows/build-test.yaml

@@ -17,25 +17,52 @@ jobs:
         python-version: [3.9]
         os: [ubuntu-22.04]
     runs-on: ${{ matrix.os }}
-    services:
-      rabbitmq-server:
-        image: rabbitmq:4.0.3-management
-        ports:
-          - 5672:5672
-          - 15672:15672
+
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and export
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          tags: rabbitmq_tls:latest
+          outputs: type=docker,dest=/tmp/rabbitmq_tls.tar
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rabbitmq_tls
+          path: /tmp/rabbitmq_tls.tar
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: rabbitmq_tls
+          path: /tmp
+      - name: Load image
+        run: |
+          docker load --input /tmp/rabbitmq_tls.tar
+          docker image ls -a
+          docker run -d --rm --name rabbitmq-stream-client-test \
+          -p 5552:5552 -p 5672:5672 -p 5671:5671 -p 5551:5551 -p 15672:15672 \
+          -e RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-rabbitmq_stream advertised_host localhost" \
+          rabbitmq_tls
+      - name: wait for running
+        run: |
+          docker exec rabbitmq-stream-client-test /bin/bash -c 'ps -aux'
+          docker exec rabbitmq-stream-client-test /bin/bash -c 'sleep 10'
+          docker exec rabbitmq-stream-client-test /bin/bash -c 'rabbitmqctl status'
+          docker exec rabbitmq-stream-client-test /bin/bash -c 'rabbitmqctl wait --pid 1 --timeout 70'
       - name: Install and configure Poetry
         uses: snok/install-poetry@v1
         with:
           version: 1.4.2
           virtualenvs-create: true
           virtualenvs-in-project: false
-      - name: Enable RabbitMQ Plugins
-        run: docker exec ${{ job.services.rabbitmq-server.id }} rabbitmq-plugins enable rabbitmq_stream rabbitmq_stream_management rabbitmq_amqp1_0
+
       - name: poetry install
         run: poetry install --no-root
       - name: isort check-only

Dockerfile

@@ -0,0 +1,8 @@
+FROM rabbitmq:4-management
+#FROM pivotalrabbitmq/rabbitmq:sha-ae9fbb7bd5982aff099293adbb1edcd616ef806f
+
+
+COPY .ci/conf/rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
+COPY .ci/conf/enabled_plugins /etc/rabbitmq/enabled_plugins
+
+COPY .ci/certs /etc/rabbitmq/certs

Makefile

@@ -0,0 +1,12 @@
+
+all: test build
+
+rabbitmq-server:
+	docker build -t rabbitmq-tls-test .
+	docker run -it --rm --name rabbitmq-tls-test \
+		-p 5672:5672 -p 5671:5671 -p 15672:15672 \
+		-e RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-rabbitmq_stream advertised_host localhost" \
+		rabbitmq-tls-test
+
+help:
+	cat Makefile

examples/getting_started/main.py

@@ -61,7 +61,9 @@ def on_link_closed(self, event: Event) -> None:
 def create_connection() -> Connection:
     connection = Connection("amqps://guest:guest@localhost:5672/")
     # in case of SSL
-    # connection = Connection("amqps://guest:guest@localhost:5671/", ssl_context=SSlConfigurationContext(ca_cert="/Users/dpalaia/projects/rabbitmq-stream-go-client/compose/tls/tls-gen/basic/result/ca_certificate.pem"))
+    # ca_cert = "/Users/dpalaia/projects/rabbitmq-stream-go-client/compose/tls/tls-gen/basic/result/ca_certificate.pem"
+    # connection = Connection("amqps://guest:guest@localhost:5671/",
+    # ssl_context=SSlConfigurationContext(ca_cert=ca_cert))
     connection.dial()
 
     return connection

rabbitmq_amqp_python_client/connection.py

@@ -28,16 +28,18 @@ def dial(self) -> None:
         logger.debug("Establishing a connection to the amqp server")
         if self._conf_ssl_context is not None:
             logger.debug("Enabling SSL")
-            self._ssl_domain = SSLDomain(SSLDomain.MODE_CLIENT)
-            self._ssl_domain.set_trusted_ca_db(self._conf_ssl_context.ca_cert)
+            if self._ssl_domain is not None:
+                self._ssl_domain = SSLDomain(SSLDomain.MODE_CLIENT)
+                self._ssl_domain.set_trusted_ca_db(self._conf_ssl_context.ca_cert)
             # for mutual authentication
             if self._conf_ssl_context.client_cert is not None:
                 logger.debug("Enabling mutual authentication as well")
-                self._ssl_domain.set_credentials(
-                    self._conf_ssl_context.client_cert.client_cert,
-                    self._conf_ssl_context.client_cert.client_key,
-                    self._conf_ssl_context.client_cert.password,
-                )
+                if self._ssl_domain is not None:
+                    self._ssl_domain.set_credentials(
+                        self._conf_ssl_context.client_cert.client_cert,
+                        self._conf_ssl_context.client_cert.client_key,
+                        self._conf_ssl_context.client_cert.password,
+                    )
         self._conn = BlockingConnection(self._addr, ssl_domain=self._ssl_domain)
         self._open()
         logger.debug("Connection to the server established")

tests/conftest.py

@@ -25,7 +25,7 @@ def connection(pytestconfig):
 def connection_ssl(pytestconfig):
     connection = Connection(
         "amqps://guest:guest@localhost:5671/",
-        ssl_context=SSlConfigurationContext(ca_cert="./.ci/certs/ca_certificate.pem"),
+        ssl_context=SSlConfigurationContext(ca_cert=".ci/certs/ca_certificate.pem"),
     )
     connection.dial()
     try: