Skip to content

make compileFunctions work with package.individually #54

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

make compileFunctions work with package.individually #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee76c5f
make compileFunctions work with package.individually
lhr0909 May 18, 2020
b942013
Remove extraneous console log
lhr0909 May 19, 2020
d282cff
added env var and description support
lhr0909 Jun 4, 2020
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
10 changes: 8 additions & 2 deletions package/lib/compileFunctions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@ const _ = require('lodash');
module.exports = {
compileFunctions() {
this.resources = this.serverless.service.provider.compiledConfigurationTemplate.Resources;
this.compileStorage(this.serverless.service.package.artifact);
if (!this.serverless.service.package.individually) {
this.compileStorage(this.serverless.service.package.artifact);
}
this.serverless.service.getAllFunctions().forEach((functionName) => {
const funcObject = this.serverless.service.getFunction(functionName);
this.compileFunctionAndEvent(functionName, funcObject);
if (this.serverless.service.package.individually) {
this.compileFunction(functionName, funcObject);
} else {
this.compileFunctionAndEvent(functionName, funcObject);
}
});
},

Expand Down
20 changes: 13 additions & 7 deletions provider/aliyunProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ class AliyunProvider {
this.provider = this;
this.serverless.setProvider(PROVIDER_NAME, this);
this.options = options;
utils.setDefaults.call(this);
// FIXME: this method breaks if `provider.stage` is using a variable
// utils.setDefaults.call(this);
}

get projectDelay() {
Expand Down Expand Up @@ -358,16 +359,21 @@ class AliyunProvider {
|| service.provider.timeout
|| 30;

// TODO(joyeecheung): description
// https://help.aliyun.com/document_detail/52877.html?spm=a2c4g.11186623.6.781.78c911a0x2vF8D#createfunction
const env = funcObject.environment;

return {
'Type': 'ALIYUN::FC::Function',
'Properties': {
'name': funcObject.name,
// https://help.aliyun.com/document_detail/52877.html?spm=a2c4g.11186623.6.781.78c911a0x2vF8D#createfunction
'description': funcObject.description,
'service': this.getServiceName(),
'handler': funcObject.handler,
'memorySize': memorySize,
'timeout': timeout,
'runtime': service.provider.runtime,
'EnvironmentVariables': env,
'code': {
'ossBucketName': this.getDeploymentBucketName(),
'ossObjectName': service.package.artifactFilePath
Expand Down Expand Up @@ -713,7 +719,7 @@ class AliyunProvider {
return this.getLogProject(projectName);
}

deleteLogProject(projectName, options){
deleteLogProject(projectName, options){
return this.slsClient.deleteProject(projectName, options);
}

Expand All @@ -738,12 +744,12 @@ class AliyunProvider {
}

async createLogStore(projectName, storeName, store) {
await this.slsClient.createLogStore(projectName, storeName, store);
await this.slsClient.createLogStore(projectName, storeName, store);
await this.sleep(this.storeDelay);
return this.getLogStore(projectName, storeName);
}

deleteLogStore(projectName, logstoreName, options) {
deleteLogStore(projectName, logstoreName, options) {
return this.slsClient.deleteLogStore(projectName, logstoreName, options);
}
async getLogIndex(projectName, storeName) {
Expand All @@ -766,7 +772,7 @@ deleteLogStore(projectName, logstoreName, options) {
await this.getLogIndex(projectName, storeName);
}

deleteLogIndex(projectName, logstoreName, options) {
deleteLogIndex(projectName, logstoreName, options) {
return this.slsClient.deleteIndex(projectName, logstoreName, options);
}

Expand Down Expand Up @@ -832,7 +838,7 @@ deleteLogIndex(projectName, logstoreName, options) {

uploadObject(objectName, filePath) {
const ossClient = this.ossClient;
console.log(filePath)
console.log(filePath);
return co(function* uploadObject() {
return yield ossClient.put(objectName, filePath);
});
Expand Down
2 changes: 1 addition & 1 deletion shared/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
setDefaults() {
this.options.stage = _.get(this, 'options.stage')
|| 'dev';
this.options.region = _.get(this, 'options.region')
this.options.region = _.get(this, 'options.region')
|| _.get(this, 'serverless.service.provider.region')
|| 'cn-shanghai';
},
Expand Down