Merge branch 'master' into fix/check_endpoint_exp

telefonicaid · Jan 20, 2025 · 3f689a4 · 3f689a4
2 parents 9cbeac8 + e5f0442
commit 3f689a4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,2 +1,4 @@
 - Fix: check endpoint expression when execute http command
+- Fix: use config.defaultTransport (from config.js or IOTA_DEFAULT_TRANSPORT env var) instead of magic 'HTTP' at provision device
 - Add: X-Processing-Time response header with processing time (in milliseconds) expended by current HTTP measure (iotagent-node-lib#1650)
+- Add: print also IOTA_CONFIG_RETRIEVAL, IOTA_DEFAULT_KEY, IOTA_DEFAULT_TRANSPORT env var values at iotagent startup
diff --git a/docs/usermanual.md b/docs/usermanual.md
@@ -642,8 +642,8 @@ commands and a topic to receive configuration information. This mechanism can be
 configuration flag, `configRetrieval`.
 
 In case of MQTT to retrieve configuration parameters from the Context Broker, it is required that the device should be
-provisioned using "MQTT" as transport key, at device or group level. By default it will be considered "HTTP" as
-transport if none transport is defined at device or group level.
+provisioned using "MQTT" as transport key, at device or group level. By default it will be considered "MQTT" as
+transport if none transport is defined at device or group level or IOTA_DEFAULT_TRANSPORT env var.
 
 The parameter will be given as follows:
 

diff --git a/lib/bindings/HTTPBinding.js b/lib/bindings/HTTPBinding.js
@@ -506,7 +506,7 @@ function handleError(error, req, res, next) {
 function setPollingAndDefaultTransport(device, group, callback) {
     config.getLogger().debug(context, 'httpbinding.setPollingAndDefaultTransport device %j group %j', device, group);
     if (!device.transport) {
-        device.transport = group && group.transport ? group.transport : 'HTTP';
+        device.transport = group && group.transport ? group.transport : config.getConfig().defaultTransport;
     }
 
     if (device.transport === 'HTTP') {

diff --git a/lib/configService.js b/lib/configService.js
@@ -85,7 +85,10 @@ function processEnvironmentVariables() {
         'IOTA_HTTP_PORT',
         'IOTA_HTTP_TIMEOUT',
         'IOTA_HTTP_KEY',
-        'IOTA_HTTP_CERT'
+        'IOTA_HTTP_CERT',
+        'IOTA_CONFIG_RETRIEVAL',
+        'IOTA_DEFAULT_KEY',
+        'IOTA_DEFAULT_TRANSPORT'
     ];
     const mqttVariables = [
         'IOTA_MQTT_PROTOCOL',
@@ -229,7 +232,7 @@ function processEnvironmentVariables() {
         config.mqtt.clientId = process.env.IOTA_MQTT_CLIENT_ID;
     }
 
-    if (process.env.IOTA_MQTT_DISABLED && process.env.IOTA_MQTT_DISABLED.trim().toLowerCase() === 'true'){
+    if (process.env.IOTA_MQTT_DISABLED && process.env.IOTA_MQTT_DISABLED.trim().toLowerCase() === 'true') {
         config.mqtt.disabled = true;
     }
 
@@ -274,7 +277,7 @@ function processEnvironmentVariables() {
         config.amqp.retryTime = process.env.IOTA_AMQP_RETRY_TIME;
     }
 
-    if (process.env.IOTA_AMQP_DISABLED && process.env.IOTA_AMQP_DISABLED.trim().toLowerCase() === 'true'){
+    if (process.env.IOTA_AMQP_DISABLED && process.env.IOTA_AMQP_DISABLED.trim().toLowerCase() === 'true') {
         config.amqp.disabled = true;
     }
 

diff --git a/test/unit/ngsiv2/config-test.js b/test/unit/ngsiv2/config-test.js
@@ -69,6 +69,6 @@ config.iota = {
 };
 
 config.defaultKey = '1234';
-config.defaultTransport = 'MQTT';
+config.defaultTransport = 'HTTP';
 
 module.exports = config;