feat(pub): fix tests and remove yargs-debug.js

adobe · Sep 17, 2019 · 6fd1e42 · 6fd1e42
1 parent 9ecf22a
commit 6fd1e42
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/src/publish.js b/src/publish.js
@@ -14,7 +14,6 @@
 
 const yargsOpenwhisk = require('./yargs-openwhisk.js');
 const yargsFastly = require('./yargs-fastly.js');
-const yargsDebug = require('./yargs-debug.js');
 const yargsGithub = require('./yargs-github.js');
 const { makeLogger } = require('./log-common.js');
 
@@ -30,7 +29,6 @@ module.exports = function strain() {
     builder: (yargs) => {
       yargsOpenwhisk(yargs);
       yargsFastly(yargs);
-      yargsDebug(yargs);
       yargsGithub(yargs);
       yargs
         .option('dry-run', {
@@ -81,6 +79,11 @@ module.exports = function strain() {
           choices: ['soft', 'hard', 'skip'],
           default: 'soft',
         })
+        .option('debug-key', {
+          alias: 'debugKey',
+          describe: 'The key to enable the X-Debug header (default is the fastly service id)',
+          type: 'string',
+        })
         .conflicts('only', 'exclude')
         .demandOption(
           'fastly-auth',

diff --git a/src/yargs-debug.js b/src/yargs-debug.js
diff --git a/test/testPublishCli.js b/test/testPublishCli.js
@@ -292,4 +292,19 @@ describe('hlx publish', () => {
 
     sinon.assert.fail('hlx publish should fail with empty wsk-auth');
   });
+
+  it('hlx publish handles debug-key', () => {
+    new CLI()
+      .withCommandExecutor('publish', mockPublish)
+      .run(['publish',
+        '--wsk-auth', 'secret-key',
+        '--wsk-namespace', 'hlx',
+        '--fastly-auth', 'secret-key',
+        '--fastly-namespace', 'hlx',
+        '--dispatch-version', 'ci1',
+        '--debug-key', 'something',
+      ]);
+
+    sinon.assert.calledWith(mockPublish.withDebugKey, 'something');
+  });
 });