Skip to content

fix: update links to route to regional console #535

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 2 commits into from
Feb 6, 2025
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
5 changes: 5 additions & 0 deletions .changeset/gorgeous-gorillas-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'twilio-run': patch
---
Display access visibility for public assets and functions on deploy.
Update links to route to regional console
2 changes: 1 addition & 1 deletion packages/twilio-run/src/commands/promote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export async function handler(
config.targetEnvironment || 'production'
}`
);
printActivateResult(result, config.outputFormat);
printActivateResult(result, config.outputFormat, config.region);
} catch (err) {
handleError(err, spinner);
}
Expand Down
9 changes: 7 additions & 2 deletions packages/twilio-run/src/printers/activate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ export function printActivateConfig(

export function printActivateResult(
result: ActivateResult,
outputFormat: OutputFormat
outputFormat: OutputFormat,
region = 'us1'
) {
if (outputFormat === 'json') {
writeJSONOutput(result);
Expand All @@ -36,7 +37,11 @@ export function printActivateResult(

const twilioConsoleLogsLink = terminalLink(
'Open the Twilio Console',
getTwilioConsoleDeploymentUrl(result.serviceSid, result.environmentSid),
getTwilioConsoleDeploymentUrl(
result.serviceSid,
result.environmentSid,
region
),
{
fallback: (text: string, url: string) => chalk.dim(url),
}
Expand Down
18 changes: 11 additions & 7 deletions packages/twilio-run/src/printers/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ function plainPrintDeployedResources(
runtime: result.runtime,
viewLiveLogs: getTwilioConsoleDeploymentUrl(
result.serviceSid,
result.environmentSid
result.environmentSid,
config.region
),
};

Expand Down Expand Up @@ -132,7 +133,11 @@ function prettyPrintDeployedResources(
) {
const twilioConsoleLogsLink = terminalLink(
'Open the Twilio Console',
getTwilioConsoleDeploymentUrl(result.serviceSid, result.environmentSid),
getTwilioConsoleDeploymentUrl(
result.serviceSid,
result.environmentSid,
config.region
),
{
fallback: (text: string, url: string) => chalk.dim(url),
}
Expand All @@ -159,8 +164,7 @@ function prettyPrintDeployedResources(
const functionMessage = result.functionResources
.sort(sortByAccess)
.map((fn) => {
const accessPrefix =
chalk`{bold [${fn.access}]} `;
const accessPrefix = chalk`{bold [${fn.access}]} `;
return chalk` ${accessPrefix}{dim https://${result.domain}}${fn.path}`;
})
.join('\n');
Expand All @@ -172,8 +176,7 @@ function prettyPrintDeployedResources(
const assetMessage = result.assetResources
.sort(sortByAccess)
.map((asset) => {
const accessPrefix =
chalk`{bold [${asset.access}]} `;
const accessPrefix = chalk`{bold [${asset.access}]} `;
const accessUrl =
asset.access === 'private'
? chalk`{dim Runtime.getAssets()['}${asset.path}{dim ']}`
Expand Down Expand Up @@ -223,7 +226,8 @@ export function printJsonDeployedResources(
runtime: result.runtime,
viewLiveLogs: getTwilioConsoleDeploymentUrl(
result.serviceSid,
result.environmentSid
result.environmentSid,
config.region
),
functions: result.functionResources.sort(sortByAccess).map(formatResource),
assets: result.assetResources.sort(sortByAccess).map(formatResource),
Expand Down
7 changes: 4 additions & 3 deletions packages/twilio-run/src/printers/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ export const supportsEmoji =

export function getTwilioConsoleDeploymentUrl(
serviceSid: string,
environmentSid: string
environmentSid: string,
region = 'us1'
) {
return `https://www.twilio.com/console/functions/editor/${serviceSid}/environment/${environmentSid}`;
return `https://console.twilio.com/${region}/develop/functions/editor/${serviceSid}/environment/${environmentSid}`;
}

export function printObjectWithoutHeaders(obj: {}): string {
Expand All @@ -27,7 +28,7 @@ export function terminalLink(name: string, link: string): string {
export function borderLeft(text: string, color: string): string {
return text
.split('\n')
.map(str => `${chalk.keyword(color)('│')} ${str}`)
.map((str) => `${chalk.keyword(color)('│')} ${str}`)
.join('\n');
}

Expand Down