Merge pull request #185 from felipehernandez/beta

2.3

.circleci/config.yml

@@ -3,10 +3,10 @@ version: 2.1
 parameters:
   image-version:
     type: string
-    default: "2.1"
+    default: "2.3"
 
 orbs:
-  python: circleci/python@1.4.0
+  python: circleci/python@1.5.0
 
 executors:
   docker-builder:
@@ -118,9 +118,6 @@ workflows:
             equal: [ main, << pipeline.git.branch >> ]
     jobs:
       - build
-#      - setup-integration-tests:
-#          requires:
-#            - build
       - run-integration-tests:
           matrix:
             parameters:
@@ -146,6 +143,7 @@ workflows:
                 - zookeeper
                 - pubsub
                 - datastore
+                - rabbitmq
           requires:
             - build
       - validate-integration-tests:
@@ -181,6 +179,7 @@ workflows:
                 - zookeeper
                 - pubsub
                 - datastore
+                - rabbitmq
           requires:
             - build
       - validate-integration-tests:
@@ -226,6 +225,7 @@ workflows:
                 - zookeeper
                 - pubsub
                 - datastore
+                - rabbitmq
           requires:
             - build
       - validate-integration-tests:

.circleci/rabbitmq/definitions.json

@@ -0,0 +1,80 @@
+{
+  "queues": [
+    {
+      "name": "test-exchange-single.queue-single-1",
+      "vhost": "test",
+      "durable": true,
+      "auto_delete": false,
+      "arguments": {
+        "x-dead-letter-exchange": "DLX",
+        "x-dead-letter-routing-key": "test-exchange-single.queue-single-1"
+      }
+    },
+    {
+      "name": "test-exchange-multiple.queue-multiple-1",
+      "vhost": "test",
+      "durable": true,
+      "auto_delete": false,
+      "arguments": {
+        "x-dead-letter-exchange": "DLX",
+        "x-dead-letter-routing-key": "test-exchange-multiple.queue-multiple-1"
+      }
+    },
+    {
+      "name": "test-exchange-multiple.queue-multiple-2",
+      "vhost": "test",
+      "durable": true,
+      "auto_delete": false,
+      "arguments": {
+        "x-dead-letter-exchange": "DLX",
+        "x-dead-letter-routing-key": "test-exchange-multiple.queue-multiple-2"
+      }
+    }
+  ],
+  "exchanges": [
+    {
+      "name": "test-exchange-single",
+      "vhost": "test",
+      "type": "topic",
+      "durable": true,
+      "auto_delete": false,
+      "internal": false,
+      "arguments": {}
+    },
+    {
+      "name": "test-exchange-multiple",
+      "vhost": "test",
+      "type": "topic",
+      "durable": true,
+      "auto_delete": false,
+      "internal": false,
+      "arguments": {}
+    }
+  ],
+  "bindings": [
+    {
+      "source": "test-exchange-single",
+      "vhost": "test",
+      "destination": "test-exchange-single.queue-single-1",
+      "destination_type": "queue",
+      "routing_key": "#",
+      "arguments": {}
+    },
+    {
+      "source": "test-exchange-multiple",
+      "vhost": "test",
+      "destination": "test-exchange-multiple.queue-multiple-1",
+      "destination_type": "queue",
+      "routing_key": "#",
+      "arguments": {}
+    },
+    {
+      "source": "test-exchange-multiple",
+      "vhost": "test",
+      "destination": "test-exchange-multiple.queue-multiple-2",
+      "destination_type": "queue",
+      "routing_key": "#",
+      "arguments": {}
+    }
+  ]
+}

.circleci/rabbitmq/rabbitmq.conf

@@ -0,0 +1 @@
+management.load_definitions = /etc/rabbitmq/definitions.json

Dockerfile-integration

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.10-slim
 
 WORKDIR /
 

docker-compose.yaml

@@ -76,6 +76,19 @@ services:
     depends_on:
       - zookeeper
 
+  rabbitmq:
+    image: rabbitmq:3-management
+    environment:
+      RABBITMQ_DEFAULT_PASS: guest
+      RABBITMQ_DEFAULT_USER: guest
+      RABBITMQ_DEFAULT_VHOST: test
+    ports:
+      - 5672:5672
+      - 15672:15672
+    volumes:
+      - ./.circleci/rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
+      - ./.circleci/rabbitmq/definitions.json:/etc/rabbitmq/definitions.json
+
   integration-tests-template:
     build:
       context: .
@@ -201,3 +214,10 @@ services:
     command: -t zookeeper -n 4 --trace
     depends_on:
       - zookeeper
+  integration-tests-rabbitmq:
+    build:
+      context: .
+      dockerfile: Dockerfile-integration
+    command: -t rabbitmq -n 2 --trace
+    depends_on:
+      - rabbitmq

example/test/module/rabbitmq/test_dummy_rabbitmq.yaml

@@ -0,0 +1,43 @@
+name: RabbitMQ Test
+description: Dummy Test for RabbitMQ Stage
+tags:
+  - dummy
+  - rabbitmq
+
+stages:
+  - name: setup
+    action:
+      type: VOID
+    save:
+      host: rabbitmq
+#      host: localhost
+      port: 5672
+      vhost: test
+
+  - name: publish message
+    action:
+      type: RABBITMQ
+      method: PUBLISH
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      exchange: test-exchange-single
+      message: hello world
+    log:
+      - 'Elapsed time: ${elapsed_time}'
+
+  - name: subscribe
+    action:
+      type: RABBITMQ
+      method: SUBSCRIBE
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      queue: test-exchange-single.queue-single-1
+      ack: True
+    log:
+      - 'Queue: ${queue}'
+      - 'Message: ${message}'
+      - 'Ack-ed: ${ack-ed}'
+    assert:
+      - ${message} == 'hello world'

example/test/module/rabbitmq/test_multiple_queues_rabbitmq.yaml

@@ -0,0 +1,59 @@
+name: RabbitMQ multiple queues Test
+description: Test for RabbitMQ Stage publishing to 1 and subscribing to multiple
+tags:
+  - dummy
+  - rabbitmq
+
+stages:
+  - name: setup
+    action:
+      type: VOID
+    save:
+      host: rabbitmq
+#      host: localhost
+      port: 5672
+      vhost: test
+
+  - name: publish message
+    action:
+      type: RABBITMQ
+      method: PUBLISH
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      exchange: test-exchange-multiple
+      message: hello world
+    log:
+      - 'Elapsed time: ${elapsed_time}'
+
+  - name: subscribe 1
+    action:
+      type: RABBITMQ
+      method: SUBSCRIBE
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      queue: test-exchange-multiple.queue-multiple-1
+      ack: True
+    log:
+      - 'Queue: ${queue}'
+      - 'Message: ${message}'
+      - 'Ack-ed: ${ack-ed}'
+    assert:
+      - ${message} == 'hello world'
+
+  - name: subscribe 2
+    action:
+      type: RABBITMQ
+      method: SUBSCRIBE
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      queue: test-exchange-multiple.queue-multiple-2
+      ack: True
+    log:
+      - 'Queue: ${queue}'
+      - 'Message: ${message}'
+      - 'Ack-ed: ${ack-ed}'
+    assert:
+      - ${message} == 'hello world'

folker/module/rabbitmq/__init__.py

@@ -0,0 +1,4 @@
+from folker.load.schemas import ActionSchema
+from folker.module.rabbitmq.schema import RabbitMQActionSchema
+
+ActionSchema.type_schemas['RABBITMQ'] = RabbitMQActionSchema