Skip to content

Add timer trigger #70

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 1 commit into
base: master
Choose a base branch
from
Open

Add timer trigger #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions package/lib/compileFunctions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ module.exports = {
const triggerResource = this.provider.getOSSTriggerResource(event.oss, funcObject);
const triggerName = triggerResource.Properties.triggerName;
_.merge(resources, { [triggerName]: triggerResource });
} else if (eventType === 'timer') {
const triggerResource = this.provider.getTimerTriggerResource(
event.timer,
funcObject
);
const triggerName = triggerResource.Properties.triggerName;
_.merge(resources, { [triggerName]: triggerResource });
}
});
}
Expand Down
32 changes: 26 additions & 6 deletions provider/aliyunProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,20 @@ class AliyunProvider {
};
}

getTimerTriggerResource(event, funcObject) {
const eventType = 'timer';
return {
'Type': 'ALIYUN::FC::Trigger',
'Properties': {
'triggerConfig': event.triggerConfig,
'triggerName': this.getEventName(eventType, funcObject.name),
'triggerType': eventType,
'functionName': funcObject.name,
'serviceName': this.getServiceName()
}
};
}

getServiceResource() {
// TODO(joyeecheung): description
return {
Expand Down Expand Up @@ -979,9 +993,12 @@ deleteLogIndex(projectName, logstoreName, options) {
* https://help.aliyun.com/document_detail/52877.html#triggerresponse
*/
createTrigger(serviceName, functionName, trigger, role) {
const triggerProps = Object.assign({}, trigger, {
invocationRole: role.Arn
});
const triggerProps = Object.assign({}, trigger);
if (trigger.triggerType !== 'timer') {
Object.assign(triggerProps, {
invocationRole: role.Arn
});
}
return this.fcClient.createTrigger(serviceName, functionName, triggerProps);
}

Expand Down Expand Up @@ -1015,9 +1032,12 @@ deleteLogIndex(projectName, logstoreName, options) {
* @return {TriggerResponse}
*/
updateTrigger(serviceName, functionName, triggerName, trigger, role) {
const triggerProps = Object.assign({}, trigger, {
invocationRole: role.Arn
});
const triggerProps = Object.assign({}, trigger);
if (trigger.triggerType !== 'timer') {
Object.assign(triggerProps, {
invocationRole: role.Arn
});
}
return this.fcClient.updateTrigger(
serviceName, functionName, triggerName, triggerProps);
}
Expand Down