Merge branch 'master' into StringValue

alex-murashkin · Sep 13, 2017 · a38d98c · a38d98c
2 parents 44d5750 + 7a00388
commit a38d98c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -26,7 +26,7 @@ module.exports = class TracingConfigPlugin {
 
   toggleTracing(functionName, isEnabled) {
     this.serverless.cli.log(`Tracing ${isEnabled ? 'ENABLED' : 'DISABLED'} for function "${functionName}"`);
-    return this.aws.request('Lambda', 'updateFunctionConfiguration', {
+    return this.options.noDeploy ? Promise.resolve(void 'noop') : this.aws.request('Lambda', 'updateFunctionConfiguration', {
       FunctionName: functionName,
       TracingConfig: {
         Mode: isEnabled === true ? 'Active' : 'PassThrough'

diff --git a/test/test.js b/test/test.js
@@ -36,7 +36,7 @@ describe('serverless-plugin-tracing', function() {
       params.provider);
 
     serverlessInstance.service.functions = params.functions;
-    const options = { stage: 'test' };
+    const options = { stage: 'test', noDeploy: params.noDeploy };
     const plugin = new Plugin(serverlessInstance, options);
     plugin.hooks['after:deploy:deploy'].call(plugin);
     return plugin;
@@ -216,4 +216,20 @@ describe('serverless-plugin-tracing', function() {
       }
     ]);
   });
+
+  it('noDeploy: enables tracing when function.tracing=true, but does not execute AWS request', function() {
+    runPlugin({
+      noDeploy: true,
+      functions: {
+        mainFunction: {
+          tracing: true
+        }
+      },
+      provider: {
+      }
+    });
+
+    assert.deepEqual(logSpy.getCall(0).args[0], 'Tracing ENABLED for function "myService-test-mainFunction"');
+    assert.isNull(requestSpy.getCall(0), 'no `aws.request`');
+  });
 });