mirror of
https://github.com/serverless/serverless.git
synced 2026-01-25 15:07:39 +00:00
ProjectCreate: Add deprecated warning
This commit is contained in:
ac360
parent
66816804c8
commit
e04c03ae34
@ -55,15 +55,19 @@ module.exports = function(SPlugin, serverlessPath) {
|
||||
{
|
||||
option: 'name',
|
||||
shortcut: 'n',
|
||||
description: 'Name of your new Serverless project'
|
||||
description: 'A new name for this Serverless project'
|
||||
}, {
|
||||
option: 'domain',
|
||||
shortcut: 'd',
|
||||
description: 'Domain of your new Serverless project'
|
||||
description: 'Domain of your Serverless project'
|
||||
}, {
|
||||
option: 'stage',
|
||||
shortcut: 's',
|
||||
description: 'Initial project stage'
|
||||
}, {
|
||||
option: 'region',
|
||||
shortcut: 'r',
|
||||
description: 'Lambda supported region'
|
||||
description: 'Initial Lambda supported AWS region'
|
||||
}, {
|
||||
option: 'notificationEmail',
|
||||
shortcut: 'e',
|
||||
@ -88,278 +92,17 @@ module.exports = function(SPlugin, serverlessPath) {
|
||||
|
||||
createProject(evt) {
|
||||
|
||||
let _this = this;
|
||||
this.evt = evt;
|
||||
this._templatesDir = path.join(__dirname, '..', 'templates');
|
||||
SCli.log('NOTICE: This command/action has been deprecated. Please use "serverless project init" in the future');
|
||||
|
||||
// Check for AWS Profiles
|
||||
let profilesList = awsMisc.profilesMap();
|
||||
this.profiles = Object.keys(profilesList);
|
||||
|
||||
// Status
|
||||
SCli.log('Creating a new Serverless Project...');
|
||||
|
||||
/**
|
||||
* Control Flow
|
||||
*/
|
||||
|
||||
return BbPromise.try(function() {
|
||||
if (_this.S.config.interactive) SCli.asciiGreeting();
|
||||
})
|
||||
.bind(_this)
|
||||
.then(_this._prompt)
|
||||
.then(_this._validateAndPrepare)
|
||||
.then(_this._createProjectScaffolding)
|
||||
.then(_this._createStageAndRegion)
|
||||
.then(function() {
|
||||
|
||||
SCli.log('Successfully created project: ' + _this.project.name);
|
||||
|
||||
/**
|
||||
* Return EVT
|
||||
*/
|
||||
|
||||
_this.evt.data.projectPath = _this.S.config.projectPath;
|
||||
return _this.evt;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Prompt
|
||||
*/
|
||||
|
||||
_prompt() {
|
||||
|
||||
let _this = this;
|
||||
|
||||
// Set temp name
|
||||
let name = _this.evt.options.name || ('serverless' + SUtils.generateShortId(6)).toLowerCase();
|
||||
|
||||
// Skip if non-interactive
|
||||
if (!_this.S.config.interactive) return BbPromise.resolve();
|
||||
|
||||
// Values that exist will not be prompted
|
||||
let overrides = {
|
||||
name: _this.evt.options.name,
|
||||
domain: _this.evt.options.domain,
|
||||
notificationEmail: _this.evt.options.notificationEmail,
|
||||
awsAdminKeyId: _this.evt.options.awsAdminKeyId,
|
||||
awsAdminSecretKey: _this.evt.options.awsAdminSecretKey
|
||||
};
|
||||
|
||||
let prompts = {
|
||||
properties: {
|
||||
name: {
|
||||
description: 'Enter a project name: '.yellow,
|
||||
default: name,
|
||||
message: 'Name must be only letters, numbers or dashes',
|
||||
required: true,
|
||||
conform: function(name) {
|
||||
let re = /^[a-zA-Z0-9-_]+$/;
|
||||
|
||||
// This hack updates the defaults in the other prompts
|
||||
if (re.test(name)) _this.evt.options.name = name;
|
||||
|
||||
return re.test(name);
|
||||
}
|
||||
},
|
||||
domain: {
|
||||
description: 'Enter a project domain (used for the Serverless Project Bucket): '.yellow,
|
||||
default: name + '.com',
|
||||
message: 'Domain must only contain lowercase letters, numbers, periods and dashes',
|
||||
required: true,
|
||||
conform: function(bucket) {
|
||||
let re = /^[a-z0-9-.]+$/;
|
||||
return re.test(bucket);
|
||||
}
|
||||
},
|
||||
notificationEmail: {
|
||||
description: 'Enter an email to use for AWS alarms: '.yellow,
|
||||
required: true,
|
||||
message: 'Please enter a valid email',
|
||||
default: 'me@' + name + '.com',
|
||||
conform: function(email) {
|
||||
let re = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
|
||||
return re.test(email);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if (!_this.profiles || !_this.profiles.length) {
|
||||
|
||||
prompts.properties.awsAdminKeyId = {
|
||||
description: 'Enter the ACCESS KEY ID for your Admin AWS IAM User: '.yellow,
|
||||
required: true,
|
||||
message: 'Please enter a valid access key ID',
|
||||
conform: function(key) {
|
||||
return (key) ? true : false;
|
||||
}
|
||||
};
|
||||
|
||||
prompts.properties.awsAdminSecretKey = {
|
||||
description: 'Enter the SECRET ACCESS KEY for your Admin AWS IAM User: '.yellow,
|
||||
required: true,
|
||||
message: 'Please enter a valid secret access key',
|
||||
conform: function(key) {
|
||||
return (key) ? true : false;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
return this.cliPromptInput(prompts, overrides)
|
||||
.then(function(answers) {
|
||||
|
||||
// Set prompt values
|
||||
_this.S.config.awsAdminKeyId = answers.awsAdminKeyId;
|
||||
_this.S.config.awsAdminSecretKey = answers.awsAdminSecretKey;
|
||||
_this.evt.options.name = answers.name;
|
||||
_this.evt.options.domain = answers.domain;
|
||||
_this.evt.options.notificationEmail = answers.notificationEmail;
|
||||
|
||||
// Show region prompt
|
||||
if (!_this.evt.options.region) {
|
||||
|
||||
// Prompt: region select
|
||||
let choices = awsMisc.validLambdaRegions.map(r => {
|
||||
return {
|
||||
key: '',
|
||||
value: r,
|
||||
label: r
|
||||
};
|
||||
});
|
||||
|
||||
return _this.cliPromptSelect('Select a region for your project: ', choices, false)
|
||||
.then(results => {
|
||||
_this.evt.options.region = results[0].value;
|
||||
});
|
||||
}
|
||||
})
|
||||
.then(function() {
|
||||
|
||||
// If profile exists, skip select prompt
|
||||
if (_this.profile) return;
|
||||
|
||||
// If aws credentials were passed, skip select prompt
|
||||
if (_this.S.config.awsAdminKeyId && _this.S.config.awsAdminSecretKey) return;
|
||||
|
||||
// Prompt: profile select
|
||||
let choices = [];
|
||||
for (let i = 0; i < _this.profiles.length; i++) {
|
||||
choices.push({
|
||||
key: '',
|
||||
value: _this.profiles[i],
|
||||
label: _this.profiles[i]
|
||||
});
|
||||
}
|
||||
|
||||
return _this.cliPromptSelect('Select an AWS profile for your project: ', choices, false)
|
||||
.then(results => {
|
||||
_this.profile = results[0].value;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate & Prepare
|
||||
* - Validate all data from event, interactive CLI or non interactive CLI and prepare project data
|
||||
*/
|
||||
|
||||
_validateAndPrepare() {
|
||||
|
||||
// Initialize AWS Misc Service
|
||||
this.AwsMisc = require('../utils/aws/Misc');
|
||||
|
||||
// If Profile, extract API Keys
|
||||
if (this.profile) {
|
||||
this.S.config.awsAdminKeyId = this.AwsMisc.profilesGet(this.profile)[this.profile].aws_access_key_id;
|
||||
this.S.config.awsAdminSecretKey = this.AwsMisc.profilesGet(this.profile)[this.profile].aws_secret_access_key;
|
||||
}
|
||||
|
||||
// Validate API Keys
|
||||
if (!this.S.config.awsAdminKeyId || !this.S.config.awsAdminSecretKey) {
|
||||
return BbPromise.reject(new SError('Missing AWS API Key and/or AWS Secret Key'));
|
||||
}
|
||||
|
||||
// Initialize Other AWS Services
|
||||
let awsConfig = {
|
||||
region: this.evt.options.region,
|
||||
accessKeyId: this.S.config.awsAdminKeyId,
|
||||
secretAccessKey: this.S.config.awsAdminSecretKey
|
||||
};
|
||||
this.S3 = require('../utils/aws/S3')(awsConfig);
|
||||
this.CF = require('../utils/aws/CloudFormation')(awsConfig);
|
||||
|
||||
// Validate Name - AWS only allows Alphanumeric and - in name
|
||||
let nameOk = /^([a-zA-Z0-9-]+)$/.exec(this.evt.options.name);
|
||||
if (!nameOk) {
|
||||
return BbPromise.reject(new SError('Project names can only be alphanumeric and -'));
|
||||
}
|
||||
|
||||
// Validate Domain
|
||||
let domainRegex = /^[a-z0-9-.]+$/;
|
||||
if(!domainRegex.test(this.evt.options.domain)) {
|
||||
return BbPromise.reject(new SError('Domain must only contain lowercase letters, numbers, periods and dashes'));
|
||||
}
|
||||
|
||||
// Validate NotificationEmail
|
||||
let emailRegex = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
|
||||
if(!emailRegex.test(this.evt.options.notificationEmail)) {
|
||||
return BbPromise.reject(new SError('Please enter a valid email'));
|
||||
}
|
||||
|
||||
// Validate Region
|
||||
if (awsMisc.validLambdaRegions.indexOf(this.evt.options.region) == -1) {
|
||||
return BbPromise.reject(new SError('Invalid region. Lambda not supported in ' + this.evt.options.region, SError.errorCodes.UNKNOWN));
|
||||
}
|
||||
|
||||
return BbPromise.resolve();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create Project Scaffolding
|
||||
*/
|
||||
|
||||
_createProjectScaffolding() {
|
||||
|
||||
let _this = this,
|
||||
projectPath = path.resolve(path.join(path.dirname('.'), _this.evt.options.name));
|
||||
|
||||
// Update Global Serverless Instance
|
||||
_this.S.updateConfig({
|
||||
projectPath: projectPath
|
||||
});
|
||||
|
||||
// Fill in project attributes
|
||||
_this.project = _this.S.state.getProject();
|
||||
_this.project.name = _this.evt.options.name;
|
||||
|
||||
// Fill in meta attributes
|
||||
_this.meta = _this.S.state.getMeta();
|
||||
_this.meta.variables.project = _this.project.name;
|
||||
_this.meta.variables.projectBucket = _this.projectBucket;
|
||||
_this.meta.variables.domain = _this.evt.options.domain;
|
||||
_this.meta.variables.notificationEmail = _this.evt.options.notificationEmail;
|
||||
|
||||
// Save Project & Meta
|
||||
_this.S.state.set({ meta: _this.meta, project: _this.project });
|
||||
return _this.S.state.save()
|
||||
.then(function() {
|
||||
return _this.S.state.load();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Create Stage And Region
|
||||
*/
|
||||
|
||||
_createStageAndRegion() {
|
||||
this.evt.options.stage = 'development';
|
||||
return this.S.actions.stageCreate({
|
||||
return this.S.actions.projectInit({
|
||||
options: {
|
||||
stage: this.evt.options.stage,
|
||||
region: this.evt.options.region,
|
||||
noExeCf: this.evt.options.noExeCf ? true : false
|
||||
name: evt.options.name,
|
||||
domain: evt.options.domain,
|
||||
stage: evt.options.stage,
|
||||
region: evt.options.region,
|
||||
notificationEmail: evt.options.notificationEmail,
|
||||
profile: evt.options.profile,
|
||||
noExeCf: evt.options.noExeCf ? true : false
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -59,10 +59,14 @@ module.exports = function(SPlugin, serverlessPath) {
|
||||
option: 'domain',
|
||||
shortcut: 'd',
|
||||
description: 'Domain of your Serverless project'
|
||||
}, {
|
||||
option: 'stage',
|
||||
shortcut: 's',
|
||||
description: 'Initial project stage'
|
||||
}, {
|
||||
option: 'region',
|
||||
shortcut: 'r',
|
||||
description: 'Lambda supported region'
|
||||
description: 'Initial Lambda supported AWS region'
|
||||
}, {
|
||||
option: 'notificationEmail',
|
||||
shortcut: 'e',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user