v2.4 (#221)

* Main (#186) Chore(main): Align main and beta branches * chore(deps): update dependency grpcio to v1.46.3 (#187) Co-authored-by: Renovate Bot <bot@renovateapp.com> * chore(deps): update dependency grpcio-tools to v1.46.3 (#188) Co-authored-by: Renovate Bot <bot@renovateapp.com> * fix(rabbitmq): Integration tests rabbitmq service startup (#194) * chore(deps): update dependency requests to v2.28.0 (#193) Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: felipehernandez <felherlla@gmail.com> * chore(deps): update dependency google-cloud-pubsub to v1.7.2 (#192) Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: felipehernandez <felherlla@gmail.com> * chore(deps): update dependency pylint to v2.14.1 (#191) Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: felipehernandez <felherlla@gmail.com> * chore(deps): update dependency google-cloud-datastore to v2.7.0 (#189) Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: felipehernandez <felherlla@gmail.com> * Poc/retry failed builds (#195) * fix(rabbitmq): Integration tests rabbitmq service startup * chore(cd/ci): retry failed integration tests * chore(deps): update dependency marshmallow to v3.16.0 (#190) Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: felipehernandez <felherlla@gmail.com> * chore(deps): update dependency pylint to v2.14.2 * chore(deps): update dependency certifi to v2022.6.15 * chore(deps): update dependency pylint to v2.14.3 (#199) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency google-cloud-datastore to v2.7.1 (#198) Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: felipehernandez <felherlla@gmail.com> * chore(deps): update dependency grpcio to v1.47.0 * chore(deps): update dependency grpcio-tools to v1.47.0 * chore(deps): update dependency chardet to v5 (#203) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency marshmallow to v3.17.0 (#204) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency pytest-mock to v3.8.1 (#202) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency pylint to v2.14.4 (#205) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency requests to v2.28.1 * chore(deps): update dependency pytest-mock to v3.8.2 * chore(deps): update dependency pika to v1.3.0 * chore(deps): update dependency google-cloud-datastore to v2.7.2 * feat(rest): Add basic authorization option * chore(deps): update dependency google-cloud-datastore to v2.8.0 * chore(deps): update dependency pylint to v2.14.5 (#212) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update python orb to v2 (#218) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency idna to v3 (#217) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat (rabbitmq): clear and count (#219) * chore(deps): update dependency google-api-python-client to v2 (#214) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency click to v8 (#213) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: felipehernandez <felherlla@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renovate Bot <bot@renovateapp.com>
felipehernandez · Jul 28, 2022 · 53aa63c · 53aa63c
1 parent 93acd70
commit 53aa63c
Show file tree

Hide file tree

Showing 13 changed files with 532 additions and 126 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,10 +3,10 @@ version: 2.1
 parameters:
   image-version:
     type: string
-    default: "2.3"
+    default: "2.4"
 
 orbs:
-  python: circleci/python@1.5.0
+  python: circleci/python@2.0.3
 
 executors:
   docker-builder:
@@ -51,7 +51,11 @@ jobs:
     steps:
       - attach_workspace:
           at: .
-      - run: eval docker-compose run integration-tests-<<parameters.tests>>
+      - run: |
+          for i in $(seq 1 3); do
+            eval docker-compose run integration-tests-<<parameters.tests>> && s=0 && break || s=$? && sleep 10;
+          done;
+          (exit $s)
 
   validate-integration-tests:
     executor: integration-test-runner
@@ -240,4 +244,3 @@ workflows:
           image-label: latest
           requires:
             - build-docker-image
-
diff --git a/.circleci/rabbitmq/definitions.json b/.circleci/rabbitmq/definitions.json
@@ -1,80 +1,137 @@
 {
-  "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": {}
-    }
-  ]
+    "rabbit_version": "3.10.5",
+    "rabbitmq_version": "3.10.5",
+    "product_name": "RabbitMQ",
+    "product_version": "3.10.5",
+    "users":
+    [
+        {
+            "name": "guest",
+            "password": "guest",
+            "tags":
+            [
+                "administrator"
+            ],
+            "limits":
+            {}
+        }
+    ],
+    "vhosts":
+    [
+        {
+            "name": "test"
+        }
+    ],
+    "permissions":
+    [
+        {
+            "user": "guest",
+            "vhost": "test",
+            "configure": ".*",
+            "write": ".*",
+            "read": ".*"
+        }
+    ],
+    "topic_permissions":
+    [],
+    "parameters":
+    [],
+    "global_parameters":
+    [
+        {
+            "name": "internal_cluster_id",
+            "value": "rabbitmq-cluster-id-sFl0oRnndIMF4aTpl3nc5g"
+        }
+    ],
+    "policies":
+    [],
+    "queues":
+    [
+        {
+            "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"
+            }
+        },
+        {
+            "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-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"
+            }
+        }
+    ],
+    "exchanges":
+    [
+        {
+            "name": "test-exchange-multiple",
+            "vhost": "test",
+            "type": "topic",
+            "durable": true,
+            "auto_delete": false,
+            "internal": false,
+            "arguments":
+            {}
+        },
+        {
+            "name": "test-exchange-single",
+            "vhost": "test",
+            "type": "topic",
+            "durable": true,
+            "auto_delete": false,
+            "internal": false,
+            "arguments":
+            {}
+        }
+    ],
+    "bindings":
+    [
+        {
+            "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":
+            {}
+        },
+        {
+            "source": "test-exchange-single",
+            "vhost": "test",
+            "destination": "test-exchange-single.queue-single-1",
+            "destination_type": "queue",
+            "routing_key": "#",
+            "arguments":
+            {}
+        }
+    ]
 }
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -78,10 +78,6 @@ services:
 
   rabbitmq:
     image: rabbitmq:3-management
