Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 16 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"name": "serverless-google-cloudfunctions",
"name": "@alleypin/serverless-google-cloudfunctions",
"version": "3.1.0",
"description": "Provider plugin for the Serverless Framework v1.x which adds support for Google Cloud Functions.",
"author": "serverless.com",
"repository": "serverless/serverless-google-cloudfunctions",
"homepage": "https://github.com/serverless/serverless-google-cloudfunctions",
"description": "Modified by AlleyPin, Provider plugin for the Serverless Framework v1.x which adds support for Google Cloud Functions.",
"author": "alleypin.com",
"repository": {
"type": "git",
"url": "git+https://github.com/AlleyPin/serverless-google-cloudfunctions.git"
},
"homepage": "https://github.com/AlleyPin/serverless-google-cloudfunctions.git",
"keywords": [
"serverless",
"serverless framework",
Expand Down Expand Up @@ -74,5 +77,12 @@
"prettify:updated": "pipe-git-updated --ext=css --ext=html --ext=js --ext=json --ext=md --ext=yaml --ext=yml -- prettier --write",
"test": "jest"
},
"license": "MIT"
"license": "MIT",
"bugs": {
"url": "https://github.com/AlleyPin/serverless-google-cloudfunctions/issues"
},
"main": "index.js",
"directories": {
"test": "test"
}
}
2 changes: 2 additions & 0 deletions package/lib/compileFunctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,13 @@ module.exports = {
const type = funcObject.events[0].event.eventType;
const path = funcObject.events[0].event.path; //eslint-disable-line
const resource = funcObject.events[0].event.resource;
const failurePolicy = funcObject.events[0].event.failurePolicy;

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

this.serverless.service.provider.compiledConfigurationTemplate.resources.push(funcTemplate);
Expand Down
35 changes: 35 additions & 0 deletions package/lib/compileFunctions.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,20 @@ describe('CompileFunctions', () => {
},
],
},
func3: {
handler: 'func3',
events: [
{
event: {
eventType: 'foo',
resource: 'some-resource',
failurePolicy: {
retry: {},
},
},
},
],
},
};

const compiledResources = [
Expand Down Expand Up @@ -608,6 +622,27 @@ describe('CompileFunctions', () => {
labels: {},
},
},
{
type: 'gcp-types/cloudfunctions-v1:projects.locations.functions',
name: 'my-service-dev-func3',
properties: {
entryPoint: 'func3',
parent: 'projects/myProject/locations/us-central1',
runtime: 'nodejs8',
function: 'my-service-dev-func3',
availableMemoryMb: 256,
timeout: '60s',
sourceArchiveUrl: 'gs://sls-my-service-dev-12345678/some-path/artifact.zip',
eventTrigger: {
eventType: 'foo',
resource: 'some-resource',
failurePolicy: {
retry: {},
},
},
labels: {},
},
},
];

return googlePackage.compileFunctions().then(() => {
Expand Down