feat: add exchange config var (#114)

* feat: add a queue for processing retry messages * feat: update params and config * feat: fix condition * feat: update queue var name * feat: add exchange config var * feat: fix linter error * fix: config test
screwdriver-cd · Jun 28, 2021 · df03ed0 · df03ed0
1 parent 42ac99b
commit df03ed0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/config/custom-environment-variables.yaml b/config/custom-environment-variables.yaml
@@ -328,7 +328,7 @@ ecosystem:
 rabbitmq:
     # Protocol for rabbitmq server, use amqps for ssl
     protocol: RABBITMQ_PROTOCOL
-    # User to pull from rabbitmq
+    # User to push and pull to anf from rabbitmq 
     username: RABBITMQ_USERNAME
     # Password to connect to rabbitmq cluster
     password: RABBITMQ_PASSWORD
@@ -350,6 +350,8 @@ rabbitmq:
     retryQueue: RABBITMQ_RETRYQUEUE
     # retry queue enable/disable flag
     retryQueueEnabled: RABBITMQ_RETRYQUEUE_ENABLED
+    # Exchange / router name for rabbitmq
+    exchange: RABBITMQ_EXCHANGE
 httpd:
   # Port to listen on
   port: PORT

diff --git a/config/default.yaml b/config/default.yaml
@@ -238,6 +238,8 @@ rabbitmq:
     retryQueue: sdRetryQueue
     # retry queue enable/disable flag
     retryQueueEnabled: true
+    # Exchange / router name for rabbitmq
+    exchange: build
 httpd:
     # Port to listen on
     port: 80

diff --git a/lib/config.js b/lib/config.js
@@ -6,8 +6,10 @@ const rabbitmqConfig = config.get('rabbitmq');
 const ecosystemConfig = config.get('ecosystem');
 
 const { strategy, path } = ecosystemConfig.cache;
-const { protocol, username, password, host, port, vhost, connectOptions,
-    queue, prefetchCount, messageReprocessLimit, retryQueue, retryQueueEnabled } = rabbitmqConfig;
+const { protocol, username, password, host,
+    port, vhost, connectOptions,
+    queue, prefetchCount, messageReprocessLimit,
+    retryQueue, retryQueueEnabled, exchange } = rabbitmqConfig;
 const amqpURI = `${protocol}://${username}:${password}@${host}:${port}${vhost}`;
 
 /**
@@ -26,7 +28,8 @@ function getConfig() {
         cacheStrategy: strategy,
         cachePath: path,
         retryQueue,
-        retryQueueEnabled
+        retryQueueEnabled,
+        exchange
     };
 }
 

diff --git a/test/config.test.js b/test/config.test.js
@@ -26,7 +26,8 @@ describe('config test', () => {
             prefetchCount: 20,
             messageReprocessLimit: 3,
             retryQueue: 'sdRetryQueue',
-            retryQueueEnabled: true
+            retryQueueEnabled: true,
+            exchange: 'build'
         }
     };
 
@@ -48,7 +49,8 @@ describe('config test', () => {
             cacheStrategy: configDef.ecosystem.cache.strategy,
             cachePath: configDef.ecosystem.cache.path,
             retryQueue: configDef.rabbitmq.retryQueue,
-            retryQueueEnabled: configDef.rabbitmq.retryQueueEnabled
+            retryQueueEnabled: configDef.rabbitmq.retryQueueEnabled,
+            exchange: configDef.rabbitmq.exchange
         });
     });
 });