Merge pull request #8 from stewartjarod/StringValue

Using Serverless CLI or Env variables to set tracing value
alex-murashkin · Sep 13, 2017 · f2fab04 · f2fab04
2 parents 7a00388 + a38d98c
commit f2fab04
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -13,12 +13,13 @@ module.exports = class TracingConfigPlugin {
    processTracing() {
      const service = this.serverless.service;
      const stage = this.options.stage;
-     const providerLevelTracingEnabled = (service.provider.tracing === true);
+     const providerLevelTracingEnabled = (service.provider.tracing === true || service.provider.tracing === 'true');
      return Promise.all(Object.keys(service.functions).map(functionName => {
         return this.toggleTracing(
           service.functions[functionName].name || `${service.service}-${stage}-${functionName}`,
-          (service.functions[functionName].tracing === true)
-          || (providerLevelTracingEnabled && service.functions[functionName].tracing !== false)
+          service.functions[functionName].tracing === true
+          || service.functions[functionName].tracing === 'true'
+          || (providerLevelTracingEnabled && (service.functions[functionName].tracing !== false && service.functions[functionName].tracing !== 'false'))
         );
      }));
   }

diff --git a/test/test.js b/test/test.js
@@ -188,6 +188,35 @@ describe('serverless-plugin-tracing', function() {
     ]);
   });
 
+  it('enables tracing when opt variable is "true"', function() {
+    runPlugin({
+      functions: {
+        healthcheck: {
+          tracing: 'false'
+        },
+        mainFunction: {
+          tracing: 'true'
+        }
+      },
+      provider: {
+        tracing: 'true'
+      }
+    });
+
+    assert.deepEqual(logSpy.getCall(0).args[0], 'Tracing DISABLED for function "myService-test-healthcheck"');
+    assert.deepEqual(logSpy.getCall(1).args[0], 'Tracing ENABLED for function "myService-test-mainFunction"');
+    assert.deepEqual(requestSpy.getCall(1).args, [
+      'Lambda',
+      'updateFunctionConfiguration',
+      {
+        FunctionName: 'myService-test-mainFunction',
+        TracingConfig: {
+          Mode: 'Active'
+        }
+      }
+    ]);
+  });
+
   it('noDeploy: enables tracing when function.tracing=true, but does not execute AWS request', function() {
     runPlugin({
       noDeploy: true,