-    environment:
-      RABBITMQ_DEFAULT_PASS: guest
-      RABBITMQ_DEFAULT_USER: guest
-      RABBITMQ_DEFAULT_VHOST: test
     ports:
       - 5672:5672
       - 15672:15672
@@ -218,6 +214,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-integration
-    command: -t rabbitmq -n 2 --trace
+    command: -t rabbitmq -n 4 --trace
     depends_on:
       - rabbitmq
diff --git a/example/test/module/rabbitmq/test_dummy_rabbitmq.yaml b/example/test/module/rabbitmq/test_dummy_rabbitmq.yaml
@@ -13,6 +13,18 @@ stages:
 #      host: localhost
       port: 5672
       vhost: test
+      queue: test-exchange-single.queue-single-1
+
+  - name: clear messages
+    action:
+      type: RABBITMQ
+      method: CLEAR
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      queue: ${queue}
+    log:
+      - 'Clear: ${result}'
 
   - name: publish message
     action:
@@ -33,7 +45,7 @@ stages:
       host: ${host}
       port: ${port}
       vhost: ${vhost}
-      queue: test-exchange-single.queue-single-1
+      queue: ${queue}
       ack: True
     log:
       - 'Queue: ${queue}'

diff --git a/example/test/module/rabbitmq/test_dummy_rabbitmq_clear.yaml b/example/test/module/rabbitmq/test_dummy_rabbitmq_clear.yaml
@@ -0,0 +1,94 @@
+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
+      queue: test-exchange-single.queue-single-1
+
+  - name: clear messages
+    action:
+      type: RABBITMQ
+      method: CLEAR
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      queue: ${queue}
+    log:
+      - 'Clear: ${result}'
+
+  - name: count messages
+    action:
+      type: RABBITMQ
+      method: COUNT
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      queue: ${queue}
+    log:
+      - 'Number of messages: ${result}'
+    assert:
+      - ${result} == 0
+
+  - 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: count messages
+    action:
+      type: RABBITMQ
+      method: COUNT
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      queue: ${queue}
+    log:
+      - 'Number of messages: ${result}'
+    assert:
+      - ${result} == 1
+
+  - name: clear messages
+    action:
+      type: RABBITMQ
+      method: CLEAR
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      queue: ${queue}
+    log:
+      - 'Clear: ${result}'
+      - 'Result: ${result}'
+      - 'Deleted messages: ${num_messages}'
+    assert:
+      - ${result} == True
+      - ${num_messages} == 1
+
+  - name: count messages
+    action:
+      type: RABBITMQ
+      method: COUNT
+      host: ${host}
+      port: ${port}
+      vhost: ${vhost}
+      queue: ${queue}
+    log:
+      - 'Number of messages: ${result}'
+    assert:
+      - ${result} == 0