Skip to content
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.

Sign up for GitHub

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

Jump to bottom

CLI: Fix open browser handling in interactive CLI #10461

Merged
merged 2 commits into from
Jan 6, 2022
Merged

CLI: Fix open browser handling in interactive CLI #10461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a99a94
refactor(CLI): Upgrade to v7 of `open` library
medikoo Jan 6, 2022
29dc1c9
fix(CLI): Fix handling of provider URL handling
medikoo Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/cli/interactive-setup/aws-credentials.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ const steps = {
},
handleProviderCreation: async ({ configuration: { org: orgName }, stepHistory }) => {
const providersUrl = `https://app.serverless.com/${orgName}/settings/providers?source=cli&providerId=new&provider=aws`;
openBrowser(chalk.bold.white(providersUrl));
openBrowser(providersUrl);
legacy.write('To learn more about providers, visit: http://slss.io/add-providers-dashboard\n');
log.notice('To learn more about providers, visit: http://slss.io/add-providers-dashboard');
legacy.write('\nWaiting for creation of AWS Access Role provider...\n');
Expand Down
173 changes: 0 additions & 173 deletions lib/utils/open.js
View file
Open in desktop

This file was deleted.

21 changes: 11 additions & 10 deletions lib/utils/openBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/* eslint-disable no-console */

const opn = require('./open');
const open = require('open');
const chalk = require('chalk');
const isDockerContainer = require('is-docker');
const { legacy, log, style } = require('@serverless/utils/log');
Expand All @@ -17,13 +17,14 @@ module.exports = function openBrowser(url) {
let browser = process.env.BROWSER;
if (browser === 'none' || isDockerContainer()) return;
if (process.platform === 'darwin' && browser === 'open') browser = undefined;
const options = { wait: false, app: browser };
opn(url, options).catch((err) => {
if (process.env.SLS_DEBUG) {
legacy.write(
`Serverless: ${chalk.red(`Opening of browser window errored with ${err.stack}`)}\n`
);
}
log.info(`Opening of browser window errored with ${err.stack}`);
});
open(url).then((subprocess) =>
subprocess.on('error', (err) => {
if (process.env.SLS_DEBUG) {
legacy.write(
`Serverless: ${chalk.red(`Opening of browser window errored with ${err.stack}`)}\n`
);
}
log.info(`Opening of browser window errored with ${err.stack}`);
})
);
};
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"ncjsm": "^4.2.0",
"node-fetch": "^2.6.6",
"object-hash": "^2.2.0",
"open": "^7.4.2",
"path2": "^0.1.0",
"process-utils": "^4.0.0",
"promise-queue": "^2.2.5",
Expand Down
13 changes: 3 additions & 10 deletions test/unit/lib/cli/interactive-setup/aws-credentials.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const proxyquire = require('proxyquire');
const overrideEnv = require('process-utils/override-env');
const overrideStdoutWrite = require('process-utils/override-stdout-write');
const requireUncached = require('ncjsm/require-uncached');
const chalk = require('chalk');
const { StepHistory } = require('@serverless/utils/telemetry');

const { expect } = chai;
Expand Down Expand Up @@ -485,9 +484,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {

expect(stdoutData).to.include('AWS Access Role provider was successfully created');
expect(mockedOpenBrowser).to.have.been.calledWith(
chalk.bold.white(
'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
)
'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
);
expect(mockedDisconnect).to.have.been.called;
expect(mockedCreateProviderLink).not.to.have.been.called;
Expand Down Expand Up @@ -562,9 +559,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {

expect(stdoutData).to.include('AWS Access Role provider was successfully created');
expect(mockedOpenBrowser).to.have.been.calledWith(
chalk.bold.white(
'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
)
'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
);
expect(mockedDisconnect).to.have.been.called;
expect(mockedCreateProviderLink).to.have.been.calledWith(
Expand Down Expand Up @@ -618,9 +613,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {

expect(stdoutData).to.include('Serverless Dashboard is currently unavailable');
expect(mockedOpenBrowser).to.have.been.calledWith(
chalk.bold.white(
'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
)
'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
);
expect(context.stepHistory.valuesMap()).to.deep.equal(
new Map([['credentialsSetupChoice', '_create_provider_']])
Expand Down