Skip to content

feat: add link to Twilio Console logs to deploy/activate #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"normalize.css": "^8.0.1",
"ora": "^3.3.1",
"pkg-install": "^1.0.0",
"terminal-link": "^1.3.0",
"title": "^3.4.1",
"twilio": "^3.33.0",
"type-fest": "^0.6.0",
Expand Down
5 changes: 2 additions & 3 deletions src/commands/activate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ import { Ora } from 'ora';
import { Argv } from 'yargs';
import { checkConfigForCredentials } from '../checks/check-credentials';
import { ActivateCliFlags, getConfigFromFlags } from '../config/activate';
import { printActivateConfig } from '../printers/activate';
import { printActivateConfig, printActivateResult } from '../printers/activate';
import {
getDebugFunction,
getOraSpinner,
logger,
setLogLevelByName,
} from '../utils/logger';
import { writeOutput } from '../utils/output';
import { ExternalCliOptions, sharedCliOptions } from './shared';
import { CliInfo } from './types';

Expand Down Expand Up @@ -68,7 +67,7 @@ export async function handler(
spinner.succeed(
`Activated new build ${details} on ${config.targetEnvironment}`
);
writeOutput(result.domain);
printActivateResult(result);
} catch (err) {
handleError(err, spinner);
}
Expand Down
27 changes: 25 additions & 2 deletions src/printers/activate.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { ActivateConfig } from '@twilio-labs/serverless-api';
import { ActivateConfig, ActivateResult } from '@twilio-labs/serverless-api';
import { stripIndent } from 'common-tags';
import { logger } from '../utils/logger';
import { redactPartOfString } from './utils';
import { writeOutput } from '../utils/output';
import { getTwilioConsoleDeploymentUrl, redactPartOfString } from './utils';
import chalk = require('chalk');
import terminalLink = require('terminal-link');

export function printActivateConfig(config: ActivateConfig) {
const message = chalk`
Expand All @@ -11,3 +13,24 @@ export function printActivateConfig(config: ActivateConfig) {
`;
logger.info(stripIndent(message) + '\n');
}

export function printActivateResult(result: ActivateResult) {
logger.info(chalk.cyan.bold('\nActive build available at:'));
writeOutput(result.domain);

const twilioConsoleLogsLink = terminalLink(
'Open the Twilio Console',
getTwilioConsoleDeploymentUrl(result.serviceSid, result.environmentSid),
{
fallback: (text: string, url: string) => chalk.dim(url),
}
);

logger.info(
'\n' +
stripIndent(chalk`
{cyan.bold View Live Logs:}
${twilioConsoleLogsLink}
`)
);
}
16 changes: 16 additions & 0 deletions src/printers/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ import {
import chalk from 'chalk';
import columnify from 'columnify';
import { stripIndent } from 'common-tags';
import terminalLink from 'terminal-link';
import { MergeExclusive } from 'type-fest';
import { logger } from '../utils/logger';
import { writeOutput } from '../utils/output';
import {
getTwilioConsoleDeploymentUrl,
printObjectWithoutHeaders,
redactPartOfString,
shouldPrettyPrint,
Expand Down Expand Up @@ -58,6 +60,10 @@ function plainPrintDeployedResources(
environmentSuffix: config.functionsEnv,
environmentSid: result.environmentSid,
buildSid: result.buildSid,
viewLiveLogs: getTwilioConsoleDeploymentUrl(
result.serviceSid,
result.environmentSid
),
};

const output = `
Expand Down Expand Up @@ -110,6 +116,14 @@ function prettyPrintDeployedResources(
config: DeployLocalProjectConfig,
result: DeployResult
) {
const twilioConsoleLogsLink = terminalLink(
'Open the Twilio Console',
getTwilioConsoleDeploymentUrl(result.serviceSid, result.environmentSid),
{
fallback: (text: string, url: string) => chalk.dim(url),
}
);

writeOutput(
chalk`
{bold.cyan.underline Deployment Details}
Expand All @@ -120,6 +134,8 @@ function prettyPrintDeployedResources(
${config.functionsEnv} {dim (${result.environmentSid})}
{bold.cyan Build SID:}
${result.buildSid}
{bold.cyan View Live Logs:}
${twilioConsoleLogsLink}
`.trim()
);

Expand Down
7 changes: 7 additions & 0 deletions src/printers/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ export const shouldPrettyPrint = process.stdout.isTTY && !isCi;
export const supportsEmoji =
process.platform !== 'win32' || isCi || process.env.TERM === 'xterm-256color';

export function getTwilioConsoleDeploymentUrl(
serviceSid: string,
environmentSid: string
) {
return `https://www.twilio.com/console/assets/api/${serviceSid}/environment/${environmentSid}`;
}

export function printObjectWithoutHeaders(obj: {}): string {
return columnify(obj, { showHeaders: false });
}
Expand Down