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

feat: Add ability to individually package functions #261

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+143 −90
Open

feat: Add ability to individually package functions #261

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2bf67ad
Adding code to permit individual packaging
wootencl Apr 18, 2019
0f6e734
Update `compileFunctions` for individual packaging
wootencl Apr 18, 2019
50701e2
Fixes after testing without individual packaging
wootencl Apr 18, 2019
b08e493
fix linting
El-Fitz Jun 4, 2021
7629380
resolve conflicts
El-Fitz Jun 4, 2021
5497197
fix indentation
El-Fitz Jun 4, 2021
e5c7591
Merge branch 'master' into master
El-Fitz Jun 4, 2021
90efdca
get branch up-to-date with remote master
El-Fitz Jun 4, 2021
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
Prev Previous commit
Next Next commit
Update compileFunctions for individual packaging
@wootencl
wootencl committed Apr 18, 2019
commit 0f6e734c40ac13273c87ac92c2ae2cc11cef814e
145 changes: 75 additions & 70 deletions package/lib/compileFunctions.js
View file
Original file line number Diff line number Diff line change
@@ -8,78 +8,83 @@ const _ = require('lodash');
const BbPromise = require('bluebird');

module.exports = {
compileFunction(functionName) {
const funcObject = this.serverless.service.getFunction(functionName);

this.serverless.cli
.log(`Compiling function "${functionName}"...`);

validateHandlerProperty(funcObject, functionName);
validateEventsProperty(funcObject, functionName);

const funcTemplate = getFunctionTemplate(
funcObject,
this.serverless.service.provider.region,
`gs://${
this.serverless.service.provider.deploymentBucketName
}/${this.serverless.service.package.artifactDirectoryName}/${functionName}.zip`);

funcTemplate.properties.availableMemoryMb = _.get(funcObject, 'memorySize')
|| _.get(this, 'serverless.service.provider.memorySize')
|| 256;
funcTemplate.properties.location = _.get(funcObject, 'location')
|| _.get(this, 'serverless.service.provider.region')
|| 'us-central1';
funcTemplate.properties.runtime = _.get(funcObject, 'runtime')
|| _.get(this, 'serverless.service.provider.runtime')
|| 'nodejs8';
funcTemplate.properties.timeout = _.get(funcObject, 'timeout')
|| _.get(this, 'serverless.service.provider.timeout')
|| '60s';
funcTemplate.properties.environmentVariables = _.merge(
_.get(this, 'serverless.service.provider.environment'),
funcObject.environment // eslint-disable-line comma-dangle
);

if (!_.size(funcTemplate.properties.environmentVariables)) {
delete funcTemplate.properties.environmentVariables;
}

funcTemplate.properties.labels = _.assign({},
_.get(this, 'serverless.service.provider.labels') || {},
_.get(funcObject, 'labels') || {} // eslint-disable-line comma-dangle
);

const eventType = Object.keys(funcObject.events[0])[0];

if (eventType === 'http') {
const url = funcObject.events[0].http;

funcTemplate.properties.httpsTrigger = {};
funcTemplate.properties.httpsTrigger.url = url;
}
if (eventType === 'event') {
const type = funcObject.events[0].event.eventType;
const path = funcObject.events[0].event.path; //eslint-disable-line
const resource = funcObject.events[0].event.resource;

funcTemplate.properties.eventTrigger = {};
funcTemplate.properties.eventTrigger.eventType = type;
if (path) funcTemplate.properties.eventTrigger.path = path;
funcTemplate.properties.eventTrigger.resource = resource;
}

this.serverless.service.provider.compiledConfigurationTemplate.resources.push(funcTemplate);
},
compileFunctions() {
const artifactFilePath = this.serverless.service.package.artifact;
const fileName = artifactFilePath.split(path.sep).pop();

this.serverless.service.package
.artifactFilePath = `${this.serverless.service.package.artifactDirectoryName}/${fileName}`;

this.serverless.service.getAllFunctions().forEach((functionName) => {
const funcObject = this.serverless.service.getFunction(functionName);

this.serverless.cli
.log(`Compiling function "${functionName}"...`);

validateHandlerProperty(funcObject, functionName);
validateEventsProperty(funcObject, functionName);

const funcTemplate = getFunctionTemplate(
funcObject,
this.serverless.service.provider.region,
`gs://${
this.serverless.service.provider.deploymentBucketName
}/${this.serverless.service.package.artifactFilePath}`);

funcTemplate.properties.availableMemoryMb = _.get(funcObject, 'memorySize')
|| _.get(this, 'serverless.service.provider.memorySize')
|| 256;
funcTemplate.properties.location = _.get(funcObject, 'location')
|| _.get(this, 'serverless.service.provider.region')
|| 'us-central1';
funcTemplate.properties.runtime = _.get(funcObject, 'runtime')
|| _.get(this, 'serverless.service.provider.runtime')
|| 'nodejs8';
funcTemplate.properties.timeout = _.get(funcObject, 'timeout')
|| _.get(this, 'serverless.service.provider.timeout')
|| '60s';
funcTemplate.properties.environmentVariables = _.merge(
_.get(this, 'serverless.service.provider.environment'),
funcObject.environment // eslint-disable-line comma-dangle
);

if (!_.size(funcTemplate.properties.environmentVariables)) {
delete funcTemplate.properties.environmentVariables;
}

funcTemplate.properties.labels = _.assign({},
_.get(this, 'serverless.service.provider.labels') || {},
_.get(funcObject, 'labels') || {} // eslint-disable-line comma-dangle
);

const eventType = Object.keys(funcObject.events[0])[0];

if (eventType === 'http') {
const url = funcObject.events[0].http;

funcTemplate.properties.httpsTrigger = {};
funcTemplate.properties.httpsTrigger.url = url;
}
if (eventType === 'event') {
const type = funcObject.events[0].event.eventType;
const path = funcObject.events[0].event.path; //eslint-disable-line
const resource = funcObject.events[0].event.resource;

funcTemplate.properties.eventTrigger = {};
funcTemplate.properties.eventTrigger.eventType = type;
if (path) funcTemplate.properties.eventTrigger.path = path;
funcTemplate.properties.eventTrigger.resource = resource;
}

this.serverless.service.provider.compiledConfigurationTemplate.resources.push(funcTemplate);
});

return BbPromise.resolve();
if (artifactFilePath) {
const fileName = artifactFilePath.split(path.sep).pop();

this.serverless.service.package
.artifactFilePath = `${this.serverless.service.package.artifactDirectoryName}/${fileName}`;
}

const allFunctions = this.serverless.service.getAllFunctions();
return BbPromise.each(
allFunctions,
functionName => this.compileFunction(functionName)
);
},
};