fix(deploy): fix conflicting-service error message

Author: dkundel

src/commands/deploy.ts

@@ -22,7 +22,11 @@ import {
 import { EnvironmentVariablesWithAuth } from '../types/generic';
 import { fileExists, readFile } from '../utils/fs';
 import { CliInfo } from './types';
-import { deprecateProjectName, getFullCommand } from './utils';
+import {
+  constructCommandName,
+  deprecateProjectName,
+  getFullCommand,
+} from './utils';
 
 const log = debug('twilio-run:deploy');
 
@@ -147,18 +151,24 @@ function handleError(
   log('%O', err);
   spinner.fail('Failed Deployment');
   if (err.name === 'conflicting-servicename') {
+    const fullCommand = getFullCommand(flags);
     const messageBody = stripIndent`
       Here are a few ways to solve this problem:
       
       - Rename your project in the package.json "name" property
       - Pass an explicit name to your deployment
-        > ${flags.$0} deploy -n my-new-service-name
+        > ${constructCommandName(fullCommand, 'deploy', [
+          '-n',
+          'my-new-service-name',
+        ])}
       - Deploy to the existing service with the name "${(err as any)[
         'serviceName'
       ] || config.serviceName}"
-        > ${flags.$0} deploy --override-existing-project
+        > ${constructCommandName(fullCommand, 'deploy', [
+          '--override-existing-project',
+        ])}
       - Run deployment in force mode
-        > ${flags.$0} deploy --force
+        > ${constructCommandName(fullCommand, 'deploy', ['--force'])} 
     `;
     console.error(errorMessage(err.message, messageBody));
   } else if (err.name === 'HTTPError') {

src/commands/utils.ts

@@ -5,6 +5,21 @@ import { Arguments } from 'yargs';
 export const deprecateProjectName = util.deprecate(() => {},
 '--project-name is deprecated. Please use --service-name instead. If both have been passed --service-name will be preferred.');
 
+export function constructCommandName(
+  fullCommand: string,
+  action: string,
+  args: string[] = []
+) {
+  let baseCommand = '';
+  if (fullCommand.includes(':')) {
+    baseCommand = fullCommand.substr(0, fullCommand.indexOf(':') + 1);
+  } else {
+    baseCommand = fullCommand.split(' ')[0] + ' ';
+  }
+
+  return `${baseCommand}${action} ${args.join(' ')}`;
+}
+
 export function getFullCommand(flags: Arguments<{}>): string {
   let baseCommand = flags.$0;
   baseCommand = basename(baseCommand);