Allow more valid URIs in assertRabbitMqUri (#874)

* Allow `amqps://` protocol in `assertRabbitMqUri` * Allow trailing slash in `assertRabbitMqUri` * Add more valid URIs to tests
golevelup · Nov 7, 2024 · 7f8404a · 7f8404a
1 parent aa7ef03
commit 7f8404a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/rabbitmq/src/amqp/utils.ts b/packages/rabbitmq/src/amqp/utils.ts
@@ -29,7 +29,7 @@ export function matchesRoutingKey(
 }
 
 const rabbitMQRegex =
-  /^amqp:\/\/(([^:]+):([^@]+)@)?([^:/]+)(:[0-9]+)?(\/[^\/]+)?$/;
+  /^amqps?:\/\/(([^:]+):([^@]+)@)?([^:/]+)(:[0-9]+)?(\/[^\/]*)?$/;
 
 /**
  * Validates a rabbitmq uri

diff --git a/packages/rabbitmq/src/tests/rabbitmq.utils.spec.ts b/packages/rabbitmq/src/tests/rabbitmq.utils.spec.ts
@@ -69,6 +69,9 @@ describe(matchesRoutingKey.name, () => {
         assertRabbitMqUri([
           'amqp://rabbitmq:rabbitmq@localhost:4444',
           'amqp://rabbitmq:rabbitmq@localhost:1234',
+          'amqps://rabbitmq:rabbitmq@localhost:2345',
+          'amqp://rabbitmq:rabbitmq@localhost:3456/',
+          'amqps://rabbitmq:rabbitmq@localhost:4567/',
         ]),
       ).not.toThrowError();
     });