Skip to content

Commit

Permalink
Require plugin IDs to be valid
Browse files Browse the repository at this point in the history
  • Loading branch information
freben committed Mar 18, 2020
1 parent 4d7a93c commit 72bbbfd
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 4 deletions.
12 changes: 10 additions & 2 deletions packages/cli/src/commands/createPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,16 @@ const createPlugin = async () => {
type: 'input',
name: 'id',
message: chalk.blue('Enter an ID for the plugin [required]'),
validate: (value: any) =>
value ? true : chalk.red('Please enter an ID for the plugin'),
validate: (value: any) => {
if (!value) {
return chalk.red('Please enter an ID for the plugin');
} else if (!/^[a-z0-9]+(-[a-z0-9]+)*$/.test(value)) {
return chalk.red(
'Plugin IDs must be kebab-cased and contain only letters, digits, and dashes.',
);
}
return true;
},
},
];
const answers: Answers = await inquirer.prompt(questions);
Expand Down
23 changes: 21 additions & 2 deletions scripts/cli-e2e-test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2020 Spotify AB
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

const { resolve: resolvePath } = require('path');
const childProcess = require('child_process');
const { spawn } = childProcess;
Expand Down Expand Up @@ -68,7 +84,11 @@ function spawnPiped(cmd, options) {
};
}

const child = spawn(cmd[0], cmd.slice(1), { stdio: 'pipe', shell: true, ...options });
const child = spawn(cmd[0], cmd.slice(1), {
stdio: 'pipe',
shell: true,
...options,
});
child.on('error', handleError);
child.on('exit', code => {
if (code) {
Expand Down Expand Up @@ -99,7 +119,6 @@ async function waitForPageWithText(
try {
await new Promise(resolve => setTimeout(resolve, intervalMs));
await browser.visit(path);

break;
} catch (error) {
attempts++;
Expand Down

0 comments on commit 72bbbfd

Please sign in to comment.