Merge pull request #714 from ELIXIR-NO/fix/712

fix: renamed `LEGA_MQ_QUEUE` to `LEGA_MQ_ROUTING_KEY`

Author: yasinmiran

e2eTests/docker-compose.template.yml

@@ -145,7 +145,7 @@ services:
       - CEGA_MQ_QUEUE=<<INTERCEPTOR_CEGA_MQ_QUEUE>>
       - LEGA_MQ_CONNECTION=<<INTERCEPTOR_MQ_CONNECTION>>
       - LEGA_MQ_EXCHANGE=<<INTERCEPTOR_LEGA_MQ_EXCHANGE>>
-      - LEGA_MQ_QUEUE=<<INTERCEPTOR_LEGA_MQ_QUEUE>>
+      - LEGA_MQ_ROUTING_KEY=<<INTERCEPTOR_LEGA_MQ_ROUTING_KEY>>
       - ENABLE_TLS=<<INTERCEPTOR_ENABLE_TLS>>
       - CA_CERT_PATH=<<INTERCEPTOR_CA_CERT_PATH>>
       - DEBUG=true

e2eTests/env.sh

@@ -96,7 +96,7 @@ export INTERCEPTOR_CEGA_MQ_EXCHANGE=localega
 export INTERCEPTOR_CEGA_MQ_QUEUE=v1.files
 export INTERCEPTOR_MQ_CONNECTION=$MQ_CONN_STR
 export INTERCEPTOR_LEGA_MQ_EXCHANGE=sda
-export INTERCEPTOR_LEGA_MQ_QUEUE=files
+export INTERCEPTOR_LEGA_MQ_ROUTING_KEY=files
 export INTERCEPTOR_ENABLE_TLS=true
 export INTERCEPTOR_CA_CERT_PATH=/certs/CA.cert
 

services/mq-interceptor/README.md

@@ -34,7 +34,7 @@ The MQ-interceptor solves both of these problems by performing the following tas
 
 - MQ-interceptor first connects to a PostgreSQL database server to access a table containing mappings between EGA user IDs and Elixir user IDs.
 - MQ-interceptor then connects to the Local MQ server and continuously consumes messages from the following queues: _inbox_, _verified_, _completed_ and _error_ (these names are hardcoded). The messages are reposted on the Central MQ server to the exchange configured by the `CEGA_MQ_EXCHANGE` environment variable. If the JSON-body of the message contains a "type" field, the new routing key will be based on this field. If not, the routing key will be set to the original queue name prefixed with "files." (hardcoded). For instance, messages read from the "verified" queue on the Local MQ server will be reposted with the routing key "files.verified" on the Central MQ server if they don’t have a "type" field.
-- MQ-interceptor also connects to the Central MQ server and continuously consumes messages from the single queue configured with the `CEGA_MQ_QUEUE` environment variable (usually "v1.files"). These messages are reposted on the Local MQ server to the exchange configured by the `LEGA_MQ_EXCHANGE` variable with a new routing key based on the `LEGA_MQ_QUEUE` variable. (Note that these messages may later be reposted internally on the Local MQ server with new routing keys by a second interceptor service, such as [SDA-interceptor](https://github.com/neicnordic/sensitive-data-archive/blob/main/sda/cmd/intercept/intercept.md)).
+- MQ-interceptor also connects to the Central MQ server and continuously consumes messages from the single queue configured with the `CEGA_MQ_QUEUE` environment variable (usually "v1.files"). These messages are reposted on the Local MQ server to the exchange configured by the `LEGA_MQ_EXCHANGE` variable with a new routing key based on the `LEGA_MQ_ROUTING_KEY` variable. (Note that these messages may later be reposted internally on the Local MQ server with new routing keys by a second interceptor service, such as [SDA-interceptor](https://github.com/neicnordic/sensitive-data-archive/blob/main/sda/cmd/intercept/intercept.md)).
 - Before any message is reposted, the MQ-interceptor checks the JSON-formatted body of the message and replaces the value of the "user" field (if present) based on mappings obtained from the PostgreSQL database. For messages sent from CEGA to LEGA, the EGA user ID in the original message is replaced with an Elixir user ID ([Life Science Login](https://lifescience-ri.eu/ls-login/) ID), and vice versa for the opposite direction.
 - If a message was successfully reposted, an ACK (acknowledgement message) is posted back on the channel that the message was obtained from.
 - If a message could not be successfully converted or reposted, a NACK (negative acknowledgement) is posted back on the channel that the message was obtained from. If the message could not be converted, an error message is also posted to the error channel (`CEGA_MQ_EXCHANGE` with routing key "files.error")
@@ -69,7 +69,7 @@ The MQ-interceptor service can be configured by setting the following environmen
 | CEGA_MQ_QUEUE | The name of the queue to read messages from on the Central MQ server. Suggested value: "v1.files" |
 | LEGA_MQ_CONNECTION |  A connection string for connecting to the Local EGA message server.<br>`amqps://<user>:<password>@<host>:<port>/<vhost>[?parameters]` |
 | LEGA_MQ_EXCHANGE | The name of the exchange to post messages to on the Local MQ server. Suggested value: "sda" |
-| LEGA_MQ_QUEUE | The name of the queue in the Local MQ server that messages coming from Central MQ should be forwarded to. This value is used as the routing key. Suggested value: "files" |
+| LEGA_MQ_ROUTING_KEY | The name of the queue in the Local MQ server that messages coming from Central MQ should be forwarded to. This value is used as the routing key. Suggested value: "files" |
 | POSTGRES_CONNECTION | A connection string for the PostgreSQL database containing the user ID mappings.<br>`postgres://[username]:[password]@[host]:5432/[database]` | 
 | VERIFY_CERT | If this is set to FALSE, the client will not verify the servers’ certificate chain and host name and will thus accept any certificate presented by the server and any host name in that certificate. This should only be set to FALSE for testing purposes. |
 

services/mq-interceptor/main.go

@@ -156,7 +156,7 @@ func forwardDeliveryTo(fromCEGAToLEGA bool, channelFrom MQChannel, channelTo MQC
 	}
 	// Forward all messages from CEGA to a local queue handled by the SDA intercept service
 	if fromCEGAToLEGA {
-		routingKey = os.Getenv("LEGA_MQ_QUEUE")
+		routingKey = os.Getenv("LEGA_MQ_ROUTING_KEY")
 	} else if messageType != nil {
 		routingKey = messageType.(string)
 	}

services/mq-interceptor/main_test.go

@@ -22,7 +22,7 @@ var settings = map[string]string{
 	"POSTGRES_CONNECTION": "postgres://postgres:p0stgres_passw0rd@postgres:5432/postgres?sslmode=disable",
 	"LEGA_MQ_CONNECTION":  "amqps://admin:guest@mq:5671/test",
 	"LEGA_MQ_EXCHANGE":    "sda",
-	"LEGA_MQ_QUEUE":       "files",
+	"LEGA_MQ_ROUTING_KEY": "files",
 	"CEGA_MQ_CONNECTION":  "amqps://test:test@cegamq:5671/lega?cacertfile=/etc/ega/ssl/CA.cert",
 	"CEGA_MQ_EXCHANGE":    "localega.v1",
 	"CEGA_MQ_QUEUE":       "v1.files",